Package: shoes
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
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 54d26d985723d4775832be941f79df94981560de Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Mon, 27 Feb 2012 12:57:01 -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 --
...solute_paths.dpatch => 01_absolute_paths.patch} | 10 +++-------
...ri.dpatch => 02_remove_rubygems_open-uri.patch} | 10 +++-------
debian/patches/series | 2 ++
debian/rules | 5 ++---
8 files changed, 21 insertions(+), 22 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_absolute_paths.dpatch => 01_absolute_paths.patch} (91%)
rename debian/patches/{02_remove_rubygems_open-uri.dpatch => 02_remove_rubygems_open-uri.patch} (57%)
create mode 100644 debian/patches/series
diff --git a/debian/changelog b/debian/changelog
index ff0eb0c..350ff23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+shoes (0.r396-5.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]> Mon, 27 Feb 2012 12:44:16 -0500
+
shoes (0.r396-5) unstable; urgency=low
* Depend on rubygems1.8 instead of libgems-ruby1.8 (Closes: #491914).
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 ed650f7..11f2248 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: interpreters
Priority: extra
Maintainer: Bram Senders <[email protected]>
Uploaders: Paul van Tilburg <[email protected]>
-Build-Depends: debhelper (>= 5.0.51~), dpatch, pkg-config, libgtk2.0-dev, libcairo2-dev, libpango1.0-dev, libgif-dev, libjpeg-dev, ruby, ruby1.8-dev
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 9), pkg-config, libgtk2.0-dev, libcairo2-dev, libpango1.0-dev, libgif-dev, libjpeg-dev, ruby, ruby1.8-dev
+Standards-Version: 3.9.3
Homepage: http://code.whytheluckystiff.net/shoes/
Package: shoes
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 97c6ac5..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_absolute_paths
-02_remove_rubygems_open-uri
diff --git a/debian/patches/01_absolute_paths.dpatch b/debian/patches/01_absolute_paths.patch
similarity index 91%
rename from debian/patches/01_absolute_paths.dpatch
rename to debian/patches/01_absolute_paths.patch
index dc9d607..87d68d5 100644
--- a/debian/patches/01_absolute_paths.dpatch
+++ b/debian/patches/01_absolute_paths.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_absolute_paths.dpatch by Bram Senders <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Replace paths relative to the CWD by paths to the absolute location
-## DP: where the file is installed.
+From: Bram Senders <[email protected]>
+Subject: Replace paths relative to the CWD by paths to the absolute location
+ where the file is installed.
-@DPATCH@
diff -urNad shoes-0.r396~/lib/shoes/help.rb shoes-0.r396/lib/shoes/help.rb
--- shoes-0.r396~/lib/shoes/help.rb 2008-01-08 20:51:30.000000000 +0100
+++ shoes-0.r396/lib/shoes/help.rb 2008-01-22 17:19:55.000000000 +0100
diff --git a/debian/patches/02_remove_rubygems_open-uri.dpatch b/debian/patches/02_remove_rubygems_open-uri.patch
similarity index 57%
rename from debian/patches/02_remove_rubygems_open-uri.dpatch
rename to debian/patches/02_remove_rubygems_open-uri.patch
index e461dfe..87242e1 100644
--- a/debian/patches/02_remove_rubygems_open-uri.dpatch
+++ b/debian/patches/02_remove_rubygems_open-uri.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_remove_rubygems_open-uri.dpatch by Bram Senders <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove reference to rubygems/open-uri, as this is removed from
-## DP: libgems-ruby1.8 as of version 1.1.1.
+From: Bram Senders <[email protected]>
+Subject: Remove reference to rubygems/open-uri, as this is removed from
+ libgems-ruby1.8 as of version 1.1.1.
-@DPATCH@
diff -urNad shoes-0.r396~/lib/shoes/cache.rb shoes-0.r396/lib/shoes/cache.rb
--- shoes-0.r396~/lib/shoes/cache.rb 2007-12-30 06:50:53.000000000 +0100
+++ shoes-0.r396/lib/shoes/cache.rb 2008-06-15 09:32:49.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c8fa480
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_absolute_paths.patch
+02_remove_rubygems_open-uri.patch
diff --git a/debian/rules b/debian/rules
index eed3d78..7c3c08a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,15 +9,14 @@
# 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
$(MAKE)
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
--
1.7.9
