Package: grub-choose-default
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
Kjell, as we spoke before, here is the proposed NMU patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload with these changes.
Thanks,
Jari
>From 725d1ae81957667566f19a6111d3c3415442f65e Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Tue, 28 Feb 2012 08:56:37 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 2 --
....dpatch => 01_fix-crash-without-menu.lst.patch} | 8 ++------
...fix-crash-with-nonnumeric-in-default.lst.patch} | 8 ++------
debian/patches/series | 2 ++
debian/rules | 6 ++----
debian/source/format | 1 +
9 files changed, 20 insertions(+), 21 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_fix-crash-without-menu.lst.dpatch => 01_fix-crash-without-menu.lst.patch} (80%)
rename debian/patches/{02_fix-crash-with-nonnumeric-in-default.lst.dpatch => 02_fix-crash-with-nonnumeric-in-default.lst.patch} (75%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index f6a5ed3..071dd93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+grub-choose-default (0.2-6.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <[email protected]> Tue, 28 Feb 2012 08:55:47 -0500
+
grub-choose-default (0.2-6) unstable; urgency=low
* added dpatch
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 770bd29..12e87d0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: grub-choose-default
Section: admin
Priority: extra
Maintainer: Kjell Braden <[email protected]>
-Build-Depends: debhelper (>= 5), dpatch
+Build-Depends: debhelper (>= 9)
Build-Depends-Indep: python-support (>= 0.6), docbook-to-man
-Standards-Version: 3.7.3
+Standards-Version: 3.9.3
Homepage: http://cs.unm.edu/~dmohr/grub.php
Package: grub-choose-default
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index b573205..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_fix-crash-without-menu.lst
-02_fix-crash-with-nonnumeric-in-default.lst
diff --git a/debian/patches/01_fix-crash-without-menu.lst.dpatch b/debian/patches/01_fix-crash-without-menu.lst.patch
similarity index 80%
rename from debian/patches/01_fix-crash-without-menu.lst.dpatch
rename to debian/patches/01_fix-crash-without-menu.lst.patch
index 220e61c..b3766c0 100644
--- a/debian/patches/01_fix-crash-without-menu.lst.dpatch
+++ b/debian/patches/01_fix-crash-without-menu.lst.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix-crash-without-menu.lst.dpatch by Kjell Braden <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix a crash when no menu.lst can be found
+From: Kjell Braden <[email protected]>
+Subject: Fix a crash when no menu.lst can be found
-@DPATCH@
diff -urNad grub-choose-default-0.2~/grub-choose-default.py grub-choose-default-0.2/grub-choose-default.py
--- grub-choose-default-0.2~/grub-choose-default.py 2008-05-11 13:09:08.000000000 +0200
+++ grub-choose-default-0.2/grub-choose-default.py 2008-05-11 13:09:47.000000000 +0200
diff --git a/debian/patches/02_fix-crash-with-nonnumeric-in-default.lst.dpatch b/debian/patches/02_fix-crash-with-nonnumeric-in-default.lst.patch
similarity index 75%
rename from debian/patches/02_fix-crash-with-nonnumeric-in-default.lst.dpatch
rename to debian/patches/02_fix-crash-with-nonnumeric-in-default.lst.patch
index ac2879d..04c5639 100644
--- a/debian/patches/02_fix-crash-with-nonnumeric-in-default.lst.dpatch
+++ b/debian/patches/02_fix-crash-with-nonnumeric-in-default.lst.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix-crash-with-nonnumeric-in-default.lst.dpatch by Kjell Braden <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix a crash when a non numeric value is found in /boot/grub/default
+From: Kjell Braden <[email protected]>
+Subject: fix a crash when a non numeric value is found in /boot/grub/default
-@DPATCH@
diff -urNad grub-choose-default-0.2~/grub-choose-default.py grub-choose-default-0.2/grub-choose-default.py
--- grub-choose-default-0.2~/grub-choose-default.py 2008-05-11 13:09:08.000000000 +0200
+++ grub-choose-default-0.2/grub-choose-default.py 2008-05-11 13:10:18.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..51caf92
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_fix-crash-without-menu.lst.patch
+02_fix-crash-with-nonnumeric-in-default.lst.patch
diff --git a/debian/rules b/debian/rules
index 65f8bf0..5533b96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,19 +3,17 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
docbook-to-man debian/grub-choose-default.sgml > debian/grub-choose-default.8
touch $@
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
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
