From ddaeadec4ab441dc163f3ab433c8aa6bd2f5a65b Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Mon, 24 Jun 2019 00:03:29 -0400
Subject: terminfo-base: Merge into terminfo

There are no packages in ProteanOS dependent on terminfo-base, so this
seems safe to do at this point.
---
diff --git a/build b/build
index 4cd3b72..cd5bd31 100755
--- a/build
+++ b/build
@@ -49,16 +49,6 @@ install: build
 	rm dest/usr/bin/ncurses*-config
 	@# Extract a few individual terminal type definitions.  This would be
 	@# hard to do with oh-installfiles.
-	@# terminfo-base
-	mkdir -p terminfo-base.data/usr/share/terminfo/a/
-	mkdir -p terminfo-base.data/usr/share/terminfo/d/
-	mkdir -p terminfo-base.data/usr/share/terminfo/v/
-	mv dest/usr/share/terminfo/a/ansi \
-		terminfo-base.data/usr/share/terminfo/a/ansi
-	mv dest/usr/share/terminfo/d/dumb \
-		terminfo-base.data/usr/share/terminfo/d/dumb
-	mv dest/usr/share/terminfo/v/vt102 \
-		terminfo-base.data/usr/share/terminfo/v/vt102
 	@# terminfo-linux
 	mkdir -p terminfo-linux.data/usr/share/terminfo/l/
 	mv dest/usr/share/terminfo/l/linux \
diff --git a/changelog b/changelog
index 0973f93..770805e 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,7 @@ ncurses (6.1-1) trunk
     libraries.
   * libncurses, libncursesw, libtinfo.5, ncurses-bin: Use automatic shared
     library dependencies.
+  * terminfo-base: Merge into terminfo package.
 
  -- Patrick McDermott <patrick.mcdermott@libiquity.com>  Sun, 23 Jun 2019 17:20:04 -0400
 
diff --git a/terminfo-base.pkg/control b/terminfo-base.pkg/control
deleted file mode 100644
index effe754..0000000
--- a/terminfo-base.pkg/control
+++ /dev/null
@@ -1,10 +0,0 @@
-Architecture: all
-Platform: all
-Depends: libtinfo.5 (= ${Source-Version})
-Description: Basic terminal type definition
- 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 ansi, dumb, and vt102 terminfo data files.
--
cgit v0.9.1