[SCM] packaging of clive-utils branch, master, updated. upstream/2.1.3-112-g7bb5356

Damyan Ivanov dmn at debian.org
Wed Apr 1 15:41:07 UTC 2009


The following commit has been merged in the master branch:
commit 2adac4bc20c8347dcb16facafbfa0064d95120d4
Author: Damyan Ivanov <dmn at debian.org>
Date:   Wed Apr 1 18:28:39 2009 +0300

    upstream applied fix-pod2man-errors.patch; drop quilt

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index c03fe38..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,4 +0,0 @@
-clive-utils uses quilt for applying patches to upstream sources during build.
-
-See /usr/share/doc/quilt/README.source for instructions how to woth with quilt
-patches.
diff --git a/debian/control b/debian/control
index 4d4ca98..693ba58 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Damyan Ivanov <dmn at debian.org>
-Build-Depends: debhelper (>= 7.0.50), quilt
+Build-Depends: debhelper (>= 7.0.50),
 Build-Depends-Indep:
  libconfig-tiny-perl (>= 2.12),
  libcrypt-passwdmd5-perl (>= 1.3),
diff --git a/debian/patches/fix-pod2man-errors.patch b/debian/patches/fix-pod2man-errors.patch
deleted file mode 100644
index a21184d..0000000
--- a/debian/patches/fix-pod2man-errors.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# add missing =back
-# fixes pod2man error
-# Upstream-Bug: http://code.google.com/p/clive-utils/issues/detail?id=1
---- a/clivepass.pod
-+++ b/clivepass.pod
-@@ -78,6 +78,8 @@ You can override this by setting the B<C
- Password file. Contains the salted passphrase hash and login usernames and
- encrypted passwords.
- 
-+=back
-+
- =head1 SEE ALSO
- 
- L<clive(1)> L<clivescan(1)> L<clivefeed(1)>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5a504d5..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-pod2man-errors.patch
diff --git a/debian/rules b/debian/rules
index 1cdcb38..b5eec61 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,12 +3,10 @@
 %:
 	dh $@
 
-include /usr/share/quilt/quilt.make
-
 override_dh_auto_test:
 	for f in feed scan pass; do perl -c clive$$f || exit 1; done
 
-build: $(QUILT_STAMPFN)
+build:
 	dh $@
 	for f in feed scan pass; do if [ -e clive$$f.1 ]; then mv -v clive$$f.1 clive$$f.1-ORIG; fi; done
 	$(MAKE) man
@@ -16,6 +14,6 @@ build: $(QUILT_STAMPFN)
 override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/clive-utils prefix=/usr
 
-clean: unpatch
+clean:
 	dh $@
 	for f in feed scan pass; do if [ -e clive$$f.1-ORIG ]; then mv -v clive$$f.1-ORIG clive$$f.1; fi; done

-- 
packaging of clive-utils



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