Package: rxvt-beta
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 3135ed51d35d0ca4e156334a48083e7d45958e95 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Mon, 27 Feb 2012 04:16:59 -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/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 7 -------
...d_ifdef.dpatch => 01rclock_invalid_ifdef.patch} | 8 ++------
.../{02rxvt_tbl.dpatch => 02rxvt_tbl.patch} | 8 ++------
...3rxvt_terminfo.dpatch => 03rxvt_terminfo.patch} | 8 ++------
...ault_console.dpatch => 04default_console.patch} | 8 ++------
...tion.dpatch => 05screen_nlines_assertion.patch} | 7 ++-----
...tyle_doc.dpatch => 06scrollbar_style_doc.patch} | 9 +++------
....dpatch => 07decrease_wm_race_likeliness.patch} | 9 +++------
debian/patches/series | 7 +++++++
debian/rules | 2 --
debian/source/format | 1 +
13 files changed, 27 insertions(+), 53 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01rclock_invalid_ifdef.dpatch => 01rclock_invalid_ifdef.patch} (66%)
rename debian/patches/{02rxvt_tbl.dpatch => 02rxvt_tbl.patch} (97%)
rename debian/patches/{03rxvt_terminfo.dpatch => 03rxvt_terminfo.patch} (89%)
rename debian/patches/{04default_console.dpatch => 04default_console.patch} (61%)
rename debian/patches/{05screen_nlines_assertion.dpatch => 05screen_nlines_assertion.patch} (75%)
rename debian/patches/{06scrollbar_style_doc.dpatch => 06scrollbar_style_doc.patch} (73%)
rename debian/patches/{07decrease_wm_race_likeliness.dpatch => 07decrease_wm_race_likeliness.patch} (76%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/compat b/debian/compat
index 1e8b314..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+9
diff --git a/debian/control b/debian/control
index d7279bd..fc1910e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: rxvt-beta
Section: x11
Priority: extra
Maintainer: Jan Christoph Nordholz <he...@pool.math.tu-berlin.de>
-Build-Depends: autotools-dev, debhelper (>= 6), dpatch, libx11-dev, libxt-dev, libxpm-dev
-Standards-Version: 3.7.3
+Build-Depends: autotools-dev, debhelper (>= 9), libx11-dev, libxt-dev, libxpm-dev
+Standards-Version: 3.9.3
Package: rxvt-beta
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index ee783e6..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,7 +0,0 @@
-01rclock_invalid_ifdef
-02rxvt_tbl
-03rxvt_terminfo
-04default_console
-05screen_nlines_assertion
-06scrollbar_style_doc
-07decrease_wm_race_likeliness
diff --git a/debian/patches/01rclock_invalid_ifdef.dpatch b/debian/patches/01rclock_invalid_ifdef.patch
similarity index 66%
rename from debian/patches/01rclock_invalid_ifdef.dpatch
rename to debian/patches/01rclock_invalid_ifdef.patch
index 981555a..e8883d8 100644
--- a/debian/patches/01rclock_invalid_ifdef.dpatch
+++ b/debian/patches/01rclock_invalid_ifdef.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01rclock_invalid_ifdef.dpatch by <root@>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: rclock invalid #ifdef test
+From: Jan Christoph Nordholz <he...@pool.math.tu-berlin.de>
+Subject: rclock invalid #ifdef test
-@DPATCH@
--- rxvt-beta/rclock/rclock.c.orig 2002-08-08 00:32:14.000000000 +0000
+++ rxvt-beta/rclock/rclock.c 2006-10-09 22:16:15.000000000 +0000
diff --git a/debian/patches/02rxvt_tbl.dpatch b/debian/patches/02rxvt_tbl.patch
similarity index 97%
rename from debian/patches/02rxvt_tbl.dpatch
rename to debian/patches/02rxvt_tbl.patch
index 38e8323..b451d67 100644
--- a/debian/patches/02rxvt_tbl.dpatch
+++ b/debian/patches/02rxvt_tbl.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02rxvt_tbl.dpatch by <r...@hejre.minidns.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: rxvt.tbl syntax fixes
+From: Jan Christoph Nordholz <he...@pool.math.tu-berlin.de>
+Subject: rxvt.tbl syntax fixes
-@DPATCH@
--- rxvt-beta-2.7.10.orig/doc/rxvt.tbl
+++ rxvt-beta-2.7.10/doc/rxvt.tbl
diff --git a/debian/patches/03rxvt_terminfo.dpatch b/debian/patches/03rxvt_terminfo.patch
similarity index 89%
rename from debian/patches/03rxvt_terminfo.dpatch
rename to debian/patches/03rxvt_terminfo.patch
index b42de92..5d6b0af 100644
--- a/debian/patches/03rxvt_terminfo.dpatch
+++ b/debian/patches/03rxvt_terminfo.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03rxvt_terminfo.dpatch by <r...@hejre.minidns.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: terminfo entry for monochrome rxvts
+From: Jan Christoph Nordholz <he...@pool.math.tu-berlin.de>
+Subject: terminfo entry for monochrome rxvts
-@DPATCH@
--- rxvt-beta-2.7.10.orig/src/init.c
+++ rxvt-beta-2.7.10/src/init.c
diff --git a/debian/patches/04default_console.dpatch b/debian/patches/04default_console.patch
similarity index 61%
rename from debian/patches/04default_console.dpatch
rename to debian/patches/04default_console.patch
index 863ccd4..5a12e7c 100644
--- a/debian/patches/04default_console.dpatch
+++ b/debian/patches/04default_console.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04default_console.dpatch by <r...@hejre.minidns.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: change default console
+From: Jan Christoph Nordholz <he...@pool.math.tu-berlin.de>
+Subject: change default console
-@DPATCH@
--- rxvt-beta-2.7.10.orig/src/init.h
+++ rxvt-beta-2.7.10/src/init.h
diff --git a/debian/patches/05screen_nlines_assertion.dpatch b/debian/patches/05screen_nlines_assertion.patch
similarity index 75%
rename from debian/patches/05screen_nlines_assertion.dpatch
rename to debian/patches/05screen_nlines_assertion.patch
index d5279e8..65bdecc 100644
--- a/debian/patches/05screen_nlines_assertion.dpatch
+++ b/debian/patches/05screen_nlines_assertion.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05screen_nlines_assertion.dpatch by <he...@pool.math.tu-berlin.de>
-##
-## DP: Fix off-by-one error in assertion.
+From: Jan Christoph Nordholz <he...@pool.math.tu-berlin.de>
+Subject: Fix off-by-one error in assertion.
-@DPATCH@
--- rxvt-beta-2.7.10.orig/src/screen.c 2007-07-22 01:25:24.000000000 +0200
+++ rxvt-beta-2.7.10/src/screen.c 2007-07-22 01:25:31.000000000 +0200
@@ -1801,7 +1801,7 @@
diff --git a/debian/patches/06scrollbar_style_doc.dpatch b/debian/patches/06scrollbar_style_doc.patch
similarity index 73%
rename from debian/patches/06scrollbar_style_doc.dpatch
rename to debian/patches/06scrollbar_style_doc.patch
index 9d0a5d2..12d3de9 100644
--- a/debian/patches/06scrollbar_style_doc.dpatch
+++ b/debian/patches/06scrollbar_style_doc.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06scrollbar_style_doc.dpatch by <he...@pool.math.tu-berlin.de>
-##
-## DP: Add a note in the manpage regarding the missing manpage style
-## DP: support in the rxvt-xterm binary.
+From: Jan Christoph Nordholz <he...@pool.math.tu-berlin.de>
+Subject: Add a note in the manpage regarding the missing manpage style
+support in the rxvt-xterm binary.
-@DPATCH@
--- rxvt-beta-2.7.10.orig/doc/rxvt.tbl 2007-07-22 01:29:42.000000000 +0200
+++ rxvt-beta-2.7.10/doc/rxvt.tbl 2007-07-22 01:39:49.000000000 +0200
@@ -354,7 +354,7 @@
diff --git a/debian/patches/07decrease_wm_race_likeliness.dpatch b/debian/patches/07decrease_wm_race_likeliness.patch
similarity index 76%
rename from debian/patches/07decrease_wm_race_likeliness.dpatch
rename to debian/patches/07decrease_wm_race_likeliness.patch
index b6ab9d6..972b888 100644
--- a/debian/patches/07decrease_wm_race_likeliness.dpatch
+++ b/debian/patches/07decrease_wm_race_likeliness.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07decrease_wm_race_likeliness by <he...@pool.math.tu-berlin.de>
-##
-## DP: Initialize the terminal dimensions earlier to reduce the probabilty
-## DP: that the wm interfers.
+From: Jan Christoph Nordholz <he...@pool.math.tu-berlin.de>
+Subject: Initialize the terminal dimensions earlier.
+ This reduces the probabilty that the wm interfers.
-@DPATCH@
--- rxvt-beta-2.7.10.orig/src/init.c 2003-07-23 00:27:49.000000000 +0200
+++ rxvt-beta-2.7.10/src/init.c 2003-07-22 23:17:04.000000000 +0200
@@ -1105,6 +1105,9 @@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..01275ee
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,7 @@
+01rclock_invalid_ifdef.patch
+02rxvt_tbl.patch
+03rxvt_terminfo.patch
+04default_console.patch
+05screen_nlines_assertion.patch
+06scrollbar_style_doc.patch
+07decrease_wm_race_likeliness.patch
diff --git a/debian/rules b/debian/rules
index c29568b..f3212be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,6 @@ build-stamp:
dh_testdir
cp /usr/share/misc/config.guess autoconf/
cp /usr/share/misc/config.sub autoconf/
- dpatch apply-all
./configure --prefix=/usr \
--mandir=/usr/share/man \
--enable-languages \
@@ -53,7 +52,6 @@ clean:
-find . "-(" -name Makefile -or -name "*.intpro" -or -name "*.extpro" "-)" -exec rm -f "{}" ";"
rm -f autoconf/config.guess autoconf/config.sub
- dpatch deapply-all
dh_clean
install: build
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
