Package: dirvish
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 3c2c245acfaef0588d618ce37eb70efbd5101384 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 14 Apr 2012 20:54:30 +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/changelog | 10 ++++++++++
debian/compat | 2 +-
debian/control | 7 ++++---
debian/patches/00list | 4 ----
...ing.dpatch => 01-imsort-reserved-warning.patch} | 9 ++-------
...rsync-options.dpatch => 02-rsync-options.patch} | 8 ++------
...rvish-locate.dpatch => 03-dirvish-locate.patch} | 8 ++------
...sbin.dpatch => 04-dirvish-runall-usrsbin.patch} | 10 +++-------
debian/patches/series | 4 ++++
debian/rules | 13 +++++++------
debian/source/format | 1 +
11 files changed, 36 insertions(+), 40 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_imsort-reserved-warning.dpatch => 01-imsort-reserved-warning.patch} (60%)
rename debian/patches/{02_rsync-options.dpatch => 02-rsync-options.patch} (62%)
rename debian/patches/{03_dirvish-locate.dpatch => 03-dirvish-locate.patch} (95%)
rename debian/patches/{04_dirvish-runall-usrsbin.dpatch => 04-dirvish-runall-usrsbin.patch} (55%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 1bc2f83..c57f071 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+dirvish (1.2.1-1.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.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Add Homepage field.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 14 Apr 2012 20:54:03 +0300
+
dirvish (1.2.1-1.1) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/control b/debian/control
index bf0d9c7..7f94bc4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,13 @@ Source: dirvish
Section: admin
Priority: optional
Maintainer: Paul Slootman <p...@debian.org>
-Build-Depends: debhelper (>> 4.0.0), dpatch
-Standards-Version: 3.7.2.1
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
+Homepage: http://freecode.com/projects/dirvish
Package: dirvish
Architecture: all
-Depends: rsync (>= 2.5.6-0.1), perl-modules, libtime-modules-perl, libtime-period-perl, ${perl:Depends}
+Depends: ${misc:Depends}, rsync (>= 2.5.6-0.1), perl-modules, libtime-modules-perl, libtime-period-perl, ${perl:Depends}
Recommends: ssh (>= 3.4p1)
Description: Filesystem based backup system using rsync
A utility to maintain multiple backups on online storage, each backup is
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 1c3cbc0..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_imsort-reserved-warning.dpatch
-02_rsync-options.dpatch
-03_dirvish-locate.dpatch
-04_dirvish-runall-usrsbin.dpatch
diff --git a/debian/patches/01_imsort-reserved-warning.dpatch b/debian/patches/01-imsort-reserved-warning.patch
similarity index 60%
rename from debian/patches/01_imsort-reserved-warning.dpatch
rename to debian/patches/01-imsort-reserved-warning.patch
index 17d1440..08197ff 100644
--- a/debian/patches/01_imsort-reserved-warning.dpatch
+++ b/debian/patches/01-imsort-reserved-warning.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 001_imsort-reserved-warning.dpatch by Paul Slootman <p...@debian.org>
-## The patch by Ondřej Surý didn't work properly...
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix for future reserved word warning
+From: Paul Slootman <p...@debian.org>
+Subject: Fix for future reserved word warning
-@DPATCH@
diff -urN dirvish-1.2.1/dirvish-expire.pl dirvish-1.2.1.debian/dirvish-expire.pl
--- dirvish-1.2.1/dirvish-expire.pl 2005-02-19 01:52:31.000000000 +0100
+++ dirvish-1.2.1.debian/dirvish-expire.pl 2006-07-07 11:46:46.000000000 +0200
diff --git a/debian/patches/02_rsync-options.dpatch b/debian/patches/02-rsync-options.patch
similarity index 62%
rename from debian/patches/02_rsync-options.dpatch
rename to debian/patches/02-rsync-options.patch
index 27e40ee..f07897f 100644
--- a/debian/patches/02_rsync-options.dpatch
+++ b/debian/patches/02-rsync-options.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 002_rsync-options.dpatch by Ondřej Surý <ond...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix typo in docs about rsync-options which was deprecated
+From: Ondřej Surý <ond...@debian.org>
+Subject: Fix typo in docs about rsync-options which was deprecated
-@DPATCH@
diff -urN dirvish-1.2.1/dirvish.conf.5 dirvish-1.2.1.debian/dirvish.conf.5
--- dirvish-1.2.1/dirvish.conf.5 2006-05-10 19:17:58.000000000 +0200
+++ dirvish-1.2.1.debian/dirvish.conf.5 2006-07-07 11:46:46.000000000 +0200
diff --git a/debian/patches/03_dirvish-locate.dpatch b/debian/patches/03-dirvish-locate.patch
similarity index 95%
rename from debian/patches/03_dirvish-locate.dpatch
rename to debian/patches/03-dirvish-locate.patch
index 44377a9..a555732 100644
--- a/debian/patches/03_dirvish-locate.dpatch
+++ b/debian/patches/03-dirvish-locate.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 003_dirvish-locate.dpatch by Ondřej Surý <ond...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Get patch level of loadconfig.pl in case exit codes are needed.
+From: Ondřej Surý <ond...@debian.org>
+Subject: Get patch level of loadconfig.pl in case exit codes are needed.
-@DPATCH@
--- dirvish-1.2.1~/dirvish-locate.pl 2004-02-25 03:42:14.000000000 +0100
+++ dirvish-1.2.1/dirvish-locate.pl 2006-07-07 11:14:12.000000000 +0200
@@ -1,3 +1,8 @@
diff --git a/debian/patches/04_dirvish-runall-usrsbin.dpatch b/debian/patches/04-dirvish-runall-usrsbin.patch
similarity index 55%
rename from debian/patches/04_dirvish-runall-usrsbin.dpatch
rename to debian/patches/04-dirvish-runall-usrsbin.patch
index 18a9ec3..e7113f2 100644
--- a/debian/patches/04_dirvish-runall-usrsbin.dpatch
+++ b/debian/patches/04-dirvish-runall-usrsbin.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 004_dirvish-runall-usrsbin.dpatch by Paul Slootman <p...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Debian installs dirvish into /usr/sbin, so look for it there by
-## DP: default.
+From: Paul Slootman <p...@debian.org>
+Subject: Debian installs dirvish into /usr/sbin, so look for it there by
+ default.
-@DPATCH@
--- dirvish-1.2.1~/dirvish-runall.pl 2005-02-19 01:52:31.000000000 +0100
+++ dirvish-1.2.1/dirvish-runall.pl 2006-07-27 17:58:47.767699558 +0200
@@ -92,7 +92,7 @@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fe5fb60
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01-imsort-reserved-warning.patch
+02-rsync-options.patch
+03-dirvish-locate.patch
+04-dirvish-runall-usrsbin.patch
diff --git a/debian/rules b/debian/rules
index d39751d..f6c04f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,21 +14,22 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
-# enable dpatch usage
-include /usr/share/dpatch/dpatch.make
-
configure: configure-stamp
-configure-stamp: patch
+configure-stamp:
dh_testdir
touch configure-stamp
+
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp: configure-stamp
dh_testdir
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -39,7 +40,7 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
/bin/echo -e "\n`pwd`/debian/dirvish\n`pwd`/debian/dirvish/usr/sbin\n`pwd`/debian/dirvish/usr/share/man\n/etc/dirvish\ny\ny\nn" | sh ./install.sh
@echo ''
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.5
