This is about an old request to include the bterm terminfo entry in
ncurses-base or ncurses-term. I don't think the former makes much
sense, but the latter would be possible. It requires coordinated
uploads of ncurses and bogl, though.
On 2010-06-22 20:43 +0200, Sven Joachim wrote:
> On 2010-06-22 17:36 +0200, Josh Triplett wrote:
>
>> On Tue, Jun 22, 2010 at 04:36:05PM +0200, Sven Joachim wrote:
>>> On 2010-06-22 13:08 +0200, Sven Joachim wrote:
>>> > On 2009-12-23 02:54 +0100, Josh Triplett wrote:
>>> >> Please include the terminfo entry for bterm, preferably in ncurses-base,
>>> >> but if not there then in ncurses-term.
>>> >
>>> > Taking over the bterm terminfo entry from bogl-bterm in ncurses-term
>>> > would be possible, but given bogl-bterm's very low popcon I don't think
>>> > it would be very useful.
>>>
>>> Perhaps bogl-bterm should be updated to use the terminfo entry from
>>> ncurses introduced in the 20091226 patch. Outside the Debian installer
>>> bterm does not seem to be of much use.
>>
>> OK, that makes sense. It looks like ncurses doesn't ship that terminfo
>> entry, though (perhaps to avoid conflicting with bterm?).
>
> There are some terminfo entries that are blacklisted in ncurses and
> shipped from the terminal emulator's package instead. I'm not sure in
> which cases this is actually the best solution. For bterm there
> actually had been no terminfo entry in the ncurses source when you
> submitted the bug.
>
>> Perhaps ncurses could start shipping that terminfo entry, and bterm
>> could stop shipping it and add an appropriate versioned dependency?
>
> This is what we are going to do for mlterm, see #485448. But bterm will
> have to continue shipping its terminfo entry at least in the udeb.
Attached are patches for ncurses to include the bterm terminfo entry
in ncurses-term and for bogl to depend on the new ncurses-term version.
As for the udeb, I vote for installing the ncurses-term version there as
well, meaning that bogl needs to build-depend on ncurses-term.
Samuel, do you think that is a good plan?
Cheers,
Sven
>From cc74d0233e8b757003ef8968de9bfadc1ca48d31 Mon Sep 17 00:00:00 2001
From: Sven Joachim <[email protected]>
Date: Fri, 20 Apr 2012 09:11:19 +0200
Subject: [PATCH] Ship bterm terminfo entry in ncurses-term
The next release of bogl will have to stop shipping that file.
---
debian/changelog | 7 +++++++
debian/control | 5 +++--
debian/rules | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6f67ee7..d701cda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ncurses (5.9-7) UNRELEASED; urgency=low
+
+ * Take over bterm terminfo entry from bogl-bterm in ncurses-term
+ (Closes: #562134).
+
+ -- Sven Joachim <[email protected]> Fri, 20 Apr 2012 09:04:25 +0200
+
ncurses (5.9-6) unstable; urgency=low
[ Craig Small ]
diff --git a/debian/control b/debian/control
index b19de52..09ba2ee 100644
--- a/debian/control
+++ b/debian/control
@@ -332,8 +332,9 @@ Architecture: all
Section: admin
Priority: standard
Depends: ${misc:Depends}
-Replaces: ncurses-base (<< 5.7+20100313-1), mlterm-common (<< 3.0.2-1)
-Breaks: mlterm-common (<< 3.0.2-1)
+Replaces: ncurses-base (<< 5.7+20100313-1), mlterm-common (<< 3.0.2-1),
+ bogl-bterm (<< 0.1.18-7)
+Breaks: mlterm-common (<< 3.0.2-1), bogl-bterm (<< 0.1.18-7)
Description: additional terminal type definitions
The ncurses library routines are a terminal-independent method of
updating character screens with reasonable optimization.
diff --git a/debian/rules b/debian/rules
index 4b8864e..fee549e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -144,7 +144,7 @@ libterminfofiles=a/ansi c/cons25 c/cons25-debian c/cygwin
d/dumb h/hurd l/linux
# Blacklist terminfo entries shipped by other Debian packages so that we do
# not begin shipping them by accident.
-badterminfo = 5/5250 b/bterm i/iterm i/iterm-am i/iterm-color \
+badterminfo = 5/5250 i/iterm i/iterm-am i/iterm-color \
j/jfbterm k/kon k/kon2 l/linux-5250 s/st s/st-256color
# The ncurses configure test won't work when cross compiling (e.g. for
--
1.7.10
>From 321188a711b9fb22e1aaf2373c53f3f292658415 Mon Sep 17 00:00:00 2001
From: Sven Joachim <[email protected]>
Date: Fri, 20 Apr 2012 09:27:25 +0200
Subject: [PATCH] Let ncurses-term take over the bterm terminfo entry
This requires that bogl-bterm depends on ncurses-term (>= 5.9-7).
Since there is no udeb for ncurses, bog-term-udeb needs to continue to
ship the bterm terminfo entry. Build-depend on ncurses-term to
install the system terminfo file into the udeb rather than the locally
built one.
---
debian/bogl-bterm.files | 1 -
debian/changelog | 3 +++
debian/control | 3 ++-
debian/rules | 2 +-
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/debian/bogl-bterm.files b/debian/bogl-bterm.files
index c512e2f..1736277 100644
--- a/debian/bogl-bterm.files
+++ b/debian/bogl-bterm.files
@@ -1,2 +1 @@
usr/bin/bterm
-usr/share/terminfo/b/bterm
diff --git a/debian/changelog b/debian/changelog
index 4e798a7..4923679 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ bogl (0.1.18-7) UNRELEASED; urgency=low
* control:
- make libbogl0 pre-depend on multi-arch-support
- Build-depend on recent debhelper to get misc:Pre-Depends.
+ - Depend and build-depend on ncurses-term (>= 5.9-7) (see #562134).
+ * bogl-bterm: Do not include /usr/share/terminfo/b/bterm anymore.
+ * rules: install the bterm terminfo from ncurses-term into bogl-term-udeb.
-- Samuel Thibault <[email protected]> Sat, 25 Feb 2012 17:26:32 +0100
diff --git a/debian/control b/debian/control
index 4881169..1960ee6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Section: devel
Priority: optional
Maintainer: Samuel Thibault <[email protected]>
Build-Depends: debhelper (>= 8.1.3), libgd2-noxpm-dev | libgd2-xpm-dev,
hardening-wrapper
+Build-Depends: debhelper (>= 8.1.3), libgd2-noxpm-dev | libgd2-xpm-dev,
hardening-wrapper, ncurses-term (>= 5.9-7)
Standards-Version: 3.9.3
Vcs-Browser: http://git.debian.org/?p=collab-maint/bogl.git
Vcs-Git: git://git.debian.org/collab-maint/bogl.git
@@ -35,7 +36,7 @@ Description: Ben's Own Graphics Library - shared library
Package: bogl-bterm
Section: utils
Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ncurses-term (>= 5.9-7)
Description: Ben's Own Graphics Library - graphical terminal
Ben's Own Graphics Library is a small framebuffer library,
including basic widgets, support for text in multiple
diff --git a/debian/rules b/debian/rules
index 26550ba..78c2824 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,7 +67,7 @@ ifeq ($(DEB_HOST_ARCH_OS), linux)
install -d debian/bogl-bterm-udeb/usr/bin
install -m 755 build-udeb/bterm debian/bogl-bterm-udeb/usr/bin/bterm
install -d debian/bogl-bterm-udeb/usr/share/terminfo/b
- install -m 644 debian/bogl-bterm/usr/share/terminfo/b/bterm
debian/bogl-bterm-udeb/usr/share/terminfo/b/bterm
+ install -m 644 /usr/share/terminfo/b/bterm
debian/bogl-bterm-udeb/usr/share/terminfo/b/bterm
endif
dh_installdocs
--
1.7.10
