Package: libxml-xupdate-libxml-perl
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 ca0445c9f7bfada3176f52a631eaa9a3db7b8b3b Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sat, 5 May 2012 19:51: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 <[email protected]>
---
debian/README.source | 38 --------------------
debian/changelog | 10 ++++++
debian/compat | 2 +-
debian/control | 6 ++--
debian/libxml-xupdate-libxml-perl.docs | 1 -
debian/patches/00list | 1 -
.../patches/{01manpage.dpatch => 01-manpage.patch} | 8 ++---
debian/patches/series | 1 +
debian/rules | 13 ++++---
debian/source/format | 1 +
10 files changed, 25 insertions(+), 56 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/libxml-xupdate-libxml-perl.docs
delete mode 100644 debian/patches/00list
rename debian/patches/{01manpage.dpatch => 01-manpage.patch} (71%)
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 fc98b3d..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,38 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To get the fully patched source after unpacking the source package, cd
-to the root level of the source package and run:
-
- debian/rules patch
-
-Removing a patch is as simple as removing its entry from the
-debian/patches/00list file, and please also remove the patch file
-itself.
-
-Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
-where you should replace XX with a new number and patchname with a
-descriptive shortname of the patch. You can then simply edit all the
-files your patch wants to edit, and then simply "exit 0" from the shell
-to actually create the patch file.
-
-To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
-and replace XX_patchname with the actual filename from debian/patches
-you want to use.
-
-To clean up afterwards again, "debian/rules unpatch" will do the
-work for you - or you can of course choose to call
-"fakeroot debian/rules clean" all together.
-
-
----
-
-this documentation is part of dpatch package, and may be used by
-packages using dpatch to comply with policy on README.source. This
-documentation is meant to be useful to users who are not proficient in
-dpatch in doing work with dpatch-based packages. Please send any
-improvements to the BTS of dpatch package.
-
-original text by Gerfried Fuchs, edited by Junichi Uekawa <[email protected]>
-10 Aug 2008.
diff --git a/debian/changelog b/debian/changelog
index e683b00..bc68693 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libxml-xupdate-libxml-perl (0.6.0-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 required build-arch and build-indep targets to rules file.
+ * Fix binary-control-field-duplicates-source priority section (Lintian).
+
+ -- Jari Aalto <[email protected]> Sat, 05 May 2012 19:51:10 +0300
+
libxml-xupdate-libxml-perl (0.6.0-1) unstable; urgency=low
* initial upload (closes: #636176)
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 2161f7b..c530bc3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,12 @@ Source: libxml-xupdate-libxml-perl
Maintainer: Alexander Zangerl <[email protected]>
Priority: optional
Section: perl
-Build-Depends: debhelper (>=8.0.0), dpatch
+Build-Depends: debhelper (>= 9)
Build-Depends-Indep: perl, libxml-libxml-iterator-perl
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
Package: libxml-xupdate-libxml-perl
Architecture: all
-Priority: optional
-Section: perl
Depends: perl, libxml-libxml-perl, libxml-libxml-iterator-perl, ${perl:Depends}, ${misc:Depends}
Homepage: http://search.cpan.org/~pajas/XML-XUpdate-LibXML/
Description: Perl module that implements XUpdate modification language
diff --git a/debian/libxml-xupdate-libxml-perl.docs b/debian/libxml-xupdate-libxml-perl.docs
deleted file mode 100644
index 5323396..0000000
--- a/debian/libxml-xupdate-libxml-perl.docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/README.source
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index def951b..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01manpage
diff --git a/debian/patches/01manpage.dpatch b/debian/patches/01-manpage.patch
similarity index 71%
rename from debian/patches/01manpage.dpatch
rename to debian/patches/01-manpage.patch
index 983e497..c9453dc 100644
--- a/debian/patches/01manpage.dpatch
+++ b/debian/patches/01-manpage.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01manpage.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix wrong =head1 in xupdate pod
+From: <[email protected]>
+Subject: fix wrong =head1 in xupdate pod
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' libxml-xupdate-libxml-perl-0.6.0~/xupdate libxml-xupdate-libxml-perl-0.6.0/xupdate
--- libxml-xupdate-libxml-perl-0.6.0~/xupdate 2003-12-03 22:01:54.000000000 +1000
+++ libxml-xupdate-libxml-perl-0.6.0/xupdate 2011-08-02 19:59:05.220539411 +1000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9d05b2b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-manpage.patch
diff --git a/debian/rules b/debian/rules
index c79b472..33cf47d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,17 +4,20 @@
PACKAGE=$(shell dh_listpackages)
TMP=$(CURDIR)/debian/$(PACKAGE)
-.PHONY: patch unpatch
+.PHONY:
-# to get the patch application targets
-include /usr/share/dpatch/dpatch.make
+# to get the application targets
-configure: patch Makefile
+configure: Makefile
Makefile: Makefile.PL
dh_testdir
perl Makefile.PL INSTALLDIRS=vendor
+
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp: configure
@@ -22,7 +25,7 @@ build-stamp: configure
$(MAKE) OPTIMIZE="-O2 -g -Wall"
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
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.10
