Package: qfreefax
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 0c856e4bab85eda181d4c437e528adc304b2907e Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 25 Feb 2012 10:13:46 -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 ++--
...es => 000-Disable_auto_check_for_updates.patch} | 10 ++--------
...ment => 001-copyright_headers_as_comment.patch} | 11 ++++-------
debian/patches/00list | 2 --
debian/patches/series | 2 ++
debian/rules | 5 ++---
debian/source/format | 1 +
9 files changed, 22 insertions(+), 23 deletions(-)
rename debian/patches/{000-Disable_auto_check_for_updates => 000-Disable_auto_check_for_updates.patch} (93%)
rename debian/patches/{001-copyright_headers_as_comment => 001-copyright_headers_as_comment.patch} (85%)
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 5bd0241..3c05ef4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qfreefax (0.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove 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> Sat, 25 Feb 2012 10:11:08 -0500
+
qfreefax (0.1-1) unstable; urgency=low
* Initial release (Closes: #428164).
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 3b13b6c..9b429ae 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: qfreefax
Section: net
Priority: extra
Maintainer: Adam Cécile (Le_Vert) <gand...@le-vert.net>
-Build-Depends: debhelper (>= 5), libqt4-dev, dpatch, imagemagick
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 9), libqt4-dev, imagemagick
+Standards-Version: 3.9.3
Homepage: http://qfreefax.sourceforge.net/
Package: qfreefax
diff --git a/debian/patches/000-Disable_auto_check_for_updates b/debian/patches/000-Disable_auto_check_for_updates.patch
similarity index 93%
rename from debian/patches/000-Disable_auto_check_for_updates
rename to debian/patches/000-Disable_auto_check_for_updates.patch
index 5b7780e..09d261f 100644
--- a/debian/patches/000-Disable_auto_check_for_updates
+++ b/debian/patches/000-Disable_auto_check_for_updates.patch
@@ -1,11 +1,5 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 000-Disable_auto_check_for_updates
-## by Adam Cécile (Le_Vert) <gand...@le-vert.net>
-##
-## DP: This patch disable and remove all codes that check and prompt the user
-## DP: for update release.
-
-@DPATCH@
+From: Adam Cécile (Le_Vert) <gand...@le-vert.net>
+Subject: Disable and remove code that prompt the user for update release.
diff -Nur qFreeFax-0.1/MainForm.cpp qFreeFax-0.1.new/MainForm.cpp
diff --git a/debian/patches/001-copyright_headers_as_comment b/debian/patches/001-copyright_headers_as_comment.patch
similarity index 85%
rename from debian/patches/001-copyright_headers_as_comment
rename to debian/patches/001-copyright_headers_as_comment.patch
index 6840a26..596a4e3 100644
--- a/debian/patches/001-copyright_headers_as_comment
+++ b/debian/patches/001-copyright_headers_as_comment.patch
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 001-copyright_headers_as_comment
-## by Adam Cécile (Le_Vert) <gand...@le-vert.net>
-##
-## DP: I don t know why but upstream updated the source tarball with new
-## DP: copyright headers which are not comments.
+From: Adam Cécile (Le_Vert) <gand...@le-vert.net>
+Subject: Fix copyright headers
+ I don t know why but upstream updated the source tarball with new
+ copyright headers which are not comments.
-@DPATCH@
diff -Nur qfreefax-0.1.orig/main.cpp qfreefax-0.1/main.cpp
--- qfreefax-0.1.orig/main.cpp 2007-08-20 10:00:53.000000000 +0200
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 1db7f6b..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-000-Disable_auto_check_for_updates
-001-copyright_headers_as_comment
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2bd0cbe
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+000-Disable_auto_check_for_updates.patch
+001-copyright_headers_as_comment.patch
diff --git a/debian/rules b/debian/rules
index 2245415..c81eafe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
CFLAGS = -Wall -g -D_REENTRANT \$$(DEFINES)
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -12,7 +11,7 @@ else
CFLAGS += -O2
endif
-Makefile: patch-stamp qFreeFax.pro
+Makefile: qFreeFax.pro
dh_testdir
qmake-qt4
@@ -22,7 +21,7 @@ build-stamp: Makefile
$(MAKE) CXXFLAGS="$(CFLAGS)"
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
[ ! -f Makefile ] || $(MAKE) distclean
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
