[librtf-document-perl] 03/03: Apply dpatch2quilt and switch to source format "3.0 (quilt)"

Axel Beckert abe at deuxchevaux.org
Tue Jul 21 19:42:44 UTC 2015


This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch master
in repository librtf-document-perl.

commit f33f9959c506571e5c04e053473af3c8b06a4f27
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Tue Jul 21 21:28:06 2015 +0200

    Apply dpatch2quilt and switch to source format "3.0 (quilt)"
---
 debian/changelog                                                 | 4 ++++
 debian/control                                                   | 5 ++---
 debian/patches/00list                                            | 1 -
 .../{01_make_it_strict.dpatch => 01_make_it_strict.patch}        | 9 ++++-----
 debian/patches/series                                            | 1 +
 debian/rules                                                     | 6 ++----
 debian/source/format                                             | 1 +
 7 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index abc0bc6..f4552af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ librtf-document-perl (0.64-11) UNRELEASED; urgency=medium
   * Added ${misc:Depends} to Depends.
   * Apply wrap-and-sort.
   * Remove obsolete local emacs variables from debian/changelog.
+  * Apply dpatch2quilt and switch to source format "3.0 (quilt)".
+    + Add debian/source/format
+    + Drop build-dependency on dpatch
+    + Drop dependencies on patch target from debian/rules.
 
  -- Axel Beckert <abe at debian.org>  Tue, 21 Jul 2015 21:03:51 +0200
 
diff --git a/debian/control b/debian/control
index e60a6d4..9f116fb 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,8 @@ Priority: extra
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
 Build-Depends: debhelper (>> 4.0.0)
-Build-Depends-Indep: dpatch,
-                     libconvert-units-perl (>= 0.43),
-                     perl5
+Build-Depends-Indep: libconvert-units-perl (>= 0.43),
+                     perl
 Standards-Version: 3.6.2
 Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/librtf-document-perl.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/librtf-document-perl.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index f74dee1..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_make_it_strict
diff --git a/debian/patches/01_make_it_strict.dpatch b/debian/patches/01_make_it_strict.patch
similarity index 98%
rename from debian/patches/01_make_it_strict.dpatch
rename to debian/patches/01_make_it_strict.patch
index 8faaa84..f1122bb 100644
--- a/debian/patches/01_make_it_strict.dpatch
+++ b/debian/patches/01_make_it_strict.patch
@@ -1,8 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
---- Document.pm	2006-02-13 15:53:37.122539911 +0100
-+++ debian/Document.pm	2006-02-13 15:51:04.891781370 +0100
+Author: 
+Description: 
+--- librtf-document-perl.orig/Document.pm
++++ librtf-document-perl/Document.pm
 @@ -14,6 +14,7 @@
  @EXPORT_OK = qw();
  
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f556d2c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_make_it_strict.patch
diff --git a/debian/rules b/debian/rules
index 22fb31b..3ff6700 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 # -*- Makefile -*-
 
-include /usr/share/dpatch/dpatch.make
-
 # Make sure perl is defined (allow overriding from the command line
 PERL ?= /usr/bin/perl
 
@@ -44,7 +42,7 @@ binary-indep-stamp: arrange
 	touch binary-indep-stamp
 
 build: build-stamp
-build-stamp: patch config
+build-stamp: config
 	dh_testdir
 	$(MAKE)
 	$(MAKE) test
@@ -68,4 +66,4 @@ install-stamp: build
 	$(MAKE) install PREFIX=$(b)/usr
 	touch install-stamp
 
-.PHONY: arrange binary binary-arch binary-indep build clean config install patch
+.PHONY: arrange binary binary-arch binary-indep build clean config 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)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/librtf-document-perl.git



More information about the Pkg-perl-cvs-commits mailing list