r41319 - in /trunk/libclass-dbi-plugin-pager-perl/debian: changelog compat control patches/ patches/fix-tests-new-sql-abstract.patch patches/series rules

diocles-guest at users.alioth.debian.org diocles-guest at users.alioth.debian.org
Tue Aug 4 23:17:15 UTC 2009


Author: diocles-guest
Date: Tue Aug  4 23:17:08 2009
New Revision: 41319

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=41319
Log:
  * debian/rules: Switch to 3-line rules file with quilt.
  * Update debhelper compat and Build-Dependency to 7.
  * Add patch to fix 02main.t with libsql-abstract-perl (>= 1.55), and
    Build-Depend on that. (Closes: #531230)
  * Set urgency to medium for RC bug fix.

Added:
    trunk/libclass-dbi-plugin-pager-perl/debian/patches/
    trunk/libclass-dbi-plugin-pager-perl/debian/patches/fix-tests-new-sql-abstract.patch
    trunk/libclass-dbi-plugin-pager-perl/debian/patches/series
Modified:
    trunk/libclass-dbi-plugin-pager-perl/debian/changelog
    trunk/libclass-dbi-plugin-pager-perl/debian/compat
    trunk/libclass-dbi-plugin-pager-perl/debian/control
    trunk/libclass-dbi-plugin-pager-perl/debian/rules

Modified: trunk/libclass-dbi-plugin-pager-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-plugin-pager-perl/debian/changelog?rev=41319&op=diff
==============================================================================
--- trunk/libclass-dbi-plugin-pager-perl/debian/changelog (original)
+++ trunk/libclass-dbi-plugin-pager-perl/debian/changelog Tue Aug  4 23:17:08 2009
@@ -1,4 +1,4 @@
-libclass-dbi-plugin-pager-perl (0.561-3) UNRELEASED; urgency=low
+libclass-dbi-plugin-pager-perl (0.561-3) UNRELEASED; urgency=medium
 
   [ gregor herrmann ]
   * debian/control: Changed: Switched Vcs-Browser field to ViewSVN
@@ -7,6 +7,13 @@
 
   [ Nathan Handler ]
   * debian/watch: Update to ignore development releases.
+
+  [ Tim Retout ]
+  * debian/rules: Switch to 3-line rules file with quilt.
+  * Update debhelper compat and Build-Dependency to 7.
+  * Add patch to fix 02main.t with libsql-abstract-perl (>= 1.55), and
+    Build-Depend on that. (Closes: #531230)
+  * Set urgency to medium for RC bug fix.
 
  -- gregor herrmann <gregoa at debian.org>  Sun, 16 Nov 2008 20:40:35 +0100
 

Modified: trunk/libclass-dbi-plugin-pager-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-plugin-pager-perl/debian/compat?rev=41319&op=diff
==============================================================================
--- trunk/libclass-dbi-plugin-pager-perl/debian/compat (original)
+++ trunk/libclass-dbi-plugin-pager-perl/debian/compat Tue Aug  4 23:17:08 2009
@@ -1,1 +1,1 @@
-5
+7

Modified: trunk/libclass-dbi-plugin-pager-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-plugin-pager-perl/debian/control?rev=41319&op=diff
==============================================================================
--- trunk/libclass-dbi-plugin-pager-perl/debian/control (original)
+++ trunk/libclass-dbi-plugin-pager-perl/debian/control Tue Aug  4 23:17:08 2009
@@ -4,8 +4,8 @@
  Damyan Ivanov <dmn at debian.org>
 Section: perl
 Priority: extra
-Build-Depends: debhelper (>= 5), perl, libmodule-build-perl
-Build-Depends-Indep: libclass-data-inheritable-perl, libclass-dbi-perl (>= 0.90), libclass-dbi-plugin-abstractcount-perl, libdata-page-perl (>= 2), libsql-abstract-perl, libtest-exception-perl, libtest-pod-perl, libtest-pod-coverage-perl, libtest-warn-perl, libuniversal-exports-perl
+Build-Depends: debhelper (>= 7), perl, libmodule-build-perl
+Build-Depends-Indep: libclass-data-inheritable-perl, libclass-dbi-perl (>= 0.90), libclass-dbi-plugin-abstractcount-perl, libdata-page-perl (>= 2), libsql-abstract-perl (>= 1.55), libtest-exception-perl, libtest-pod-perl, libtest-pod-coverage-perl, libtest-warn-perl, libuniversal-exports-perl
 Standards-Version: 3.7.3
 Homepage: http://search.cpan.org/dist/Class-DBI-Plugin-Pager/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libclass-dbi-plugin-pager-perl/

Added: trunk/libclass-dbi-plugin-pager-perl/debian/patches/fix-tests-new-sql-abstract.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-plugin-pager-perl/debian/patches/fix-tests-new-sql-abstract.patch?rev=41319&op=file
==============================================================================
--- trunk/libclass-dbi-plugin-pager-perl/debian/patches/fix-tests-new-sql-abstract.patch (added)
+++ trunk/libclass-dbi-plugin-pager-perl/debian/patches/fix-tests-new-sql-abstract.patch Tue Aug  4 23:17:08 2009
@@ -1,0 +1,26 @@
+Author: Tim Retout <tim at retout.co.uk>
+Description: SQL::Abstract 1.55 outputs cleaner SQL, so update 02main.t
+ to expect it.
+
+Index: libclass-dbi-plugin-pager-perl/t/02.main.t
+===================================================================
+--- libclass-dbi-plugin-pager-perl.orig/t/02.main.t	2009-08-04 23:46:27.000000000 +0100
++++ libclass-dbi-plugin-pager-perl/t/02.main.t	2009-08-04 23:58:39.000000000 +0100
+@@ -116,7 +116,7 @@
+ lives_ok { @results = $pager->search_where } 'search_where';
+ is_deeply( \@results, [ @dataset, 
+ 			'TestApp', 
+-			'( ( age <= ? ) AND ( age => ? ) AND ( city = ? ) ) ORDER BY fig LIMIT 10, 5',
++			'( ( age <= ? AND age => ? AND city = ? ) ) ORDER BY fig LIMIT 10, 5',
+ 			'80', '20', 'Jerusalem',
+ 			], 
+ 			'arrayref where (named args) results' );
+@@ -142,7 +142,7 @@
+ lives_ok { @results = $pager->search_where } 'search_where';
+ is_deeply( \@results, [ @dataset, 
+ 			'TestApp', 
+-			'( ( age <= ? ) AND ( age => ? ) AND ( city = ? ) ) ORDER BY fig ROWS 10 TO 15',
++			'( ( age <= ? AND age => ? AND city = ? ) ) ORDER BY fig ROWS 10 TO 15',
+ 			'80', '20', 'Jerusalem',
+ 			], 
+ 			'arrayref where (positional args) results' );

Added: trunk/libclass-dbi-plugin-pager-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-plugin-pager-perl/debian/patches/series?rev=41319&op=file
==============================================================================
--- trunk/libclass-dbi-plugin-pager-perl/debian/patches/series (added)
+++ trunk/libclass-dbi-plugin-pager-perl/debian/patches/series Tue Aug  4 23:17:08 2009
@@ -1,0 +1,1 @@
+fix-tests-new-sql-abstract.patch

Modified: trunk/libclass-dbi-plugin-pager-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-plugin-pager-perl/debian/rules?rev=41319&op=diff
==============================================================================
--- trunk/libclass-dbi-plugin-pager-perl/debian/rules (original)
+++ trunk/libclass-dbi-plugin-pager-perl/debian/rules Tue Aug  4 23:17:08 2009
@@ -1,76 +1,4 @@
 #!/usr/bin/make -f
-# 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.
-#
-# It was later modified by Jason Kohles <email at jasonkohles.com>
-# http://www.jasonkohles.com/ to support Module::Build installed modules
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# 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=$(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP     =$(CURDIR)/debian/$(PACKAGE)
-
-build: build-stamp
-build-stamp:
-	dh_testdir
-
-	# Add commands to compile the package here
-	$(PERL) Build.PL installdirs=vendor
-	$(PERL) Build
-	$(PERL) Build test
-
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-
-	dh_clean build-stamp install-stamp
-
-	# Add commands to clean up after the build process here
-	[ ! -f Build ] || $(PERL) Build distclean
-
-install: install-stamp
-install-stamp: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-	# Add commands to install the package into $(TMP) here
-	$(PERL) Build install destdir=$(TMP) create_packlist=0
-
-	touch $@
-
-binary-arch:
-# We have nothing to do here for an architecture-independent package
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs Changes
-	dh_perl
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-source diff:
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+	dh --with quilt $@




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