Package: gdome2
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 f71c819178bcc848d343d78ebe7ce983f0fe8bad Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Mon, 27 Feb 2012 03:21:00 -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/README.source | 6 ------
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/libgdome2-dev.docs | 1 -
debian/patches/00list | 3 ---
.../{01glibconfig.dpatch => 01glibconfig.patch} | 13 +++++--------
.../{02fix_manpage.dpatch => 02fix_manpage.patch} | 7 ++-----
.../{03no_glib_1.dpatch => 03no_glib_1.patch} | 11 ++++-------
debian/patches/series | 3 +++
debian/source/format | 1 +
11 files changed, 26 insertions(+), 33 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/libgdome2-dev.docs
delete mode 100644 debian/patches/00list
rename debian/patches/{01glibconfig.dpatch => 01glibconfig.patch} (66%)
rename debian/patches/{02fix_manpage.dpatch => 02fix_manpage.patch} (67%)
rename debian/patches/{03no_glib_1.dpatch => 03no_glib_1.patch} (76%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 0a2d43b..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,6 +0,0 @@
-This package uses dpatch for managing the distribution changes to the source
-code - please refer to the following file for further usage information:
-
-/usr/share/doc/dpatch/README.source.gz
-
- -- Jan Christoph Nordholz <[email protected]> 17 Aug 2009
diff --git a/debian/changelog b/debian/changelog
index 215cf31..cb3e1a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gdome2 (0.8.1+debian-4.2) 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 03:08:25 -0500
+
gdome2 (0.8.1+debian-4.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 caada6c..4400d73 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: gdome2
Section: libdevel
Priority: optional
Maintainer: Jan Christoph Nordholz <[email protected]>
-Build-Depends: debhelper (>> 7), libxml2-dev, libglib2.0-dev, pkg-config, autotools-dev, dpatch, libtool, gtk-doc-tools
+Build-Depends: debhelper (>= 9), libxml2-dev, libglib2.0-dev, pkg-config, autotools-dev, libtool, gtk-doc-tools
Homepage: http://gdome2.cs.unibo.it/
-Standards-Version: 3.8.3
+Standards-Version: 3.9.3
Package: libgdome2-dev
Architecture: any
diff --git a/debian/libgdome2-dev.docs b/debian/libgdome2-dev.docs
deleted file mode 100644
index 5323396..0000000
--- a/debian/libgdome2-dev.docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/README.source
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 3212132..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01glibconfig
-02fix_manpage
-03no_glib_1
diff --git a/debian/patches/01glibconfig.dpatch b/debian/patches/01glibconfig.patch
similarity index 66%
rename from debian/patches/01glibconfig.dpatch
rename to debian/patches/01glibconfig.patch
index a6d4393..6381e78 100644
--- a/debian/patches/01glibconfig.dpatch
+++ b/debian/patches/01glibconfig.patch
@@ -1,12 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## glibconfig.dpatch by <[email protected]>
-##
-## DP: Remove the calls to 'glib-config' (which is a tool from
-## DP: libglib1.2 and therefore the wrong one to ask) and replace
-## DP: them with the ./configure macros that have already been
-## DP: collected.
+From: <[email protected]>
+Subject: Remove the calls to glib-config
+ glib-config is a tool from libglib1.2 and therefore the wrong one to
+ ask) and replace them with the ./configure macros that have already
+ been collected.
-@DPATCH@
--- gdome2-0.8.1/gdome-config.in.orig 2007-07-07 00:15:30.000000000 +0200
+++ gdome2-0.8.1/gdome-config.in 2007-07-07 00:14:15.000000000 +0200
@@ -83,8 +83,8 @@
diff --git a/debian/patches/02fix_manpage.dpatch b/debian/patches/02fix_manpage.patch
similarity index 67%
rename from debian/patches/02fix_manpage.dpatch
rename to debian/patches/02fix_manpage.patch
index 77ee24a..b5001ae 100644
--- a/debian/patches/02fix_manpage.dpatch
+++ b/debian/patches/02fix_manpage.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02fix_manpage.dpatch by <[email protected]>
-##
-## DP: Fix roff errors in the gdome-config(1) manpage.
+From: <[email protected]>
+Subject: Fix roff errors in the gdome-config(1) manpage.
-@DPATCH@
--- gdome2-0.8.1+debian.orig/gdome-config.1.in 2008-04-30 21:58:27.000000000 +0200
+++ gdome2-0.8.1+debian/dome-config.1.in 2008-04-30 21:58:43.000000000 +0200
@@ -9,7 +9,6 @@
diff --git a/debian/patches/03no_glib_1.dpatch b/debian/patches/03no_glib_1.patch
similarity index 76%
rename from debian/patches/03no_glib_1.dpatch
rename to debian/patches/03no_glib_1.patch
index 8d2d60d..2e809d3 100644
--- a/debian/patches/03no_glib_1.dpatch
+++ b/debian/patches/03no_glib_1.patch
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_no_glib_1.dpatch by <[email protected]>
-##
-## DP: Comment out the paragraph for glib-1; it is no longer
-## DP: needed and AM_PATH_GLIB is not available unless we
-## DP: also depend on the old glib.
+From: <[email protected]>
+Subject: Comment out the paragraph for glib-1
+ It is no longer needed and AM_PATH_GLIB is not available unless we
+ also depend on the old glib.
-@DPATCH@
--- gdome2-0.8.1+debian.orig/configure.in
+++ gdome2-0.8.1+debian/configure.in
@@ -63,18 +63,18 @@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d4e84ae
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01glibconfig.patch
+02fix_manpage.patch
+03no_glib_1.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
