libtic.5: Merge back into libtinfo.5

This partially reverts commits 52db7df7 and 4a22091.

I'd rather transition all dependent packages to libtinfo.6 and remove
libtinfo.5 (and the other ABI-5 packages) altogether, now that the ABI-6
termattrs_sp() segmentation fault is fixed.

6 files changed, 5 insertions, 13 deletions

diff --git a/build b/build
index 6b07788..7b8c99f 100755
--- a/build
+++ b/build
@@ -105,7 +105,6 @@ install: build
 		libncursesw.$(legacy_abi_ver) \
 		libncurses++w.$(legacy_abi_ver) \
 		libtinfo.$(legacy_abi_ver) \
-		libtic.$(legacy_abi_ver) \
 		libncurses.$(legacy_abi_ver)-dev \
 		ncurses-dbg \
 		" oh-installfiles -d dest-ncursesw-legacy
diff --git a/changelog b/changelog
index 709c3a5..16346fb 100644
--- a/changelog
+++ b/changelog
@@ -5,8 +5,10 @@ ncurses (6.1+20190706-1) trunk
     from the shared libraries by upstream).
   * libtinfo.5, libtinfo.6: Switch to providing wide-character builds of
     libraries (fixes termattrs_sp() segmentation fault).
-  * libtic.5, libtic.6: New binary packages, split from libtinfo.5 and
-    libtinfo.6, to provide the legacy and current tic libraries.
+  * libtic.6: New binary package, split from libtinfo.6, to provide the tic
+    library.  No packages in ProteanOS other than ncurses-bin link against
+    libtic.so.6, so it is safe to split up libtinfo.6 without adding libtic.6
+    to its Recommends or Depends fields.
   * libncurses.5-dev, libncurses.6-dev: Prohibit coinstallation, due to
     conflicting symbolic link names.
   * libform.6, libformw.6, libmenu.6, libmenuw.6, libpanel.6, libpanelw.6: New
diff --git a/libtic.5.pkg/control b/libtic.5.pkg/control
deleted file mode 100644
index a3601de..0000000
--- a/libtic.5.pkg/control
+++ /dev/null
@@ -1,8 +0,0 @@
-Architecture: any
-Platform: all
-Depends: ncurses-common (= ${Source-Version}), terminfo-linux [any-linux-any],
- ${Shlib-Depends}
-Description: curses terminfo compiler library (legacy ABI)
- ${Common-Description}
- .
- This package provides the terminfo compiler (legacy ABI) shared library.
diff --git a/libtic.5.pkg/files b/libtic.5.pkg/files
deleted file mode 100644
index 0cfbd47..0000000
--- a/libtic.5.pkg/files
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/*/libtic.so.*
diff --git a/libtinfo.5.pkg/control b/libtinfo.5.pkg/control
index e1e957c..5840de7 100644
--- a/libtinfo.5.pkg/control
+++ b/libtinfo.5.pkg/control
@@ -3,7 +3,6 @@ Platform: all
 Depends: ncurses-common (= ${Source-Version}),
  terminfo-linux (>= ${Source-Version}) [any-linux-any],
  ${Shlib-Depends}
-Recommends: libtic.5 (= ${Binary-Version})
 Description: curses terminfo library (legacy ABI)
  ${Common-Description}
  .
diff --git a/libtinfo.5.pkg/files b/libtinfo.5.pkg/files
index 925f75c..e4fdbc8 100644
--- a/libtinfo.5.pkg/files
+++ b/libtinfo.5.pkg/files
@@ -1 +1,2 @@
+/usr/lib/*/libtic.so.*
 /usr/lib/*/libtinfo.so.*