Package: fdupes
Severity: wishlist
Tags: patch
Hi Sandro,
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.
Thanks,
Jari
[*] 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>
>From 28873372543d51bbf27963c0e00f0429bcfef702 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Fri, 20 Apr 2012 15:02:51 +0300
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/README.source | 4 ----
debian/changelog | 9 +++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 10 ----------
..._code.dpatch => 01-restore-pristine-code.patch} | 8 ++------
...5_fix_makefile.dpatch => 05-fix-makefile.patch} | 7 ++-----
...{07_fix_manpage.dpatch => 07-fix-manpage.patch} | 7 ++-----
...typo.dpatch => 10-bts353789-manpage-typo.patch} | 8 ++------
...pport.dpatch => 20-bts447601-lfs-support.patch} | 8 ++------
...dpatch => 30-bts481809-manpage-summarize.patch} | 7 ++-----
....dpatch => 40-bts511702-nohidden-support.patch} | 7 ++-----
...e.dpatch => 50-bts284274-hardlinkreplace.patch} | 8 ++------
...eaks.dpatch => 60-bts544568-fix-memleaks.patch} | 8 ++------
...tch => 70-bts537138-disambiguate-recurse.patch} | 8 ++------
debian/patches/series | 10 ++++++++++
debian/rules | 11 +++++++----
debian/source/format | 2 +-
18 files changed, 50 insertions(+), 78 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_restore_pristine_code.dpatch => 01-restore-pristine-code.patch} (87%)
rename debian/patches/{05_fix_makefile.dpatch => 05-fix-makefile.patch} (76%)
rename debian/patches/{07_fix_manpage.dpatch => 07-fix-manpage.patch} (70%)
rename debian/patches/{10_bts353789_manpage_typo.dpatch => 10-bts353789-manpage-typo.patch} (72%)
rename debian/patches/{20_bts447601_lfs_support.dpatch => 20-bts447601-lfs-support.patch} (86%)
rename debian/patches/{30_bts481809_manpage_summarize.dpatch => 30-bts481809-manpage-summarize.patch} (65%)
rename debian/patches/{40_bts511702_nohidden_support.dpatch => 40-bts511702-nohidden-support.patch} (95%)
rename debian/patches/{50_bts284274_hardlinkreplace.dpatch => 50-bts284274-hardlinkreplace.patch} (96%)
rename debian/patches/{60_bts544568_fix_memleaks.dpatch => 60-bts544568-fix-memleaks.patch} (72%)
rename debian/patches/{70_bts537138_disambiguate_recurse.dpatch => 70-bts537138-disambiguate-recurse.patch} (88%)
create mode 100644 debian/patches/series
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 0d0aa40..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,4 +0,0 @@
-This package uses dpatch to handle patches against upstream source code; you
-can find additional information about dpatch at
-
- /usr/share/doc/dpatch/
diff --git a/debian/changelog b/debian/changelog
index b4c64ae..473051f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+fdupes (1.50-PR2-3.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.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+
+ -- Jari Aalto <jari.aa...@cante.net> Fri, 20 Apr 2012 14:59:39 +0300
+
fdupes (1.50-PR2-3) unstable; urgency=low
* debian/control
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 6e4969e..a73c514 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: fdupes
Section: utils
Priority: optional
Maintainer: Sandro Tosi <mo...@debian.org>
-Build-Depends: debhelper (>= 5), dpatch
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Homepage: http://code.google.com/p/fdupes/
Vcs-Git: git://git.debian.org/users/morph/fdupes.git
Vcs-Browser: http://git.debian.org/?p=users/morph/fdupes.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e000b92..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,10 +0,0 @@
-01_restore_pristine_code
-05_fix_makefile
-07_fix_manpage
-10_bts353789_manpage_typo
-20_bts447601_lfs_support
-30_bts481809_manpage_summarize
-40_bts511702_nohidden_support
-50_bts284274_hardlinkreplace
-60_bts544568_fix_memleaks
-70_bts537138_disambiguate_recurse
diff --git a/debian/patches/01_restore_pristine_code.dpatch b/debian/patches/01-restore-pristine-code.patch
similarity index 87%
rename from debian/patches/01_restore_pristine_code.dpatch
rename to debian/patches/01-restore-pristine-code.patch
index c1462bc..77a7750 100644
--- a/debian/patches/01_restore_pristine_code.dpatch
+++ b/debian/patches/01-restore-pristine-code.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_restore_pristine_code.dpatch by Sandro Tosi <matrixh...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from fdupes 1.40-4 diff.gz
+From: Sandro Tosi <matrixh...@gmail.com>
+Subject: New patch generated from fdupes 1.40-4 diff.gz
-@DPATCH@
diff -urNad fdupes~/fdupes.c fdupes/fdupes.c
--- fdupes~/fdupes.c 2008-03-17 20:12:35.000000000 +0100
+++ fdupes/fdupes.c 2008-03-18 00:03:06.798118530 +0100
diff --git a/debian/patches/05_fix_makefile.dpatch b/debian/patches/05-fix-makefile.patch
similarity index 76%
rename from debian/patches/05_fix_makefile.dpatch
rename to debian/patches/05-fix-makefile.patch
index 5a039e6..b513b2a 100644
--- a/debian/patches/05_fix_makefile.dpatch
+++ b/debian/patches/05-fix-makefile.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_fix_makefile.dpatch by Sandro Tosi <matrixh...@gmail.com>
-##
-## DP: Added to let this makefile work
+From: Sandro Tosi <matrixh...@gmail.com>
+Subject: Added to let this makefile work
-@DPATCH@
diff -urNad fdupes~/Makefile fdupes/Makefile
--- fdupes~/Makefile 2008-03-17 20:12:35.000000000 +0100
+++ fdupes/Makefile 2008-03-18 23:13:20.935619328 +0100
diff --git a/debian/patches/07_fix_manpage.dpatch b/debian/patches/07-fix-manpage.patch
similarity index 70%
rename from debian/patches/07_fix_manpage.dpatch
rename to debian/patches/07-fix-manpage.patch
index 3ce7f12..9ff7cb3 100644
--- a/debian/patches/07_fix_manpage.dpatch
+++ b/debian/patches/07-fix-manpage.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_fix_manpage.dpatch by Sandro Tosi <matrixh...@gmail.com>
-##
-## DP: Added to escape minus signs in manpage (lintian warning)
+From: Sandro Tosi <matrixh...@gmail.com>
+Subject: Added to escape minus signs in manpage (lintian warning)
-@DPATCH@
diff -urNad fdupes~/fdupes.1 fdupes/fdupes.1
--- fdupes~/fdupes.1 2008-03-17 20:12:35.000000000 +0100
+++ fdupes/fdupes.1 2008-03-18 23:30:49.051348038 +0100
diff --git a/debian/patches/10_bts353789_manpage_typo.dpatch b/debian/patches/10-bts353789-manpage-typo.patch
similarity index 72%
rename from debian/patches/10_bts353789_manpage_typo.dpatch
rename to debian/patches/10-bts353789-manpage-typo.patch
index f7db638..6aedefe 100644
--- a/debian/patches/10_bts353789_manpage_typo.dpatch
+++ b/debian/patches/10-bts353789-manpage-typo.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_bts353789_manpage_typo.dpatch by A Costa <agco...@gis.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix a typo in the manpage
+From: A Costa <agco...@gis.net>
+Subject: Fix a typo in the manpage
-@DPATCH@
diff -urNad fdupes~/fdupes.1 fdupes/fdupes.1
--- fdupes~/fdupes.1 2008-03-17 20:12:35.000000000 +0100
+++ fdupes/fdupes.1 2008-03-18 07:33:03.652581590 +0100
diff --git a/debian/patches/20_bts447601_lfs_support.dpatch b/debian/patches/20-bts447601-lfs-support.patch
similarity index 86%
rename from debian/patches/20_bts447601_lfs_support.dpatch
rename to debian/patches/20-bts447601-lfs-support.patch
index 4dc6c3d..e56d753 100644
--- a/debian/patches/20_bts447601_lfs_support.dpatch
+++ b/debian/patches/20-bts447601-lfs-support.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_bts447601_lfs_support.dpatch by Andrew Vaughan <ajv-li...@netspace.net.au>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: LFS support for file with size > 2GB
+From: Andrew Vaughan <ajv-li...@netspace.net.au>
+Subject: LFS support for file with size > 2GB
-@DPATCH@
diff -urNad fdupes~/Makefile fdupes/Makefile
--- fdupes~/Makefile 2008-03-17 20:12:35.000000000 +0100
+++ fdupes/Makefile 2008-03-18 07:34:44.070304071 +0100
diff --git a/debian/patches/30_bts481809_manpage_summarize.dpatch b/debian/patches/30-bts481809-manpage-summarize.patch
similarity index 65%
rename from debian/patches/30_bts481809_manpage_summarize.dpatch
rename to debian/patches/30-bts481809-manpage-summarize.patch
index 484b494..8277265 100644
--- a/debian/patches/30_bts481809_manpage_summarize.dpatch
+++ b/debian/patches/30-bts481809-manpage-summarize.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_bts481809_manpage_summarize.dpatch by Sandro Tosi <matrixh...@gmail.com>
-##
-## DP: BTS #481809: add --summarize to manpage
+From: Sandro Tosi <matrixh...@gmail.com>
+Subject: BTS #481809: add --summarize to manpage
-@DPATCH@
diff -urNad fdupes~/fdupes.1 fdupes/fdupes.1
--- fdupes~/fdupes.1 2008-07-03 08:54:35.238410127 +0200
+++ fdupes/fdupes.1 2008-07-03 08:56:38.653443151 +0200
diff --git a/debian/patches/40_bts511702_nohidden_support.dpatch b/debian/patches/40-bts511702-nohidden-support.patch
similarity index 95%
rename from debian/patches/40_bts511702_nohidden_support.dpatch
rename to debian/patches/40-bts511702-nohidden-support.patch
index 2fd6696..2aa45e4 100644
--- a/debian/patches/40_bts511702_nohidden_support.dpatch
+++ b/debian/patches/40-bts511702-nohidden-support.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 21_nohidden_support.dpatch by <m...@debian.org>
-##
-## DP: Adds --nohidden support
+From: <m...@debian.org>
+Subject: Adds --nohidden support
-@DPATCH@
diff -urNad fdupes-1.50-PR2~/fdupes.c fdupes-1.50-PR2/fdupes.c
--- fdupes-1.50-PR2~/fdupes.c 2009-01-13 14:13:33.000000000 -0200
+++ fdupes-1.50-PR2/fdupes.c 2009-01-13 14:14:14.000000000 -0200
diff --git a/debian/patches/50_bts284274_hardlinkreplace.dpatch b/debian/patches/50-bts284274-hardlinkreplace.patch
similarity index 96%
rename from debian/patches/50_bts284274_hardlinkreplace.dpatch
rename to debian/patches/50-bts284274-hardlinkreplace.patch
index d1eabc0..e11b1eb 100644
--- a/debian/patches/50_bts284274_hardlinkreplace.dpatch
+++ b/debian/patches/50-bts284274-hardlinkreplace.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_bts284274_hardlinkreplace.dpatch by <j...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Replace duplicate files with hardlinks
+From: <j...@debian.org>
+Subject: Replace duplicate files with hardlinks
-@DPATCH@
diff -urNad fdupes-1.50-PR2~/fdupes.1 fdupes-1.50-PR2/fdupes.1
--- fdupes-1.50-PR2~/fdupes.1 2009-07-31 00:38:28.000000000 +0200
+++ fdupes-1.50-PR2/fdupes.1 2009-07-31 00:42:14.000000000 +0200
diff --git a/debian/patches/60_bts544568_fix_memleaks.dpatch b/debian/patches/60-bts544568-fix-memleaks.patch
similarity index 72%
rename from debian/patches/60_bts544568_fix_memleaks.dpatch
rename to debian/patches/60-bts544568-fix-memleaks.patch
index 7fa88f8..470ffe0 100644
--- a/debian/patches/60_bts544568_fix_memleaks.dpatch
+++ b/debian/patches/60-bts544568-fix-memleaks.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 60_bts544568_fix_memleaks.dpatch by jbdenis <jeanbaptiste.de...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix memory leaks in main()
+From: jbdenis <jeanbaptiste.de...@gmail.com>
+Subject: Fix memory leaks in main()
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fdupes~/fdupes.c fdupes/fdupes.c
--- fdupes~/fdupes.c 2010-05-28 21:00:51.860398169 +0200
+++ fdupes/fdupes.c 2010-05-28 21:00:51.964399081 +0200
diff --git a/debian/patches/70_bts537138_disambiguate_recurse.dpatch b/debian/patches/70-bts537138-disambiguate-recurse.patch
similarity index 88%
rename from debian/patches/70_bts537138_disambiguate_recurse.dpatch
rename to debian/patches/70-bts537138-disambiguate-recurse.patch
index 6ee4ac6..39b5f49 100644
--- a/debian/patches/70_bts537138_disambiguate_recurse.dpatch
+++ b/debian/patches/70-bts537138-disambiguate-recurse.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 70_bts537138_disambiguate_recurse.dpatch by Sandro Tosi <mo...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Disambiguate the options '--recurse' and '--recurse:'
+From: Sandro Tosi <mo...@debian.org>
+Subject: Disambiguate the options '--recurse' and '--recurse:'
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fdupes~/fdupes.1 fdupes/fdupes.1
--- fdupes~/fdupes.1 2010-05-28 21:27:56.776898579 +0200
+++ fdupes/fdupes.1 2010-05-28 21:35:33.492898800 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2cd4957
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,10 @@
+01-restore-pristine-code.patch
+05-fix-makefile.patch
+07-fix-manpage.patch
+10-bts353789-manpage-typo.patch
+20-bts447601-lfs-support.patch
+30-bts481809-manpage-summarize.patch
+40-bts511702-nohidden-support.patch
+50-bts284274-hardlinkreplace.patch
+60-bts544568-fix-memleaks.patch
+70-bts537138-disambiguate-recurse.patch
diff --git a/debian/rules b/debian/rules
index 8b7ad7a..00d150a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,16 +3,19 @@
# This script uses debhelper by Joey Hess
# export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
+
+
+build-arch: build
+build-indep: build
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
# build package here
$(MAKE) LOCAL_LDFLAGS=-g
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -24,7 +27,7 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs usr/bin
#cp fdupes $(CURDIR)/debian/fdupes/usr/bin
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
--
1.7.9.5
