Package: fusedav
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 4230868ad6b2b78a638526e114091e7bd1bd5e50 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Thu, 12 Apr 2012 10:28:33 +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/copyright | 2 +-
debian/patches/00list | 3 ---
debian/patches/{ne_lfs.dpatch => 10-ne-lfs.patch} | 7 ++-----
...63-neon27.dpatch => 20-bug-532763-neon27.patch} | 7 ++-----
debian/patches/series | 2 ++
debian/rules | 9 ++++++---
debian/source/format | 1 +
11 files changed, 26 insertions(+), 24 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{ne_lfs.dpatch => 10-ne-lfs.patch} (72%)
rename debian/patches/{bts532763-neon27.dpatch => 20-bug-532763-neon27.patch} (87%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index a7decf0..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,4 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream source.
-See /usr/share/doc/dpatch/README.source.gz for instructions how to generate
-the patched source, add a new modification, and remove an existing one.
-
diff --git a/debian/changelog b/debian/changelog
index d1d7020..cbdabc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+fusedav (0.2-3.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, debhelper to 9, ${misc:Depends}.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+
+ -- Jari Aalto <jari.aa...@cante.net> Thu, 12 Apr 2012 10:01:43 +0300
+
fusedav (0.2-3.1) unstable; urgency=low
* Non-maintainer upload.
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 044b86f..4c52429 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: fusedav
Section: web
Priority: optional
Maintainer: Sebastian Harl <tok...@debian.org>
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), autotools-dev, libneon27-gnutls-dev, libfuse-dev (>= 2.5), libattr1-dev, lynx, dpatch
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 9), autotools-dev, libneon27-gnutls-dev, libfuse-dev (>= 2.5), libattr1-dev, lynx
+Standards-Version: 3.9.3
Homepage: http://0pointer.de/lennart/projects/fusedav/
Vcs-Git: git://git.tokkee.org/pkg-fusedav.git
Vcs-Browser: http://git.tokkee.org/?p=pkg-fusedav.git
diff --git a/debian/copyright b/debian/copyright
index 4010d8a..8645166 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -29,7 +29,7 @@ License:
USA.
On Debian systems, the complete text of the GNU General Public License
-can be found in `/usr/share/common-licenses/GPL'.
+can be found in `/usr/share/common-licenses/GPL-2'.
The Debian packaging is © 2007-2010, Sebastian Harl <tok...@debian.org> and
is licensed under the GPL, see above.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index f7fed7d..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-ne_lfs.dpatch
-bts532763-neon27.dpatch
-
diff --git a/debian/patches/ne_lfs.dpatch b/debian/patches/10-ne-lfs.patch
similarity index 72%
rename from debian/patches/ne_lfs.dpatch
rename to debian/patches/10-ne-lfs.patch
index 842249d..509142d 100644
--- a/debian/patches/ne_lfs.dpatch
+++ b/debian/patches/10-ne-lfs.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ne_lfs.dpatch by Sebastian Harl <tok...@debian.org>
-##
-## DP: Check for NE_FEATURE_LFS only if ne_off_t is not large enough for LFS.
+From: Sebastian Harl <tok...@debian.org>
+Subject: Check for NE_FEATURE_LFS only if ne_off_t is not large enough for LFS.
-@DPATCH@
diff a/src/fusedav.c b/src/fusedav.c
--- a/src/fusedav.c
diff --git a/debian/patches/bts532763-neon27.dpatch b/debian/patches/20-bug-532763-neon27.patch
similarity index 87%
rename from debian/patches/bts532763-neon27.dpatch
rename to debian/patches/20-bug-532763-neon27.patch
index 16a938d..bd44fda 100644
--- a/debian/patches/bts532763-neon27.dpatch
+++ b/debian/patches/20-bug-532763-neon27.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## bts532763-neon27.dpatch by Sebastian Harl <tok...@debian.org>
-##
-## DP: Added support for neon27.
+From: Sebastian Harl <tok...@debian.org>
+Subject: Added support for neon27.
-@DPATCH@
diff a/src/filecache.c b/src/filecache.c
--- a/src/filecache.c
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..506c31d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+10-ne-lfs.patch
+20-bug-532763-neon27.patch
diff --git a/debian/rules b/debian/rules
index d0c619b..242a355 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,6 @@ else
CFLAGS += -O2
endif
-include /usr/share/dpatch/dpatch.make
$(BUILDDIR)/config.status: configure $(DPATCH_STAMPFN)
dh_testdir
@@ -31,6 +30,10 @@ $(BUILDDIR)/config.status: configure $(DPATCH_STAMPFN)
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr
+
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp: $(BUILDDIR)/config.status
@@ -40,7 +43,7 @@ build-stamp: $(BUILDDIR)/config.status
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -52,7 +55,7 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
$(MAKE) -C $(BUILDDIR) install DESTDIR=$(CURDIR)/debian/fusedav
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
