r14090 - in /trunk/liblocale-gettext-perl/debian: changelog control patches/doc-update.diff patches/doc-update.dpatch patches/series rules
hertzog at users.alioth.debian.org
hertzog at users.alioth.debian.org
Sun Feb 3 18:51:04 UTC 2008
Author: hertzog
Date: Sun Feb 3 18:51:03 2008
New Revision: 14090
URL: http://svn.debian.org/wsvn/?sc=1&rev=14090
Log:
* Switched to quilt instead of old home-made dpatch based system.
Added quilt to Build-Depends.
Added:
trunk/liblocale-gettext-perl/debian/patches/doc-update.diff
- copied, changed from r14088, trunk/liblocale-gettext-perl/debian/patches/doc-update.dpatch
trunk/liblocale-gettext-perl/debian/patches/series
Removed:
trunk/liblocale-gettext-perl/debian/patches/doc-update.dpatch
Modified:
trunk/liblocale-gettext-perl/debian/changelog
trunk/liblocale-gettext-perl/debian/control
trunk/liblocale-gettext-perl/debian/rules
Modified: trunk/liblocale-gettext-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/liblocale-gettext-perl/debian/changelog?rev=14090&op=diff
==============================================================================
--- trunk/liblocale-gettext-perl/debian/changelog (original)
+++ trunk/liblocale-gettext-perl/debian/changelog Sun Feb 3 18:51:03 2008
@@ -7,6 +7,8 @@
* Remove versioned build-dependency on perl. oldstable already has a version
new enough.
* Updated Standards-Version to 3.7.3 (no changes)
+ * Switched to quilt instead of old home-made dpatch based system.
+ Added quilt to Build-Depends.
[ gregor herrmann ]
* debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
Modified: trunk/liblocale-gettext-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/liblocale-gettext-perl/debian/control?rev=14090&op=diff
==============================================================================
--- trunk/liblocale-gettext-perl/debian/control (original)
+++ trunk/liblocale-gettext-perl/debian/control Sun Feb 3 18:51:03 2008
@@ -4,7 +4,7 @@
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Raphael Hertzog <hertzog at debian.org>
Standards-Version: 3.7.3
-Build-Depends: debhelper (>= 6)
+Build-Depends: debhelper (>= 6), quilt
Homepage: http://search.cpan.org/dist/Locale-gettext/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/liblocale-gettext-perl/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/liblocale-gettext-perl/
Copied: trunk/liblocale-gettext-perl/debian/patches/doc-update.diff (from r14088, trunk/liblocale-gettext-perl/debian/patches/doc-update.dpatch)
URL: http://svn.debian.org/wsvn/trunk/liblocale-gettext-perl/debian/patches/doc-update.diff?rev=14090&op=diff
==============================================================================
--- trunk/liblocale-gettext-perl/debian/patches/doc-update.dpatch (original)
+++ trunk/liblocale-gettext-perl/debian/patches/doc-update.diff Sun Feb 3 18:51:03 2008
@@ -1,20 +1,4 @@
-#! /bin/sh -e
-
-# DP: Correct documentation
-
-if [ $# -ne 1 ]; then
- echo >&2 "$0: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -f -p1 < $0;;
- -unpatch) patch -f -R -p1 < $0;;
- *)
- echo >&2 "$0: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
+Fix documentation in manual page
--- liblocale-gettext-perl-1.01.orig/gettext.pm
+++ liblocale-gettext-perl-1.01/gettext.pm
@@ -65,7 +65,7 @@
Added: trunk/liblocale-gettext-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/liblocale-gettext-perl/debian/patches/series?rev=14090&op=file
==============================================================================
--- trunk/liblocale-gettext-perl/debian/patches/series (added)
+++ trunk/liblocale-gettext-perl/debian/patches/series Sun Feb 3 18:51:03 2008
@@ -1,0 +1,1 @@
+doc-update.diff
Modified: trunk/liblocale-gettext-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/liblocale-gettext-perl/debian/rules?rev=14090&op=diff
==============================================================================
--- trunk/liblocale-gettext-perl/debian/rules (original)
+++ trunk/liblocale-gettext-perl/debian/rules Sun Feb 3 18:51:03 2008
@@ -5,13 +5,11 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-debian_patches = doc-update
+include /usr/share/quilt/quilt.make
TMP = `pwd`/debian/liblocale-gettext-perl
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS = -g
-endif
+CFLAGS = -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
@@ -19,26 +17,24 @@
endif
build: build-stamp
-build-stamp: patched-stamp
+build-stamp: patch
dh_testdir
-
# Add here commands to compile the package.
perl Makefile.PL INSTALLDIRS=vendor
$(MAKE) OPTIMIZE="-Wall $(CFLAGS)"
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp install-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
dh_clean
- debian/rules reverse-patches
rm -f gettext.pm.orig
@@ -51,7 +47,6 @@
# Add here commands to install the package into debian/tmp.
$(MAKE) install PREFIX=$(TMP)/usr
-
touch install-stamp
@@ -84,51 +79,7 @@
dh_md5sums
dh_builddeb
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+binary: binary-indep binary-arch
-binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary
-# ---------------------------------------------------------------------------
-# various rules to unpack addons and (un)apply patches.
-# borrowed from egcs package
-
-patch_dir = debian/patches
-
-apply-patches: patched-stamp
-reverse-patches:
- @for stamp in none patched-*; do \
- case "$$stamp" in none|patched-stamp|patched-\*) continue; esac; \
- patch=`echo $$stamp | sed -e 's/patched-//'`; \
- echo "trying to revert patch $$patch ..."; \
- if [ -x $(patch_dir)/$$patch.dpatch ]; then true; else \
- chmod +x $(patch_dir)/$$patch.dpatch; fi; \
- if $(patch_dir)/$$patch.dpatch -unpatch; then \
- echo "reverted $$patch patch."; \
- rm -f $$stamp; \
- else \
- echo "error in reverting $$patch patch."; \
- exit 1; \
- fi; \
- done
- rm -f patched-stamp
-
-patched-%: $(patch_dir)/%.dpatch
- @if [ -x $< ]; then true; else chmod +x $<; fi
- @if [ -f $@ ]; then \
- echo "$* patches already applied."; exit 1; \
- fi
- $< -patch
- @echo "$* patches applied." > $@
-
-patched-stamp: $(foreach p,$(debian_patches),patched-$(p))
- @echo -e "\nPatches applied:" >> pxxx
- @for i in none $(debian_patches); do \
- if [ -r debian/patches/$$i.dpatch ]; then \
- echo -e "\n$$i:" >> pxxx; \
- sed -n 's/^# *DP: */ /p' debian/patches/$$i.dpatch >> pxxx; \
- fi \
- done
- mv -f pxxx patched-stamp
-
More information about the Pkg-perl-cvs-commits
mailing list