r22521 - in /trunk/libdigest-md4-perl: debian/README.source debian/changelog debian/compat debian/control debian/patches/ debian/patches/series debian/patches/test-rfc.patch debian/repack.sh debian/rules debian/watch t/files.t
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Mon Jun 30 15:18:40 UTC 2008
Author: gregoa
Date: Mon Jun 30 15:18:40 2008
New Revision: 22521
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=22521
Log:
* Add debian/repack.sh to automate the delection of rfc1320.txt; call it
from debian/watch; switch from dversionmangle to uversionmangle in
debian/wacth to get the right name for the .orig.tar.gz; add
debian/README.source; add get-orig-source target to debian/rules.
* Split out the changes in the test file into a patch; add quilt framework.
* Refresh debian/rules, no functional changes.
* Set debhelper compatibility level to 5.
* Set Standards-Version to 3.8.0 (no further changes).
Added:
trunk/libdigest-md4-perl/debian/README.source
trunk/libdigest-md4-perl/debian/patches/
trunk/libdigest-md4-perl/debian/patches/series
trunk/libdigest-md4-perl/debian/patches/test-rfc.patch
trunk/libdigest-md4-perl/debian/repack.sh (with props)
Modified:
trunk/libdigest-md4-perl/debian/changelog
trunk/libdigest-md4-perl/debian/compat
trunk/libdigest-md4-perl/debian/control
trunk/libdigest-md4-perl/debian/rules
trunk/libdigest-md4-perl/debian/watch
trunk/libdigest-md4-perl/t/files.t
Added: trunk/libdigest-md4-perl/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdigest-md4-perl/debian/README.source?rev=22521&op=file
==============================================================================
--- trunk/libdigest-md4-perl/debian/README.source (added)
+++ trunk/libdigest-md4-perl/debian/README.source Mon Jun 30 15:18:40 2008
@@ -1,0 +1,10 @@
+1) The upstream tarball is repackaged by
+ - removing the non-free file rfc1320.txt
+ - removing the line referencing rfc1320.txt from MANIFEST
+
+ A script called debian/repack.sh automates this task; it's also called
+ from debian/watch, and a get-orig-source target in debian/rules is
+ provided.
+
+2) The packages uses quilt for managing patches against the upstream source.
+ Please refer to /usr/share/doc/quilt/REAMDE.source for further help.
Modified: trunk/libdigest-md4-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdigest-md4-perl/debian/changelog?rev=22521&op=diff
==============================================================================
--- trunk/libdigest-md4-perl/debian/changelog (original)
+++ trunk/libdigest-md4-perl/debian/changelog Mon Jun 30 15:18:40 2008
@@ -5,6 +5,14 @@
* Set Maintainer to Debian Perl Group.
* Use dist-based URL in debian/watch.
* debian/rules: delete /usr/share/perl5 only if it exists.
+ * Add debian/repack.sh to automate the delection of rfc1320.txt; call it
+ from debian/watch; switch from dversionmangle to uversionmangle in
+ debian/wacth to get the right name for the .orig.tar.gz; add
+ debian/README.source; add get-orig-source target to debian/rules.
+ * Split out the changes in the test file into a patch; add quilt framework.
+ * Refresh debian/rules, no functional changes.
+ * Set debhelper compatibility level to 5.
+ * Set Standards-Version to 3.8.0 (no further changes).
-- gregor herrmann <gregor+debian at comodo.priv.at> Sat, 01 Dec 2007 18:54:51 +0100
Modified: trunk/libdigest-md4-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdigest-md4-perl/debian/compat?rev=22521&op=diff
==============================================================================
--- trunk/libdigest-md4-perl/debian/compat (original)
+++ trunk/libdigest-md4-perl/debian/compat Mon Jun 30 15:18:40 2008
@@ -1,1 +1,1 @@
-4
+5
Modified: trunk/libdigest-md4-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdigest-md4-perl/debian/control?rev=22521&op=diff
==============================================================================
--- trunk/libdigest-md4-perl/debian/control (original)
+++ trunk/libdigest-md4-perl/debian/control Mon Jun 30 15:18:40 2008
@@ -3,11 +3,11 @@
Priority: optional
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Jay Bonci <jaybonci at debian.org>
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
Homepage: http://search.cpan.org/dist/Digest-MD4/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libdigest-md4-perl/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libdigest-md4-perl/
-Build-Depends: debhelper (>= 4.1), perl (>= 5.8)
+Build-Depends: debhelper (>= 5), perl (>= 5.8), quilt (>= 0.40)
Package: libdigest-md4-perl
Architecture: any
Added: trunk/libdigest-md4-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdigest-md4-perl/debian/patches/series?rev=22521&op=file
==============================================================================
--- trunk/libdigest-md4-perl/debian/patches/series (added)
+++ trunk/libdigest-md4-perl/debian/patches/series Mon Jun 30 15:18:40 2008
@@ -1,0 +1,1 @@
+test-rfc.patch
Added: trunk/libdigest-md4-perl/debian/patches/test-rfc.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdigest-md4-perl/debian/patches/test-rfc.patch?rev=22521&op=file
==============================================================================
--- trunk/libdigest-md4-perl/debian/patches/test-rfc.patch (added)
+++ trunk/libdigest-md4-perl/debian/patches/test-rfc.patch Mon Jun 30 15:18:40 2008
@@ -1,0 +1,40 @@
+rfc1320.txt is removed from the tarball so we need to ignore it in the test
+suite.
+
+--- libdigest-md4-perl-1.5.dfsg.orig/t/files.t
++++ libdigest-md4-perl-1.5.dfsg/t/files.t
+@@ -5,7 +5,7 @@
+ }
+ }
+
+-print "1..5\n";
++print "1..4\n";
+
+ use strict;
+ use Digest::MD4 qw(md4 md4_hex md4_base64);
+@@ -24,7 +24,6 @@
+ 0dbd12438619d37abe39c41e4584ebe0 README
+ 86dc1e88bf2f4c41bc4d365686604342 MD4.pm
+ 07995cc4bb36cba6306fded60ca69805 MD4.xs
+-f178f04d0d8305c328a3de281313d642 rfc1320.txt
+ EOT
+ } elsif ("\n" eq "\015") { # MacOS
+ $EXPECT = <<EOT;
+@@ -32,16 +31,14 @@
+ a64a8e41ca2fe973ffbb46aa66d70bd2 README
+ bfdcb4108a0aec528b1ac9c8407f3b3a MD4.pm
+ 9db8b845da6b42d7f3cbaf690504dfb4 MD4.xs
+-2089ab664427233cd7043d91f0021ff8 rfc1320.txt
+ EOT
+ } else {
+- # This is the output of: 'md4sum Changes README MD4.pm MD4.xs rfc1320.txt'
++ # This is the output of: 'md4sum Changes README MD4.pm MD4.xs'
+ $EXPECT = <<EOT;
+ ed06361c6e9000bef1df740bcbad8622 Changes
+ a64a8e41ca2fe973ffbb46aa66d70bd2 README
+ bfdcb4108a0aec528b1ac9c8407f3b3a MD4.pm
+ 9db8b845da6b42d7f3cbaf690504dfb4 MD4.xs
+-2089ab664427233cd7043d91f0021ff8 rfc1320.txt
+ EOT
+ }
+
Added: trunk/libdigest-md4-perl/debian/repack.sh
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdigest-md4-perl/debian/repack.sh?rev=22521&op=file
==============================================================================
--- trunk/libdigest-md4-perl/debian/repack.sh (added)
+++ trunk/libdigest-md4-perl/debian/repack.sh Mon Jun 30 15:18:40 2008
@@ -1,0 +1,47 @@
+#!/bin/sh
+# Repackage upstream source to exclude non-distributable files
+# should be called as "repack.sh --upstream-source <ver> <downloaded file>
+# (for example, via uscan)
+
+set -e
+set -u
+
+VER="$2"
+FILE="$3"
+PKG=`dpkg-parsechangelog|grep ^Source:|sed 's/^Source: //'`
+
+REPACK_DIR="$PKG-$VER.orig" # DevRef § 6.7.8.2
+
+echo -e "\nRepackaging $FILE\n"
+
+DIR=`mktemp -d ./tmpRepackXXXXXX`
+trap "rm -rf \"$DIR\"" QUIT INT EXIT
+
+# Create an extra directory to cope with rootless tarballs
+UP_BASE="$DIR/unpack"
+mkdir "$UP_BASE"
+tar xzf "$FILE" -C "$UP_BASE"
+
+if [ `ls -1 "$UP_BASE" | wc -l` -eq 1 ]; then
+ # Tarball does contain a root directory
+ UP_BASE="$UP_BASE/`ls -1 "$UP_BASE"`"
+fi
+
+## Remove stuff
+
+# remove rfc1320.txt
+rm -vf $UP_BASE/rfc1320.txt
+
+# delete rfc line from MANIFEST
+sed -i '\,rfc1320.txt, D' $UP_BASE/MANIFEST
+## End
+
+mv "$UP_BASE" "$DIR/$REPACK_DIR"
+
+# Using a pipe hides tar errors!
+tar cfC "$DIR/repacked.tar" "$DIR" "$REPACK_DIR"
+gzip -9 < "$DIR/repacked.tar" > "$DIR/repacked.tar.gz"
+
+mv "$DIR/repacked.tar.gz" "$FILE"
+
+echo "*** $FILE repackaged"
Propchange: trunk/libdigest-md4-perl/debian/repack.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/libdigest-md4-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdigest-md4-perl/debian/rules?rev=22521&op=diff
==============================================================================
--- trunk/libdigest-md4-perl/debian/rules (original)
+++ trunk/libdigest-md4-perl/debian/rules Mon Jun 30 15:18:40 2008
@@ -1,54 +1,78 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# This debian/rules file is provided as a template for normal perl
+# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
+# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
+# be used freely wherever it is useful.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-# export DH_COMPAT=4
+# If set to a true value then MakeMaker's prompt function will
+# always return the default without waiting for user input.
+export PERL_MM_USE_DEFAULT=1
-PACKAGE=`pwd | sed -e "s/.*\/\\(.*\\)-.*/\\1/"`
+PERL ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP = $(CURDIR)/debian/$(PACKAGE)
+include /usr/share/quilt/quilt.make
-build:
+# Allow disabling build optimisation by setting noopt in
+# $DEB_BUILD_OPTIONS
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+get-orig-source:
+ uscan -force -verbose
+
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
- # Add here commands to compile the package.
- perl Makefile.PL verbose INSTALLDIRS=vendor
-clean:
+ $(PERL) Makefile.PL INSTALLDIRS=vendor
+ $(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
+ $(MAKE) test
+ touch $@
+
+clean: unpatch
dh_testdir
dh_testroot
+ dh_clean build-stamp install-stamp
+ [ ! -f Makefile ] || $(MAKE) realclean
- -$(MAKE) clean
- rm -f Makefile.old
- dh_clean
-
-install:
+install: install-stamp
+install-stamp: build-stamp
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs
+ $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+ [ ! -d $(TMP)/usr/share/perl5 ] || \
+ rmdir --ignore-fail-on-non-empty --parents --verbose \
+ $(TMP)/usr/share/perl5
+ touch $@
- $(MAKE) PREFIX=$(CURDIR)/debian/$(PACKAGE)/usr OPTIMIZE="-O2 -g -Wall" test install
- [ ! -d $(CURDIR)/debian/$(shell dh_listpackages)/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(CURDIR)/debian/$(shell dh_listpackages)/usr/share/perl5
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do here for an architecture-dependent package
-binary-indep:;
-binary-arch: build install;
+# Build architecture-dependent files here.
+binary-arch: build install
dh_testdir
dh_testroot
dh_installdocs
- dh_installman
dh_installchangelogs Changes
- dh_link
+ dh_shlibdeps
dh_strip
+ dh_perl
dh_compress
dh_fixperms
dh_installdeb
- dh_perl
- dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install
Modified: trunk/libdigest-md4-perl/debian/watch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdigest-md4-perl/debian/watch?rev=22521&op=diff
==============================================================================
--- trunk/libdigest-md4-perl/debian/watch (original)
+++ trunk/libdigest-md4-perl/debian/watch Mon Jun 30 15:18:40 2008
@@ -1,3 +1,4 @@
version=3
-opts=dversionmangle=s/\.dfsg$// \
-http://search.cpan.org/dist/Digest-MD4/ .*/Digest-MD4-([[:digit:]].*)\.tar\.gz
+opts=uversionmangle=s/$/.dfsg/ \
+http://search.cpan.org/dist/Digest-MD4/ .*/Digest-MD4-([[:digit:]].*)\.tar\.gz \
+debian debian/repack.sh
Modified: trunk/libdigest-md4-perl/t/files.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdigest-md4-perl/t/files.t?rev=22521&op=diff
==============================================================================
--- trunk/libdigest-md4-perl/t/files.t (original)
+++ trunk/libdigest-md4-perl/t/files.t Mon Jun 30 15:18:40 2008
@@ -5,7 +5,7 @@
}
}
-print "1..4\n";
+print "1..5\n";
use strict;
use Digest::MD4 qw(md4 md4_hex md4_base64);
@@ -24,6 +24,7 @@
0dbd12438619d37abe39c41e4584ebe0 README
86dc1e88bf2f4c41bc4d365686604342 MD4.pm
07995cc4bb36cba6306fded60ca69805 MD4.xs
+f178f04d0d8305c328a3de281313d642 rfc1320.txt
EOT
} elsif ("\n" eq "\015") { # MacOS
$EXPECT = <<EOT;
@@ -31,14 +32,16 @@
a64a8e41ca2fe973ffbb46aa66d70bd2 README
bfdcb4108a0aec528b1ac9c8407f3b3a MD4.pm
9db8b845da6b42d7f3cbaf690504dfb4 MD4.xs
+2089ab664427233cd7043d91f0021ff8 rfc1320.txt
EOT
} else {
- # This is the output of: 'md4sum Changes README MD4.pm MD4.xs'
+ # This is the output of: 'md4sum Changes README MD4.pm MD4.xs rfc1320.txt'
$EXPECT = <<EOT;
ed06361c6e9000bef1df740bcbad8622 Changes
a64a8e41ca2fe973ffbb46aa66d70bd2 README
bfdcb4108a0aec528b1ac9c8407f3b3a MD4.pm
9db8b845da6b42d7f3cbaf690504dfb4 MD4.xs
+2089ab664427233cd7043d91f0021ff8 rfc1320.txt
EOT
}
More information about the Pkg-perl-cvs-commits
mailing list