I would like to get a freeze exception for ncurses to fix bug #576127[0]
for squeeze.  While this bug only affects a minority of our users, those
will be hit rather hard, and this bug is a regression from Lenny.  The
commits in our git repository can be found at [1] and [2].

Another bug I would like to fix is #595484[3].  This is not as
important, but the patch is a one-liner (exactly three characters long).
The commit would be [4].

Sorry for not coming up with this sooner, the main maintainer had been
busy with his fatherhood[5].

Full diff against the version in squeeze with the three cherry-picked
commits is attached.


0. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=576127
1. 
http://git.debian.org/?p=collab-maint/ncurses.git;a=commit;h=03e938257f20da054de985d2bc6fad48161e2bbb
2. 
http://git.debian.org/?p=collab-maint/ncurses.git;a=commit;h=451a1f8cce791cda6847695730f49477970d2655
3. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=595484
4. 
http://git.debian.org/?p=collab-maint/ncurses.git;a=commit;h=2958576a9cb767ce5e472bf8fc4e859ab464d677
5. 
http://www.enc.com.au/sees-blog/2010/09/psmisc-2213-gjay-031-2-and-son-20.html

diff --git a/debian/changelog b/debian/changelog
index 76eeb13..4b473e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ncurses (5.7+20100313-3) UNRELEASED; urgency=low
+
+  * Fix dangling symlinks in ncurses-term that were introduced by the
+    removal of the ncurses-base compatibility symlinks in version
+    5.7+20100313-1 (Closes: #576127).  Add versioned Breaks against older
+    ncurses-term versions in ncurses-base.
+  * Correct rxvt-unicode sgr0 terminfo entry (Closes: #595484).
+
+ -- Sven Joachim <svenj...@gmx.de>  Tue, 07 Sep 2010 20:35:26 +0200
+
 ncurses (5.7+20100313-2) unstable; urgency=medium
 
   [ Sven Joachim ]
diff --git a/debian/control b/debian/control
index 91cc769..e4c7e47 100644
--- a/debian/control
+++ b/debian/control
@@ -172,6 +172,7 @@ Essential: yes
 Depends: ${misc:Depends}
 Conflicts: ncurses, ncurses-runtime
 Provides: ncurses-runtime
+Breaks: ncurses-term (<< 5.7+20100313-3)
 Description: basic terminal type definitions
  This package contains terminfo data files to support the most common types of
  terminal, including ansi, dumb, linux, rxvt, screen, sun, vt100, vt102, vt220,
@@ -182,6 +183,7 @@ Architecture: all
 Section: admin
 Priority: standard
 Depends: ${misc:Depends}
+Replaces: ncurses-base (<< 5.7+20100313-1)
 Description: additional terminal type definitions
  This package contains all of the numerous terminal definitions not found in
  the ncurses-base package.
diff --git a/debian/ncurses-term.links b/debian/ncurses-term.links
new file mode 100644
index 0000000..5eaca09
--- /dev/null
+++ b/debian/ncurses-term.links
@@ -0,0 +1,6 @@
+/lib/terminfo/c/cons25      /usr/share/terminfo/c/cons25
+/lib/terminfo/s/sun         /usr/share/terminfo/s/sun
+/lib/terminfo/v/vt100       /usr/share/terminfo/v/vt100
+/lib/terminfo/v/vt220       /usr/share/terminfo/v/vt220
+/lib/terminfo/x/xterm-color /usr/share/terminfo/x/xterm-color
+/lib/terminfo/x/xterm-r6    /usr/share/terminfo/x/xterm-r6
diff --git a/debian/rules b/debian/rules
index 1c5727b..8bf61e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -447,6 +447,7 @@ binary-indep: build install
 	dh_lintian -i
 	dh_compress -i
 	dh_fixperms -i
+	dh_link -i
 	dh_gencontrol -i
 	dh_installdeb -i
 	dh_md5sums -i
diff --git a/debian/rxvt-unicode.ti b/debian/rxvt-unicode.ti
index 18dd772..d64f1de 100644
--- a/debian/rxvt-unicode.ti
+++ b/debian/rxvt-unicode.ti
@@ -40,7 +40,7 @@ rxvt-unicode|rxvt-unicode terminal (X Window System),
 	rmso=\E[27m, rmul=\E[24m, 
 	rs1=\Ec,
 	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>, 
-	sgr0=\E[m\017, 
+	sgr0=\E[m\E(B, 
 	enacs=, smacs=\E(0, rmacs=\E(B,
 	smso=\E[7m, smul=\E[4m, tbc=\E[3g, 
 	vpa=\E[%i%p1%dd, 

Attachment: pgp1Y26x0fFnK.pgp
Description: PGP signature

Reply via email to