Package: mrxvt
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From 4291fe228ab0e7c272adcd709cb9a39e5d1b6af7 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Mon, 27 Feb 2012 04:00:36 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/changelog | 10 +++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00list | 10 ---
...{02bootstrap_sh.dpatch => 02bootstrap_sh.patch} | 7 +--
debian/patches/03segfault_wd_empty.dpatch | 17 -----
debian/patches/03segfault_wd_empty.patch | 18 ++++++
debian/patches/11macros_avoid_segfault.dpatch | 28 ---------
debian/patches/11macros_avoid_segfault.patch | 28 +++++++++
...ted_on_arm.dpatch => 12no_tainted_on_arm.patch} | 0
...3more_profiles.dpatch => 13more_profiles.patch} | 22 ++++----
debian/patches/{14typos.dpatch => 14typos.patch} | 18 +++---
...compat.dpatch => 15macro_backward_compat.patch} | 63 +++++++++++---------
.../{17fix_xftpsz.dpatch => 17fix_xftpsz.patch} | 22 ++++---
.../{18roff_minus.dpatch => 18roff_minus.patch} | 7 +--
debian/patches/series | 10 +++
debian/source/format | 1 +
17 files changed, 141 insertions(+), 126 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{02bootstrap_sh.dpatch => 02bootstrap_sh.patch} (85%)
delete mode 100644 debian/patches/03segfault_wd_empty.dpatch
create mode 100644 debian/patches/03segfault_wd_empty.patch
delete mode 100644 debian/patches/11macros_avoid_segfault.dpatch
create mode 100644 debian/patches/11macros_avoid_segfault.patch
rename debian/patches/{12no_tainted_on_arm.dpatch => 12no_tainted_on_arm.patch} (100%)
rename debian/patches/{13more_profiles.dpatch => 13more_profiles.patch} (66%)
rename debian/patches/{14typos.dpatch => 14typos.patch} (68%)
rename debian/patches/{15macro_backward_compat.dpatch => 15macro_backward_compat.patch} (57%)
rename debian/patches/{17fix_xftpsz.dpatch => 17fix_xftpsz.patch} (58%)
rename debian/patches/{18roff_minus.dpatch => 18roff_minus.patch} (91%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 05df100..b494c35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mrxvt (0.5.4-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ Note: some patches were updated with "quilt refresh" to make
+ them apply cleanly.
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <jari.aa...@cante.net> Mon, 27 Feb 2012 03:52:42 -0500
+
mrxvt (0.5.4-1.1) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 78566b1..c863ea6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: x11
Priority: optional
Homepage: http://materm.sourceforge.net
Maintainer: Jan Christoph Nordholz <he...@pool.math.tu-berlin.de>
-Build-Depends: debhelper (>= 7), dpatch, bzip2, libfreetype6-dev, libice-dev, libjpeg-dev, libpng12-dev, libx11-dev, libxft-dev, libxpm-dev, libxrender-dev, automake, autoconf, autotools-dev
-Standards-Version: 3.8.2
+Build-Depends: debhelper (>= 9), bzip2, libfreetype6-dev, libice-dev, libjpeg-dev, libpng12-dev, libx11-dev, libxft-dev, libxpm-dev, libxrender-dev, automake, autoconf, autotools-dev
+Standards-Version: 3.9.3
Package: mrxvt-common
Architecture: all
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 4e1125d..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,10 +0,0 @@
-# 01SVN
-02bootstrap_sh
-03segfault_wd_empty
-11macros_avoid_segfault
-12no_tainted_on_arm
-13more_profiles
-14typos
-15macro_backward_compat
-17fix_xftpsz
-18roff_minus
diff --git a/debian/patches/02bootstrap_sh.dpatch b/debian/patches/02bootstrap_sh.patch
similarity index 85%
rename from debian/patches/02bootstrap_sh.dpatch
rename to debian/patches/02bootstrap_sh.patch
index cd83e52..8b7898f 100644
--- a/debian/patches/02bootstrap_sh.dpatch
+++ b/debian/patches/02bootstrap_sh.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02bootstrap_sh.dpatch taken unchanged from upstream
-##
-## DP: Re-add bootstrap.sh which is not included in the tarball anymore.
+From: Unknown
+Subject: Re-add bootstrap.sh which is not included in the tarball anymore.
-@DPATCH@
--- mrxvt-0.5.4.orig/bootstrap.sh 1970-01-01 01:00:00.000000000 +0100
+++ mrxvt-0.5.4/bootstrap.sh 2006-05-11 01:40:46.000000000 +0200
@@ -0,0 +1,25 @@
diff --git a/debian/patches/03segfault_wd_empty.dpatch b/debian/patches/03segfault_wd_empty.dpatch
deleted file mode 100644
index f7ed8f3..0000000
--- a/debian/patches/03segfault_wd_empty.dpatch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03segfault_wd_empty.dpatch taken unchanged from upstream
-##
-## DP: Fix a null-pointer dereference segfault.
-
-@DPATCH@
---- mrxvt-0.5.4.orig/src/tabbar.c (revision 337)
-+++ mrxvt-0.5.4/src/tabbar.c (working copy)
-@@ -1327,7 +1327,7 @@
- if( p.we_wordc > 1)
- rxvt_msg( DBG_ERROR, DBG_TABBAR,
- "Too many words when expanding %s\n", cwdOption );
-- else
-+ else if( NOT_NULL( *p.we_wordv ) )
- {
- filename = *p.we_wordv;
-
diff --git a/debian/patches/03segfault_wd_empty.patch b/debian/patches/03segfault_wd_empty.patch
new file mode 100644
index 0000000..edb2cba
--- /dev/null
+++ b/debian/patches/03segfault_wd_empty.patch
@@ -0,0 +1,18 @@
+From: Jan Christoph Nordholz <he...@pool.math.tu-berlin.de>
+Subject: Fix a null-pointer dereference segfault.
+
+---
+ src/tabbar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/tabbar.c
++++ b/src/tabbar.c
+@@ -1314,7 +1314,7 @@
+ if( p.we_wordc > 1)
+ rxvt_msg( DBG_ERROR, DBG_TABBAR,
+ "Too many words when expanding %s\n", cwdOption );
+- else
++ else if( NOT_NULL( *p.we_wordv ) )
+ {
+ filename = *p.we_wordv;
+
diff --git a/debian/patches/11macros_avoid_segfault.dpatch b/debian/patches/11macros_avoid_segfault.dpatch
deleted file mode 100644
index 0445f89..0000000
--- a/debian/patches/11macros_avoid_segfault.dpatch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11macros_avoid_segfault.dpatch by <he...@pool.math.tu-berlin.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix the checks of the s parameter, which comes from astr and may
-## DP: perfectly be NULL.
-
-@DPATCH@
---- mrxvt-0.5.2_orig/src/macros.c 2007-07-20 23:55:13.000000000 +0200
-+++ mrxvt-0.5.2/src/macros.c 2007-07-20 23:55:33.000000000 +0200
-@@ -1175,7 +1175,7 @@
- linecont = 1;
-
-
-- if( *s && *s == '-' )
-+ if( s && *s == '-' )
- {
- while( *(++s) && !isspace( *s ) )
- {
-@@ -1195,7 +1195,7 @@
- }
-
- rxvt_scr_printscreen( r, ATAB(r), scrollback, pretty, linecont,
-- *s ? s : NULL );
-+ s );
-
- break;
- }
diff --git a/debian/patches/11macros_avoid_segfault.patch b/debian/patches/11macros_avoid_segfault.patch
new file mode 100644
index 0000000..5c235fc
--- /dev/null
+++ b/debian/patches/11macros_avoid_segfault.patch
@@ -0,0 +1,28 @@
+From: <he...@pool.math.tu-berlin.de>
+Subject: Fix the checks of the s parameter, which comes from astr and may
+ perfectly be NULL.
+
+---
+ src/macros.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/src/macros.c
++++ b/src/macros.c
+@@ -1345,7 +1345,7 @@
+ linecont = 1;
+
+
+- if( *s && *s == '-' )
++ if( s && *s == '-' )
+ {
+ while( *(++s) && !isspace( *s ) )
+ {
+@@ -1365,7 +1365,7 @@
+ }
+
+ rxvt_scr_printscreen( r, ATAB(r), scrollback, pretty, linecont,
+- *s ? s : NULL );
++ s );
+
+ break;
+ }
diff --git a/debian/patches/12no_tainted_on_arm.dpatch b/debian/patches/12no_tainted_on_arm.patch
similarity index 100%
rename from debian/patches/12no_tainted_on_arm.dpatch
rename to debian/patches/12no_tainted_on_arm.patch
diff --git a/debian/patches/13more_profiles.dpatch b/debian/patches/13more_profiles.patch
similarity index 66%
rename from debian/patches/13more_profiles.dpatch
rename to debian/patches/13more_profiles.patch
index b179605..570c9a1 100644
--- a/debian/patches/13more_profiles.dpatch
+++ b/debian/patches/13more_profiles.patch
@@ -1,15 +1,15 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 13more_profiles.dpatch by <he...@pool.math.tu-berlin.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Increase the compiled-in number of available profiles (accomplished
-## DP: with a configure option in debian/rules) and document the change
-## DP: (done here).
+From: <he...@pool.math.tu-berlin.de>
+Subject: Increase the compiled-in number of available profiles.
+ This is accomplished with a configure option in debian/rules) and
+ document the change (done here).
-@DPATCH@
---- mrxvt-0.5.2_orig/doc/mrxvt.1
-+++ mrxvt-0.5.2/doc/mrxvt.1
-@@ -711,16 +711,18 @@
+---
+ doc/mrxvt.1 | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+--- a/doc/mrxvt.1
++++ b/doc/mrxvt.1
+@@ -703,16 +703,18 @@
.Pp
.
.Ar N
diff --git a/debian/patches/14typos.dpatch b/debian/patches/14typos.patch
similarity index 68%
rename from debian/patches/14typos.dpatch
rename to debian/patches/14typos.patch
index 3a26fce..36eeacc 100644
--- a/debian/patches/14typos.dpatch
+++ b/debian/patches/14typos.patch
@@ -1,10 +1,12 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 14typos.dpatch
-##
-## DP: Fix manpage typos.
+From: Jan Christoph Nordholz <he...@pool.math.tu-berlin.de>
+Subject: Fix manpage typos.
---- mrxvt-0.5.4.orig/doc/mrxvt.1 2007-08-01 10:26:41.000000000 -0400
-+++ mrxvt-0.5.4/doc/mrxvt.1 2007-11-24 04:03:06.000000000 -0500
+---
+ doc/mrxvt.1 | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/doc/mrxvt.1
++++ b/doc/mrxvt.1
@@ -366,7 +366,7 @@
.It Fl fade Ar %d
Make colors
@@ -14,7 +16,7 @@
.Ar %d
is an integer between 0 and 100
.Op Cm fading
-@@ -1412,7 +1412,7 @@
+@@ -1434,7 +1434,7 @@
.It Ctrl+Shift+k
Change shading of terminal to make it less transparent.
.It Ctrl+Shift+r
@@ -23,7 +25,7 @@
.
.It Ctrl+Shift+i
Hide/show tabbar
-@@ -1644,7 +1644,7 @@
+@@ -1668,7 +1668,7 @@
.It Ic GotoTab Op Ar N
Goto tab. If
.Ar N
diff --git a/debian/patches/15macro_backward_compat.dpatch b/debian/patches/15macro_backward_compat.patch
similarity index 57%
rename from debian/patches/15macro_backward_compat.dpatch
rename to debian/patches/15macro_backward_compat.patch
index 75d73c6..dc012d9 100644
--- a/debian/patches/15macro_backward_compat.dpatch
+++ b/debian/patches/15macro_backward_compat.patch
@@ -1,11 +1,33 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 15macro_backward_compat.dpatch by <he...@pool.math.tu-berlin.de>
-##
-## DP: Include upstream's new macro definitions, but keep the old ones, too.
+From: <he...@pool.math.tu-berlin.de>
+Subject: Include upstream's new macro definitions, but keep the old ones, too.
-@DPATCH@
---- mrxvt-0.5.2.orig/share/mrxvtrc 2007-07-25 00:43:45.000000000 +0200
-+++ mrxvt-0.5.2/share/mrxvtrc 2007-07-25 00:45:37.000000000 +0200
+ share/default.menu | 8 ++++----
+ share/mrxvtrc | 6 +++++-
+ 2 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/share/default.menu b/share/default.menu
+index 356493d..ee52837 100644
+--- a/share/default.menu
++++ b/share/default.menu
+@@ -64,10 +64,10 @@
+ {Toggle Tabbar}{Ctrl-Shift-i} ToggleSubwin t
+ {Toggle Tabbar buttons}{Ctrl-Shift-a} ToggleSubwin b
+ #2007-01-28 gi1242: Hiding all subwindows doesn't work well
+-#{-}
+-#{Hide all subwindows} ToggleSubwin -mst
+-#{Show all subwindows} ToggleSubwin +mst
+-#{-}
++{-}
++{Hide all subwindows} ToggleSubwin -mst
++{Show all subwindows} ToggleSubwin +mst
++{-}
+ ./Colors/*
+ {Reverse video} Esc \e[?5h
+ {Normal video} Esc \e[?5l
+diff --git a/share/mrxvtrc b/share/mrxvtrc
+index 3d6da27..cbd10da 100644
+--- a/share/mrxvtrc
++++ b/share/mrxvtrc
@@ -1,7 +1,7 @@
# ---------------------------------------------------------------------------- #
#
@@ -15,31 +37,14 @@
#
# This is the system wide configuration file for mrxvt (versions 0.5.0 or
# higher). Only resources with application name 'Mrxvt' are read from this file.
-@@ -185,6 +185,10 @@
- Mrxvt.macro.Ctrl+Shift+v: Paste
- Mrxvt.macro.Shift+Delete: SetTitle
+@@ -146,6 +146,10 @@ Mrxvt.macro.Primary+Shift+Right: GotoTab +1
+ # duplicates the current profile.
+ Mrxvt.macro.Ctrl+Shift+n: NewTab -
+# Clear scroll back and execute command
+Mrxvt.macro.Primary+Shift+Return: Esc \ec
+Mrxvt.macro.Primary+Add+Shift+Return: Str ^M
+
#
- # Mrxvt Console: Enable the useFifo option, and then open a console in a new
- # tab. Anything typed there is executed as a macro. When done (on clean exit),
---- mrxvt-0.5.2.orig/share/default.menu 2007-07-25 00:43:23.000000000 +0200
-+++ mrxvt-0.5.2/share/default.menu 2007-07-25 00:43:41.000000000 +0200
-@@ -61,10 +61,10 @@
- {Toggle Tabbar}{Ctrl-Shift-i} ToggleSubwin t
- {Toggle Tabbar buttons}{Ctrl-Shift-a} ToggleSubwin b
- #2007-01-28 gi1242: Hiding all subwindows doesn't work well
--#{-}
--#{Hide all subwindows} ToggleSubwin -mst
--#{Show all subwindows} ToggleSubwin +mst
--#{-}
-+{-}
-+{Hide all subwindows} ToggleSubwin -mst
-+{Show all subwindows} ToggleSubwin +mst
-+{-}
- ./Colors/*
- {Reverse video} Esc \e[?5h
- {Normal video} Esc \e[?5l
+ # By default we should only have Ctrl+Shift modifier keys defined. Other
+ # modifier combinations are sometimes used by the window manager, or
diff --git a/debian/patches/17fix_xftpsz.dpatch b/debian/patches/17fix_xftpsz.patch
similarity index 58%
rename from debian/patches/17fix_xftpsz.dpatch
rename to debian/patches/17fix_xftpsz.patch
index 18897a8..c79ae9f 100644
--- a/debian/patches/17fix_xftpsz.dpatch
+++ b/debian/patches/17fix_xftpsz.patch
@@ -1,12 +1,14 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 17fix_xftpsz.dpatch by <he...@pool.math.tu-berlin.de>
-##
-## DP: Document the 'xftpsz' commandline option and Xresource.
+From: <he...@pool.math.tu-berlin.de>
+Subject: Document the 'xftpsz' commandline option and Xresource.
-@DPATCH@
---- mrxvt-0.5.4.orig/src/xdefaults.c 2008-05-29 22:54:18.000000000 +0200
-+++ mrxvt-0.5.4/src/xdefaults.c 2008-05-29 22:55:06.000000000 +0200
-@@ -427,7 +427,7 @@
+---
+ doc/mrxvt.1 | 4 ++++
+ src/xdefaults.c | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+--- a/src/xdefaults.c
++++ b/src/xdefaults.c
+@@ -436,7 +436,7 @@
"freetype font sub-pixel order = rgb|bgr|vrgb|vbgr|none", 0),
STRG(Rs_xftpfn, "xftPFont", "xftpfn", "fontname",
"propotionally spaced freetype font to use for tabbar / menubar", 0),
@@ -15,8 +17,8 @@
"size of propotional freetype font", 0),
#endif
---- mrxvt-0.5.4.orig/doc/mrxvt.1 2008-05-29 22:55:13.000000000 +0200
-+++ mrxvt-0.5.4/doc/mrxvt.1 2008-05-29 22:57:10.000000000 +0200
+--- a/doc/mrxvt.1
++++ b/doc/mrxvt.1
@@ -529,6 +529,10 @@
visible. The active tab title is drawn in a bold font. (Your colors are still used).
.Op Cm xftPFont
diff --git a/debian/patches/18roff_minus.dpatch b/debian/patches/18roff_minus.patch
similarity index 91%
rename from debian/patches/18roff_minus.dpatch
rename to debian/patches/18roff_minus.patch
index a094b77..abc9a17 100644
--- a/debian/patches/18roff_minus.dpatch
+++ b/debian/patches/18roff_minus.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 18roff_minus.dpatch by <he...@pool.math.tu-berlin.de>
-##
-## DP: Clarify hyphen/minus entities in mrxvt(1).
+From: <he...@pool.math.tu-berlin.de>
+Subject: Clarify hyphen/minus entities in mrxvt(1).
-@DPATCH@
--- mrxvt-0.5.4.orig/doc/mrxvt.1 2009-07-24 13:44:05.632070148 +0200
+++ mrxvt-0.5.4/doc/mrxvt.1 2009-07-24 13:52:22.049310938 +0200
@@ -103,11 +103,11 @@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..379cb06
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,10 @@
+# 01SVN.patch
+02bootstrap_sh.patch
+03segfault_wd_empty.patch
+11macros_avoid_segfault.patch
+12no_tainted_on_arm.patch
+13more_profiles.patch
+14typos.patch
+15macro_backward_compat.patch
+17fix_xftpsz.patch
+18roff_minus.patch
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
1.7.9
