r35107 - in /trunk/libcatalyst-modules-perl/debian: ./ patches/ patches/Catalyst-Plugin-Flavour/
ansgar-guest at users.alioth.debian.org
ansgar-guest at users.alioth.debian.org
Sun May 10 10:48:57 UTC 2009
Author: ansgar-guest
Date: Sun May 10 10:48:50 2009
New Revision: 35107
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=35107
Log:
* Catalyst-Plugin-Session needs libmoosex-emulate-class-accessor-fast-perl
(>= 0.00801) for test suite.
* debian/make-module.sh now fails on error.
* Add quilt framework.
* Disable t/pod-coverage in Catalyst-Plugin-Flavour.
+ New patch: Catalyst-Plugin-Flavour/disable-pod-coverage-test.patch
Added:
trunk/libcatalyst-modules-perl/debian/README.source
trunk/libcatalyst-modules-perl/debian/patches/
trunk/libcatalyst-modules-perl/debian/patches/Catalyst-Plugin-Flavour/
trunk/libcatalyst-modules-perl/debian/patches/Catalyst-Plugin-Flavour/disable-pod-coverage-test.patch
trunk/libcatalyst-modules-perl/debian/patches/Catalyst-Plugin-Flavour/series
Modified:
trunk/libcatalyst-modules-perl/debian/changelog
trunk/libcatalyst-modules-perl/debian/control
trunk/libcatalyst-modules-perl/debian/lintian-overrides
trunk/libcatalyst-modules-perl/debian/make-module.sh
trunk/libcatalyst-modules-perl/debian/rules
Added: trunk/libcatalyst-modules-perl/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-modules-perl/debian/README.source?rev=35107&op=file
==============================================================================
--- trunk/libcatalyst-modules-perl/debian/README.source (added)
+++ trunk/libcatalyst-modules-perl/debian/README.source Sun May 10 10:48:50 2009
@@ -1,0 +1,16 @@
+This package uses quilt 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.
+
+In order to patch a module, the directory debian/patches/$(Module-Name) has to
+exist. Then run
+ export QUILT_PATCHES=patches
+ make -f debian/rules patch
+and change to the module directory in build-area/$(xx)/$(Module-Name). The
+symlink "patches" there should point to a directory in debian/patches. You can
+now use quilt as usual.
+
+Run
+ make -f debian/rules unpatch
+to remove all applied patches.
+
Modified: trunk/libcatalyst-modules-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-modules-perl/debian/changelog?rev=35107&op=diff
==============================================================================
--- trunk/libcatalyst-modules-perl/debian/changelog (original)
+++ trunk/libcatalyst-modules-perl/debian/changelog Sun May 10 10:48:50 2009
@@ -1,5 +1,6 @@
libcatalyst-modules-perl (34) UNRELEASED; urgency=low
+ [ gregor herrmann ]
* Updated modules:
+ Catalyst::Action::RenderView 0.10
+ Catalyst::Plugin::ConfigLoader 0.23
@@ -20,6 +21,14 @@
* Move Catalyst-Plugin-Session-Store-DBIC-0.09.tar.gz from tarballs/02 to
tarballs/03 since it needs
tarballs/02/Catalyst-Plugin-Session-Store-Delegate-0.03.tar.gz.
+
+ [ Ansgar Burchardt ]
+ * Catalyst-Plugin-Session needs libmoosex-emulate-class-accessor-fast-perl
+ (>= 0.00801) for test suite.
+ * debian/make-module.sh now fails on error.
+ * Add quilt framework.
+ * Disable t/pod-coverage in Catalyst-Plugin-Flavour.
+ + New patch: Catalyst-Plugin-Flavour/disable-pod-coverage-test.patch
-- gregor herrmann <gregoa at debian.org> Sat, 02 May 2009 15:50:57 +0200
Modified: trunk/libcatalyst-modules-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-modules-perl/debian/control?rev=35107&op=diff
==============================================================================
--- trunk/libcatalyst-modules-perl/debian/control (original)
+++ trunk/libcatalyst-modules-perl/debian/control Sun May 10 10:48:50 2009
@@ -5,7 +5,7 @@
Uploaders: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>,
gregor herrmann <gregoa at debian.org>
Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: perl, libuniversal-isa-perl, libuniversal-can-perl,
+Build-Depends-Indep: perl, quilt, libuniversal-isa-perl, libuniversal-can-perl,
libdbd-sqlite3-perl, libclass-dbi-perl, liblog-log4perl-perl,
libtest-deep-perl, libtest-exception-perl, libcatalyst-perl (>= 5.7012-7),
libfile-slurp-perl, libcatalyst-view-tt-perl, libtest-pod-perl,
@@ -23,7 +23,7 @@
libemail-send-perl (>= 2.185), libtest-www-mechanize-catalyst-perl,
libtemplate-perl, libregexp-assemble-perl, libhtml-formfu-perl (>= 0.04001),
libtask-weaken-perl, libmoose-perl, libtie-ixhash-perl, libtest-warn-perl,
- libauthen-sasl-perl
+ libauthen-sasl-perl, libmoosex-emulate-class-accessor-fast-perl (>= 0.00801)
Standards-Version: 3.8.1
Package: libcatalyst-modules-perl
Modified: trunk/libcatalyst-modules-perl/debian/lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-modules-perl/debian/lintian-overrides?rev=35107&op=diff
==============================================================================
--- trunk/libcatalyst-modules-perl/debian/lintian-overrides (original)
+++ trunk/libcatalyst-modules-perl/debian/lintian-overrides Sun May 10 10:48:50 2009
@@ -1,1 +1,4 @@
+# We use quilt in a different way, see README.source
+libcatalyst-modules-perl source: quilt-build-dep-but-no-series-file libcatalyst-modules-perl
+
libcatalyst-modules-perl: manpage-has-errors-from-pod2man usr/share/man/man3/Catalyst::Plugin::XMLRPC.3pm.gz:188
Modified: trunk/libcatalyst-modules-perl/debian/make-module.sh
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-modules-perl/debian/make-module.sh?rev=35107&op=diff
==============================================================================
--- trunk/libcatalyst-modules-perl/debian/make-module.sh (original)
+++ trunk/libcatalyst-modules-perl/debian/make-module.sh Sun May 10 10:48:50 2009
@@ -1,9 +1,12 @@
#!/bin/sh
+
+set -e
PERL=$(which perl)
MAKE=$(which make)
PERL5LIB="$DESTDIR/usr/share/perl5/"
PERL="$PERL -I$PERL5LIB"
+ROOT=$PWD
echo "=========================================================================="
echo "Make $1"
@@ -29,6 +32,31 @@
fi
done
cd ..
+fi
+
+if [ "$1" = patch -o "$1" = unpatch ]; then
+ if [ "$1" = patch ]; then
+ action=push
+ else
+ action=pop
+ fi
+
+ for dir in build-area/*
+ do
+ [ -d $dir ] || continue
+ cd $dir
+ for module in *
+ do
+ name=$(echo $module | sed 's,-[^-]*$,,')
+ [ -d $ROOT/debian/patches/$name ] || continue
+ echo "Applying patches for $name:"
+ cd $module
+ [ -h patches ] || ln -s ../../../debian/patches/$name patches
+ QUILT_PATCHES=patches quilt $action -a || test $? = 2
+ cd ..
+ done
+ cd ../..
+ done
fi
if [ "$1" = "build" ]; then
Added: trunk/libcatalyst-modules-perl/debian/patches/Catalyst-Plugin-Flavour/disable-pod-coverage-test.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-modules-perl/debian/patches/Catalyst-Plugin-Flavour/disable-pod-coverage-test.patch?rev=35107&op=file
==============================================================================
--- trunk/libcatalyst-modules-perl/debian/patches/Catalyst-Plugin-Flavour/disable-pod-coverage-test.patch (added)
+++ trunk/libcatalyst-modules-perl/debian/patches/Catalyst-Plugin-Flavour/disable-pod-coverage-test.patch Sun May 10 10:48:50 2009
@@ -1,0 +1,25 @@
+Subject: Disable POD coverage tests
+Author: Ansgar Burchardt <ansgar at 43-1.org>
+Date: Sun, 10 May 2009 11:12:21 +0200
+
+POD coverage test currently fails:
+
+ # Failed test 'Pod coverage on Catalyst::Plugin::Flavour::Data'
+ # at /usr/share/perl5/Test/Pod/Coverage.pm line 126.
+ # Coverage for Catalyst::Plugin::Flavour::Data is 0.0%, with 3 naked
+ # subroutines:
+ # da
+ # mo
+ # yr
+ # Looks like you failed 1 test of 2.
+
+--- Catalyst-Plugin-Flavour-0.03.orig/t/pod-coverage.t
++++ Catalyst-Plugin-Flavour-0.03/t/pod-coverage.t
+@@ -4,4 +4,7 @@
+ eval "use Test::Pod::Coverage 1.04";
+ plan skip_all => "Test::Pod::Coverage 1.04 required for testing POD coverage"
+ if $@;
++
++plan skip_all => "POD coverage test fails.";
++
+ all_pod_coverage_ok();
Added: trunk/libcatalyst-modules-perl/debian/patches/Catalyst-Plugin-Flavour/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-modules-perl/debian/patches/Catalyst-Plugin-Flavour/series?rev=35107&op=file
==============================================================================
--- trunk/libcatalyst-modules-perl/debian/patches/Catalyst-Plugin-Flavour/series (added)
+++ trunk/libcatalyst-modules-perl/debian/patches/Catalyst-Plugin-Flavour/series Sun May 10 10:48:50 2009
@@ -1,0 +1,1 @@
+disable-pod-coverage-test.patch
Modified: trunk/libcatalyst-modules-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-modules-perl/debian/rules?rev=35107&op=diff
==============================================================================
--- trunk/libcatalyst-modules-perl/debian/rules (original)
+++ trunk/libcatalyst-modules-perl/debian/rules Sun May 10 10:48:50 2009
@@ -16,10 +16,19 @@
DESTDIR=$(DESTDIR) debian/make-module.sh unpack
touch configure-stamp
+patch: patch-stamp
+patch-stamp: configure-stamp
+ DESTDIR=$(DESTDIR) debian/make-module.sh patch
+ touch patch-stamp
+
build: build-stamp
-build-stamp: configure
+build-stamp: configure-stamp patch-stamp
DESTDIR=$(DESTDIR) debian/make-module.sh build
touch build-stamp
+
+unpatch:
+ DESTDIR=$(DESTDIR) debian/make-module.sh unpatch
+ rm patch-stamp
clean:
dh_testdir
@@ -28,7 +37,7 @@
rm -rf build-area
dh_clean
-binary-indep: build
+binary-indep: build-stamp
dh_testdir
dh_testroot
More information about the Pkg-perl-cvs-commits
mailing list