Package: cadaver
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 4efd030c73e549d91d2e36bbc79819040901f933 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Thu, 12 Apr 2012 09:13:38 +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 | 10 ++++++++++
debian/compat | 2 +-
debian/control | 6 +++---
debian/copyright | 4 ++--
debian/patches/00list | 2 --
...{manpage_hyphen.dpatch => manpage_hyphen.patch} | 7 ++-----
debian/patches/series | 2 ++
debian/rules | 11 +++++++----
debian/source/format | 1 +
10 files changed, 28 insertions(+), 21 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{manpage_hyphen.dpatch => manpage_hyphen.patch} (84%)
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 03fc20a..7e19d3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+cadaver (0.23.3-1.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.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Thu, 12 Apr 2012 09:08:23 +0300
+
cadaver (0.23.3-1) unstable; urgency=low
* New upstream version:
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 fa61358..23e24c5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,15 @@ Source: cadaver
Section: web
Priority: optional
Maintainer: Sebastian Harl <tok...@debian.org>
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), dpatch, autotools-dev, libncurses5-dev, libxml2-dev, libreadline-dev | libreadline5-dev, zlib1g-dev (>= 1:1.1.3), libneon27-gnutls-dev (>= 0.28)
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), autotools-dev, libncurses5-dev, libxml2-dev, libreadline-dev | libreadline5-dev, zlib1g-dev (>= 1:1.1.3), libneon27-gnutls-dev (>= 0.28)
+Standards-Version: 3.9.3
Homepage: http://www.webdav.org/cadaver/
Vcs-Git: git://git.tokkee.org/pkg-cadaver.git
Vcs-Browser: http://git.tokkee.org/?p=pkg-cadaver.git
Package: cadaver
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: command-line WebDAV client
cadaver supports file upload, download, on-screen display, in-place editing,
namespace operations (move/copy), collection creation and deletion, property
diff --git a/debian/copyright b/debian/copyright
index 4f3ebdc..fd0f85a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -77,7 +77,7 @@ License:
USA.
On Debian systems, the complete text of the GNU General Public License
-can be found in `/usr/share/common-licenses/GPL'. Version 2 of the license
+can be found in `/usr/share/common-licenses/GPL-2'. Version 2 of the license
can be found in `/usr/share/common-licenses/GPL-2'.
Files lib/intl/*
@@ -166,7 +166,7 @@ can be found in `/usr/share/common-licenses/LGPL-2'.
USA.
On Debian systems, the complete text of the GNU Lesser General Public License
-can be found in `/usr/share/common-licenses/LGPL'.
+can be found in `/usr/share/common-licenses/LGPL-2'.
File m4/neon/ld-version-script.m4
Copyright © 2008-2009 Free Software Foundation, Inc.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index cbd8881..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-manpage_hyphen.dpatch
-
diff --git a/debian/patches/manpage_hyphen.dpatch b/debian/patches/manpage_hyphen.patch
similarity index 84%
rename from debian/patches/manpage_hyphen.dpatch
rename to debian/patches/manpage_hyphen.patch
index 4ac6d75..ec46f32 100644
--- a/debian/patches/manpage_hyphen.dpatch
+++ b/debian/patches/manpage_hyphen.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## manpage_hyphen.dpatch by Sebastian Harl <s...@tokkee.org>
-##
-## DP: Do not use hyphens as minus signs.
+From: Sebastian Harl <s...@tokkee.org>
+Subject: Do not use hyphens as minus signs.
-@DPATCH@
--- a/doc/cadaver.1
+++ b/doc/cadaver.1
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a6bdfde
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+manpage_hyphen.patch
+
diff --git a/debian/rules b/debian/rules
index 906dba6..917cc63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,9 +21,8 @@ else
CFLAGS += -O2
endif
-include /usr/share/dpatch/dpatch.make
-$(BUILDDIR)/config.status: configure $(DPATCH_STAMPFN)
+$(BUILDDIR)/config.status: configure
dh_testdir
for file in config.guess config.sub; do \
@@ -37,6 +36,10 @@ $(BUILDDIR)/config.status: configure $(DPATCH_STAMPFN)
--prefix=/usr --mandir=\$${prefix}/share/man \
--enable-warnings --enable-netrc --with-ssl=gnutls
+
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp: $(BUILDDIR)/config.status
@@ -48,7 +51,7 @@ build-stamp: $(BUILDDIR)/config.status
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -68,7 +71,7 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) -C $(BUILDDIR) install prefix=$(CURDIR)/debian/cadaver/usr
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
