libncursesw.5-dev, libtinfo-dev: Merge into libncurses.5-dev

7 files changed, 14 insertions, 49 deletions

diff --git a/changelog b/changelog
index ef8c82a..0973f93 100644
--- a/changelog
+++ b/changelog
@@ -2,10 +2,10 @@ ncurses (6.1-1) trunk
 
   * New upstream version.
   * Update Maintainer and Homepage.
-  * libncurses.5-dev, libncursesw.5-dev, libtinfo-dev: Remove static
+  * libncursesw.5-dev, libtinfo-dev: Merge into libncurses.5-dev.
+  * libncurses.5-dev: Remove static libraries.
+  * libncurses.5, libncurses.5-dev, libncursesw.5: Provide shared C++
     libraries.
-  * libncurses.5, libncurses.5-dev, libncursesw.5, libncursesw.5-dev: Provide
-    shared C++ libraries.
   * libncurses, libncursesw, libtinfo.5, ncurses-bin: Use automatic shared
     library dependencies.
 
diff --git a/libncurses.5-dev.pkg/control b/libncurses.5-dev.pkg/control
index 67c7573..8ccfe23 100644
--- a/libncurses.5-dev.pkg/control
+++ b/libncurses.5-dev.pkg/control
@@ -1,7 +1,6 @@
 Architecture: any
 Platform: all
 Depends: libtinfo.5 (= ${Binary-Version}), libncurses.5 (= ${Binary-Version}),
- libtinfo-dev (= ${Binary-Version}),
 Description: curses library - development files
  The ncurses (new curses) library is a free software emulation of curses in
  System V Release 4.0, and more.  It uses terminfo format, supports pads and
diff --git a/libncurses.5-dev.pkg/files b/libncurses.5-dev.pkg/files
index 78a1efc..242b795 100644
--- a/libncurses.5-dev.pkg/files
+++ b/libncurses.5-dev.pkg/files
@@ -1,12 +1,3 @@
-/usr/include/*.h
-/usr/lib/*/libcurses.so
-/usr/lib/*/libform.so
-/usr/lib/*/libmenu.so
-/usr/lib/*/libncurses.so
-/usr/lib/*/libncurses++.so
-/usr/lib/*/libpanel.so
-/usr/lib/*/pkgconfig/form.pc
-/usr/lib/*/pkgconfig/menu.pc
-/usr/lib/*/pkgconfig/ncurses.pc
-/usr/lib/*/pkgconfig/ncurses++.pc
-/usr/lib/*/pkgconfig/panel.pc
+/usr/include/
+/usr/lib/*/*.so
+/usr/lib/*/pkgconfig/
diff --git a/libncursesw.5-dev.pkg/control b/libncursesw.5-dev.pkg/control
index d9181aa..2535751 100644
--- a/libncursesw.5-dev.pkg/control
+++ b/libncursesw.5-dev.pkg/control
@@ -1,12 +1,6 @@
 Architecture: any
 Platform: all
-Depends: libtinfo.5 (= ${Binary-Version}), libncursesw.5 (= ${Binary-Version})
- libtinfo-dev (= ${Binary-Version}),
-Description: curses library with wide character support - development files
- The ncurses (new curses) library is a free software emulation of curses in
- System V Release 4.0, and more.  It uses terminfo format, supports pads and
- color and multiple highlights and forms characters and function-key mapping,
- and has all the other SYSV-curses enhancements over BSD curses.
- .
- This package provides the development files for the ncurses shared libraries
- with wide character support.
+Depends: libncurses.5-dev (= ${Binary-Version})
+Description: curses library - development files (transitional package)
+ This is a transitional package that can safely be removed.  Packages should
+ build-depend on libncurses.5-dev instead of this package.
diff --git a/libncursesw.5-dev.pkg/files b/libncursesw.5-dev.pkg/files
deleted file mode 100644
index 651f9cb..0000000
--- a/libncursesw.5-dev.pkg/files
+++ /dev/null
@@ -1,11 +0,0 @@
-/usr/include/ncursesw/*.h
-/usr/lib/*/libformw.so
-/usr/lib/*/libmenuw.so
-/usr/lib/*/libncursesw.so
-/usr/lib/*/libncurses++w.so
-/usr/lib/*/libpanelw.so
-/usr/lib/*/pkgconfig/formw.pc
-/usr/lib/*/pkgconfig/menuw.pc
-/usr/lib/*/pkgconfig/ncursesw.pc
-/usr/lib/*/pkgconfig/ncurses++w.pc
-/usr/lib/*/pkgconfig/panelw.pc
diff --git a/libtinfo-dev.pkg/control b/libtinfo-dev.pkg/control
index 3620dce..2535751 100644
--- a/libtinfo-dev.pkg/control
+++ b/libtinfo-dev.pkg/control
@@ -1,10 +1,6 @@
 Architecture: any
 Platform: all
-Depends: libtinfo.5 (= ${Binary-Version})
-Description: curses terminfo library - development files
- The ncurses (new curses) library is a free software emulation of curses in
- System V Release 4.0, and more.  It uses terminfo format, supports pads and
- color and multiple highlights and forms characters and function-key mapping,
- and has all the other SYSV-curses enhancements over BSD curses.
- .
- This package provides the development files for the terminfo shared library.
+Depends: libncurses.5-dev (= ${Binary-Version})
+Description: curses library - development files (transitional package)
+ This is a transitional package that can safely be removed.  Packages should
+ build-depend on libncurses.5-dev instead of this package.
diff --git a/libtinfo-dev.pkg/files b/libtinfo-dev.pkg/files
deleted file mode 100644
index 0c0f2ae..0000000
--- a/libtinfo-dev.pkg/files
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/lib/*/libtic.so
-/usr/lib/*/libtinfo.so
-/usr/lib/*/pkgconfig/tic.pc
-/usr/lib/*/pkgconfig/tinfo.pc