Package: freeguide
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 2351bfe958a3be8e5cc9b8d66ec8874b7e6a9c01 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Tue, 28 Feb 2012 08:18:31 -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 | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
...sktop-file.dpatch => 01-fix-desktop-file.patch} | 9 ++-------
debian/patches/series | 1 +
debian/rules | 5 ++---
debian/source/format | 1 +
8 files changed, 17 insertions(+), 14 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01-fix-desktop-file.dpatch => 01-fix-desktop-file.patch} (52%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 41dbf9d..324f124 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+freeguide (0.10.9-1.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 <jari.aa...@cante.net> Tue, 28 Feb 2012 08:15:20 -0500
+
freeguide (0.10.9-1) unstable; urgency=low
* New upstream release. (Closes: #492789)
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 116b89d..cb559ae 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: freeguide
Section: misc
Priority: optional
Maintainer: Daniel Watkins <dan...@daniel-watkins.co.uk>
-Build-Depends: debhelper (>= 5.0), dpatch, ant
+Build-Depends: debhelper (>= 9), ant
Build-Depends-Indep: openjdk-6-jdk | java2-sdk, ant-optional
-Standards-Version: 3.8.0
+Standards-Version: 3.9.3
Homepage: http://www.artificialworlds.net/freeguide/Main/HomePage
Package: freeguide
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 41fd611..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01-fix-desktop-file.dpatch
diff --git a/debian/patches/01-fix-desktop-file.dpatch b/debian/patches/01-fix-desktop-file.patch
similarity index 52%
rename from debian/patches/01-fix-desktop-file.dpatch
rename to debian/patches/01-fix-desktop-file.patch
index c218fd8..544d0f6 100644
--- a/debian/patches/01-fix-desktop-file.dpatch
+++ b/debian/patches/01-fix-desktop-file.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-fix-desktop-file.dpatch by Daniel Watkins <dan...@daniel-watkins.co.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix the categories in freeguide.desktop and remove the now unnecessary
-## DP: Encoding key.
+From: Daniel Watkins <dan...@daniel-watkins.co.uk>
+Subject: Fix the categories and remove the now unnecessary Encoding key.
-@DPATCH@
--- freeguide-0.10.7.orig/install/linux/freeguide.desktop
+++ freeguide-0.10.7/install/linux/freeguide.desktop
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cefa0ad
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-fix-desktop-file.patch
diff --git a/debian/rules b/debian/rules
index 9397897..27a064d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,8 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
build: build-stamp
-build-stamp: patch
+build-stamp:
rm -f doc/html-local/README.html
rm -f doc/html-local/developers-*.html
ant
@@ -15,7 +14,7 @@ install: build
rm debian/tmp/usr/share/doc/freeguide/COPYING
cp debian/freeguide.xpm debian/tmp/usr/share/pixmaps/
-clean: unpatch
+clean:
rm -f build-stamp
ant clean
dh_clean
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
