Package: flexbackup
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 5f132ab49188a4d3c9e095180028c4cb4254995f Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Tue, 28 Feb 2012 02:38:08 -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 | 10 --------
.../{01_tempfile.dpatch => 01_tempfile.patch} | 16 +++++--------
...{02_buffer_test.dpatch => 02_buffer_test.patch} | 17 +++++---------
...le_destdir.dpatch => 10_Makefile_destdir.patch} | 8 +-----
...s.dpatch => 20_flexbackup.conf.5_hyphens.patch} | 8 +-----
...2_flexbackup.1.dpatch => 22_flexbackup.1.patch} | 13 +++-------
...bian_tape.dpatch => 30_basic_debian_tape.patch} | 14 ++++-------
debian/patches/40_dump_path.dpatch | 24 --------------------
debian/patches/40_dump_path.patch | 20 ++++++++++++++++
...k.dpatch => 42_afio_cpio_incompatible_ok.patch} | 12 +++------
...0_lzma_support.dpatch => 50_lzma_support.patch} | 8 +-----
...tch => 60_use_afio_default_nocompression.patch} | 14 +++--------
debian/patches/series | 10 ++++++++
debian/rules | 16 ++----------
debian/source/format | 1 +
18 files changed, 80 insertions(+), 125 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_tempfile.dpatch => 01_tempfile.patch} (86%)
rename debian/patches/{02_buffer_test.dpatch => 02_buffer_test.patch} (71%)
rename debian/patches/{10_Makefile_destdir.dpatch => 10_Makefile_destdir.patch} (72%)
rename debian/patches/{20_flexbackup.conf.5_hyphens.dpatch => 20_flexbackup.conf.5_hyphens.patch} (78%)
rename debian/patches/{22_flexbackup.1.dpatch => 22_flexbackup.1.patch} (85%)
rename debian/patches/{30_basic_debian_tape.dpatch => 30_basic_debian_tape.patch} (78%)
delete mode 100644 debian/patches/40_dump_path.dpatch
create mode 100644 debian/patches/40_dump_path.patch
rename debian/patches/{42_afio_cpio_incompatible_ok.dpatch => 42_afio_cpio_incompatible_ok.patch} (54%)
rename debian/patches/{50_lzma_support.dpatch => 50_lzma_support.patch} (95%)
rename debian/patches/{60_use_afio_default_nocompression.dpatch => 60_use_afio_default_nocompression.patch} (89%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index b84c012..2f92b0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+flexbackup (1.2.1-6.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]> Tue, 28 Feb 2012 02:37:14 -0500
+
flexbackup (1.2.1-6) unstable; urgency=low
* Acknowledge NMU. Thanks, Marco Rodrigues and Lucas Nussbaum!
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 3851896..748489b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: admin
Priority: optional
Maintainer: Kurt B. Kaiser <[email protected]>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 5.0.0), dpatch
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Homepage: http://www.edwinh.org/flexbackup/
Package: flexbackup
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index a8f42c2..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,10 +0,0 @@
-01_tempfile
-02_buffer_test
-10_Makefile_destdir
-20_flexbackup.conf.5_hyphens
-22_flexbackup.1
-30_basic_debian_tape
-40_dump_path
-42_afio_cpio_incompatible_ok
-50_lzma_support
-60_use_afio_default_nocompression
diff --git a/debian/patches/01_tempfile.dpatch b/debian/patches/01_tempfile.patch
similarity index 86%
rename from debian/patches/01_tempfile.dpatch
rename to debian/patches/01_tempfile.patch
index 092d84f..0353088 100644
--- a/debian/patches/01_tempfile.dpatch
+++ b/debian/patches/01_tempfile.patch
@@ -1,14 +1,10 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_tempfile.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: 1.2.1-3: Fix RC bug: insecure use of temporary files.
-## DP: http://bugs.gentoo.org/show_bug.cgi?id=116510
-## DP: original patch from Martin Schulze, further developed at Gentoo
-## DP: to handle creation of remote /tmp subdirectory.
-## DP: CVE-2005-4802
+From: <[email protected]>
+Subject: 1.2.1-3: Fix RC bug: insecure use of temporary files.
+ http://bugs.gentoo.org/show_bug.cgi?id=116510
+ original patch from Martin Schulze, further developed at Gentoo
+ to handle creation of remote /tmp subdirectory.
+ CVE-2005-4802
-@DPATCH@
diff -urNad flexbackup-1.2.1~/flexbackup flexbackup-1.2.1/flexbackup
--- flexbackup-1.2.1~/flexbackup 2003-10-10 07:12:09.000000000 -0700
+++ flexbackup-1.2.1/flexbackup 2006-08-31 16:09:16.000000000 -0700
diff --git a/debian/patches/02_buffer_test.dpatch b/debian/patches/02_buffer_test.patch
similarity index 71%
rename from debian/patches/02_buffer_test.dpatch
rename to debian/patches/02_buffer_test.patch
index a929838..f6f8b78 100644
--- a/debian/patches/02_buffer_test.dpatch
+++ b/debian/patches/02_buffer_test.patch
@@ -1,14 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_buffer_test.dpatch by <"Kurt B. Kaiser" <[email protected]>>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Safe tmpfiles in test_bufferprog which don't use 'tempfile'; this
-## DP: allows remote backups on systems which don't support 'tempfile'.
-## DP: Create/remove the remote temporary directory in test_bufferprog.
-## DP: Also displays the test script in debug mode.
-## DP: To be applied after 01_tempfile.dpatch
-
-@DPATCH@
+From: <"Kurt B. Kaiser" <[email protected]>>
+Subject: Safe tmpfiles in test_bufferprog which don't use 'tempfile'.
+ This allows remote backups on systems which don't support 'tempfile'.
+ Create/remove the remote temporary directory in test_bufferprog. Also
+ displays the test script in debug mode. To be applied after
+ 01_tempfile.dpatch
--- flexbackup-1.2.1/flexbackup 2006-09-05 22:46:54.000000000 -0700
+++ flexbackup.mod 2006-09-06 21:55:44.000000000 -0700
diff --git a/debian/patches/10_Makefile_destdir.dpatch b/debian/patches/10_Makefile_destdir.patch
similarity index 72%
rename from debian/patches/10_Makefile_destdir.dpatch
rename to debian/patches/10_Makefile_destdir.patch
index 92ab601..354fa0f 100644
--- a/debian/patches/10_Makefile_destdir.dpatch
+++ b/debian/patches/10_Makefile_destdir.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_Makefile_destdir.dpatch by <"Kurt B. Kaiser" <[email protected]>>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: add DESTDIR to paths
+From: <"Kurt B. Kaiser" <[email protected]>>
+Subject: add DESTDIR to paths
-@DPATCH@
diff -urNad flexbackup~/Makefile flexbackup/Makefile
--- flexbackup~/Makefile 2003-07-29 10:00:07.000000000 -0700
+++ flexbackup/Makefile 2006-09-05 13:52:42.000000000 -0700
diff --git a/debian/patches/20_flexbackup.conf.5_hyphens.dpatch b/debian/patches/20_flexbackup.conf.5_hyphens.patch
similarity index 78%
rename from debian/patches/20_flexbackup.conf.5_hyphens.dpatch
rename to debian/patches/20_flexbackup.conf.5_hyphens.patch
index afeffbb..4b07844 100644
--- a/debian/patches/20_flexbackup.conf.5_hyphens.dpatch
+++ b/debian/patches/20_flexbackup.conf.5_hyphens.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_flexbackup.conf_hyphens.5.dpatch by <"Kurt B. Kaiser" <[email protected]>>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Minus signs need to be escaped.
+From: <"Kurt B. Kaiser" <[email protected]>>
+Subject: Minus signs need to be escaped.
-@DPATCH@
diff -urNad flexbackup~/flexbackup.conf.5 flexbackup/flexbackup.conf.5
--- flexbackup~/flexbackup.conf.5 2003-10-04 08:52:00.000000000 -0700
+++ flexbackup/flexbackup.conf.5 2006-09-05 15:24:19.000000000 -0700
diff --git a/debian/patches/22_flexbackup.1.dpatch b/debian/patches/22_flexbackup.1.patch
similarity index 85%
rename from debian/patches/22_flexbackup.1.dpatch
rename to debian/patches/22_flexbackup.1.patch
index 98d5dc3..8a584a9 100644
--- a/debian/patches/22_flexbackup.1.dpatch
+++ b/debian/patches/22_flexbackup.1.patch
@@ -1,13 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 22_flexbackup.1.dpatch by <"Kurt B. Kaiser" <[email protected]>>
-##
-## All lines beginning with `## DP:' are a description of the patch.
+From: <"Kurt B. Kaiser" <[email protected]>>
+Subject: Fix #312259 Wrong option for onefile extract in manpage
+Fix #250615 man page errors
+Correct a couple of typos.
-## DP: Fix #312259 Wrong option for onefile extract in manpage
-## DP: Fix #250615 man page errors
-## DP: Correct a couple of typos.
-
-@DPATCH@
diff -urNad flexbackup~/flexbackup.1 flexbackup/flexbackup.1
--- flexbackup~/flexbackup.1 2003-10-04 08:52:00.000000000 -0700
+++ flexbackup/flexbackup.1 2006-09-10 11:29:30.000000000 -0700
diff --git a/debian/patches/30_basic_debian_tape.dpatch b/debian/patches/30_basic_debian_tape.patch
similarity index 78%
rename from debian/patches/30_basic_debian_tape.dpatch
rename to debian/patches/30_basic_debian_tape.patch
index 407f417..78eb5c7 100644
--- a/debian/patches/30_basic_debian_tape.dpatch
+++ b/debian/patches/30_basic_debian_tape.patch
@@ -1,13 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_basic_debian_tape.dpatch by <"Kurt B. Kaiser" <[email protected]>>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Modify config to support basic Debian tape operations using tar.
-## DP: Note that streaming can be greatly improved by using 'buffer'.
-## DP: However, many will use disk backup these days instead of tape
-## DP: and 'buffer' isn't required.
+From: <"Kurt B. Kaiser" <[email protected]>>
+Subject: Modify config to support basic Debian tape operations using tar.
+ Note that streaming can be greatly improved by using 'buffer'.
+ However, many will use disk backup these days instead of tape
+ and 'buffer' isn't required.
-@DPATCH@
diff -urNad flexbackup~/flexbackup.conf flexbackup/flexbackup.conf
--- flexbackup~/flexbackup.conf 2003-09-21 15:59:58.000000000 -0700
+++ flexbackup/flexbackup.conf 2006-09-09 15:27:35.000000000 -0700
diff --git a/debian/patches/40_dump_path.dpatch b/debian/patches/40_dump_path.dpatch
deleted file mode 100644
index 24a5b5f..0000000
--- a/debian/patches/40_dump_path.dpatch
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_dump_path.dpatch by <"Kurt B. Kaiser" <[email protected]>>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Debian Bug #293884
-## DP: flexbackup: sub backup_dump does not use %path hash for dump
-## DP:
-## DP: sub backup_dump does not use %path hash for dump, so if
-## DP: backup user does not have /sbin in his $PATH (it is so for
-## DP: Debian 'backup' system user), flexbackup cannot use dump.
-
-@DPATCH@
-diff -urNad flexbackup~/flexbackup flexbackup/flexbackup
---- flexbackup~/flexbackup 2006-09-07 20:19:38.000000000 -0700
-+++ flexbackup/flexbackup 2006-09-07 20:21:06.000000000 -0700
-@@ -1068,7 +1068,7 @@
- }
-
- $cmd = '';
-- $cmd .= "dump -$level ";
-+ $cmd .= "$::path{dump} -$level ";
- $cmd .= "$::dump_blk_flag ";
- if ($cfg::dump_use_dumpdates eq "true") {
- $cmd .= "-u ";
diff --git a/debian/patches/40_dump_path.patch b/debian/patches/40_dump_path.patch
new file mode 100644
index 0000000..6063df3
--- /dev/null
+++ b/debian/patches/40_dump_path.patch
@@ -0,0 +1,20 @@
+From: <"Kurt B. Kaiser" <[email protected]>>
+Subject: Debian Bug #293884
+ flexbackup: sub backup_dump does not use %path hash for dump
+
+sub backup_dump does not use %path hash for dump, so if
+backup user does not have /sbin in his $PATH (it is so for
+Debian 'backup' system user), flexbackup cannot use dump.
+
+diff -urNad flexbackup~/flexbackup flexbackup/flexbackup
+--- flexbackup~/flexbackup 2006-09-07 20:19:38.000000000 -0700
++++ flexbackup/flexbackup 2006-09-07 20:21:06.000000000 -0700
+@@ -1068,7 +1068,7 @@
+ }
+
+ $cmd = '';
+- $cmd .= "dump -$level ";
++ $cmd .= "$::path{dump} -$level ";
+ $cmd .= "$::dump_blk_flag ";
+ if ($cfg::dump_use_dumpdates eq "true") {
+ $cmd .= "-u ";
diff --git a/debian/patches/42_afio_cpio_incompatible_ok.dpatch b/debian/patches/42_afio_cpio_incompatible_ok.patch
similarity index 54%
rename from debian/patches/42_afio_cpio_incompatible_ok.dpatch
rename to debian/patches/42_afio_cpio_incompatible_ok.patch
index 7a5de38..e4bdc4a 100644
--- a/debian/patches/42_afio_cpio_incompatible_ok.dpatch
+++ b/debian/patches/42_afio_cpio_incompatible_ok.patch
@@ -1,12 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 42_afio_cpio_incompatible_ok.dpatch by <"Kurt B. Kaiser" <[email protected]>>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Debian Bug #273750: flexbackup unable to complete a backup !
-## DP: afio is not configured to be cpio compatible; should not exit here
-## DP: on a warning.
+From: <"Kurt B. Kaiser" <[email protected]>>
+Subject: Debian Bug #273750: flexbackup unable to complete a backup !
+afio is not configured to be cpio compatible; should not exit here
+on a warning.
-@DPATCH@
diff -urNad flexbackup~/flexbackup flexbackup/flexbackup
--- flexbackup~/flexbackup 2006-09-08 20:17:32.000000000 -0700
+++ flexbackup/flexbackup 2006-09-08 20:18:28.000000000 -0700
diff --git a/debian/patches/50_lzma_support.dpatch b/debian/patches/50_lzma_support.patch
similarity index 95%
rename from debian/patches/50_lzma_support.dpatch
rename to debian/patches/50_lzma_support.patch
index 3b6aa44..9c6935b 100644
--- a/debian/patches/50_lzma_support.dpatch
+++ b/debian/patches/50_lzma_support.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_lzma_support.dpatch by John Dong <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add lzma compression
+From: John Dong <[email protected]>
+Subject: Add lzma compression
-@DPATCH@
--- flexbackup-1.2.1.orig/flexbackup
+++ flexbackup-1.2.1/flexbackup
@@ -687,6 +687,8 @@
diff --git a/debian/patches/60_use_afio_default_nocompression.dpatch b/debian/patches/60_use_afio_default_nocompression.patch
similarity index 89%
rename from debian/patches/60_use_afio_default_nocompression.dpatch
rename to debian/patches/60_use_afio_default_nocompression.patch
index cdd3ace..e17db0d 100644
--- a/debian/patches/60_use_afio_default_nocompression.dpatch
+++ b/debian/patches/60_use_afio_default_nocompression.patch
@@ -1,14 +1,8 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 60_use_afio_default_nocompression.dpatch by Kurt B. Kaiser <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Bug #264847 patch by Jose Luis Fernandez Barros <[email protected]>
-## DP: plus man page and flexbackup.conf changes by KBK.
-## DP:
-## DP: Add to the list of file types afio won't compress, instead of
-## DP: replacing that list.
+From: Kurt B. Kaiser <[email protected]>
+Subject: Bug #264847 patch by Jose Luis Fernandez Barros <[email protected]> plus man page and flexbackup.conf changes by KBK.
+ Add to the list of file types afio won't compress, instead of
+ replacing that list.
-@DPATCH@
diff -urNad flexbackup-svn~/flexbackup flexbackup-svn/flexbackup
--- flexbackup-svn~/flexbackup 2008-02-23 13:54:28.000000000 -0500
+++ flexbackup-svn/flexbackup 2008-02-23 13:58:43.000000000 -0500
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b6dd9bc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,10 @@
+01_tempfile.patch
+02_buffer_test.patch
+10_Makefile_destdir.patch
+20_flexbackup.conf.5_hyphens.patch
+22_flexbackup.1.patch
+30_basic_debian_tape.patch
+40_dump_path.patch
+42_afio_cpio_incompatible_ok.patch
+50_lzma_support.patch
+60_use_afio_default_nocompression.patch
diff --git a/debian/rules b/debian/rules
index 7bda846..9dcafdf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@
#export DH_VERBOSE=1
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
# Add here commands to compile the package.
@@ -15,8 +15,7 @@ build-stamp: patch-stamp
touch build-stamp
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -26,15 +25,6 @@ clean-patched:
dh_clean
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- touch patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
install: build
dh_testdir
dh_testroot
@@ -73,4 +63,4 @@ binary-indep: build install
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install
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
