xterm: Changes to 'debian-unstable'
debian/changelog | 6 ++++++
debian/patches/900_debian_xterm.diff | 16 ++++++++--------
debian/patches/901_xterm_manpage.diff | 6 +++---
debian/patches/902_pointermode_never.diff | 6 +++---
debian/patches/series | 6 +++---
5 files changed, 23 insertions(+), 17 deletions(-)
New commits:
commit 5e9431e6018f578fa42d0b7fde50e569107ba6ed
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Jun 15 20:11:27 2008 +0200
Update patches to not use -p0
diff --git a/debian/changelog b/debian/changelog
index 2205844..4c183f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (235-2) UNRELEASED; urgency=low
+
+ * Update patches to not use -p0, closes: #485360.
+
+ -- Brice Goglin <bgoglin@debian.org> Sun, 15 Jun 2008 20:10:16 +0200
+
xterm (235-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/patches/900_debian_xterm.diff b/debian/patches/900_debian_xterm.diff
index d65c3c4..80b69cc 100644
--- a/debian/patches/900_debian_xterm.diff
+++ b/debian/patches/900_debian_xterm.diff
@@ -23,8 +23,8 @@ Make Debian-specific tweaks to xterm:
This patch by Branden Robinson.
---- termcap.orig
-+++ termcap
+--- a/termcap.orig
++++ b/termcap
@@ -71,6 +71,14 @@
:so=\E[7m:sr=\EM:st=\EH:te=\E[?1049l:ti=\E[?1049h:\
:ue=\E[24m:up=\E[A:us=\E[4m:ve=\E[?25h:vi=\E[?25l:
@@ -48,8 +48,8 @@ This patch by Branden Robinson.
+ :tc=xterm-debian:
+# :tc=xterm-new:
# :tc=xterm-r6:
---- terminfo.orig
-+++ terminfo
+--- a/terminfo.orig
++++ b/terminfo
@@ -955,6 +955,13 @@
u8=\E[?1;2c,
u9=\E[c,
@@ -72,8 +72,8 @@ This patch by Branden Robinson.
+ use=xterm-debian,
+# use=xterm-new,
# use=xterm-r6,
---- XTerm.ad.orig
-+++ XTerm.ad
+--- a/XTerm.ad.orig
++++ b/XTerm.ad
@@ -116,6 +116,10 @@
*tek4014*font3: 6x13
*tek4014*fontSmall: 6x10
@@ -85,8 +85,8 @@ This patch by Branden Robinson.
! If xterm is built with a toolbar, the widget hierarchy looks like this,
! showing widget name / class names. The complete menu hierarchy is built
! at startup because it is needed to make the layout work for the menubar:
---- XTerm-col.ad.orig
-+++ XTerm-col.ad
+--- a/XTerm-col.ad.orig
++++ b/XTerm-col.ad
@@ -7,9 +7,9 @@
*VT100*boldColors: on
*VT100*dynamicColors: on
diff --git a/debian/patches/901_xterm_manpage.diff b/debian/patches/901_xterm_manpage.diff
index 659ca52..3f943df 100644
--- a/debian/patches/901_xterm_manpage.diff
+++ b/debian/patches/901_xterm_manpage.diff
@@ -5,10 +5,10 @@ Make Debian-specific tweaks to xterm manpage:
This patch by Branden Robinson and David Martínez.
-Index: xterm.man
+Index: a/xterm.man
===================================================================
---- xterm.man.orig
-+++ xterm.man
+--- a/xterm.man.orig
++++ b/xterm.man
@@ -4757,10 +4757,10 @@
.SH FILES
The actual pathnames given may differ on your system.
diff --git a/debian/patches/902_pointermode_never.diff b/debian/patches/902_pointermode_never.diff
index 6e6e7d8..740dfe6 100644
--- a/debian/patches/902_pointermode_never.diff
+++ b/debian/patches/902_pointermode_never.diff
@@ -1,10 +1,10 @@
Debian-specific tweak: the pointerMode resource is set to 0 (never)
by default.
-Index: xterm.man
+Index: a/xterm.man
===================================================================
---- xterm.man.orig
-+++ xterm.man
+--- a/xterm.man.orig
++++ b/xterm.man
@@ -2543,11 +2543,11 @@
.RS
.TP 3
diff --git a/debian/patches/series b/debian/patches/series
index d8267b7..80fb09d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-900_debian_xterm.diff -p0
-901_xterm_manpage.diff -p0
-902_pointermode_never.diff -p0
+900_debian_xterm.diff
+901_xterm_manpage.diff
+902_pointermode_never.diff
Reply to: