r41219 - in /trunk/libclass-dbi-sweet-perl/debian: changelog control patches/ patches/fix-test-new-sql-abstract.patch patches/series rules

[dmn at users.alioth.debian.org]

Author: dmn
Date: Mon Aug  3 12:46:46 2009
New Revision: 41219

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=41219
Log:
add patch adjusting t/04join.t to new SQL::Abstract and (build-)depend on
that (Closes: #527750)

Added:
    trunk/libclass-dbi-sweet-perl/debian/patches/
    trunk/libclass-dbi-sweet-perl/debian/patches/fix-test-new-sql-abstract.patch
    trunk/libclass-dbi-sweet-perl/debian/patches/series
Modified:
    trunk/libclass-dbi-sweet-perl/debian/changelog
    trunk/libclass-dbi-sweet-perl/debian/control
    trunk/libclass-dbi-sweet-perl/debian/rules

Modified: trunk/libclass-dbi-sweet-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-sweet-perl/debian/changelog?rev=41219&op=diff
==============================================================================
--- trunk/libclass-dbi-sweet-perl/debian/changelog (original)
+++ trunk/libclass-dbi-sweet-perl/debian/changelog Mon Aug  3 12:46:46 2009
@@ -9,6 +9,8 @@
 
   [ Damyan Ivanov ]
   * replace debian/rules with DH7 three-liner
+  * add patch adjusting t/04join.t to new SQL::Abstract and (build-)depend on
+    that (Closes: #527750)
 
  -- gregor herrmann <gregoa at debian.org>  Sun, 16 Nov 2008 20:40:35 +0100
 

Modified: trunk/libclass-dbi-sweet-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-sweet-perl/debian/control?rev=41219&op=diff
==============================================================================
--- trunk/libclass-dbi-sweet-perl/debian/control (original)
+++ trunk/libclass-dbi-sweet-perl/debian/control Mon Aug  3 12:46:46 2009
@@ -1,9 +1,10 @@
 Source: libclass-dbi-sweet-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7), perl (>= 5.10) | libmodule-build-perl
+Build-Depends: debhelper (>= 7), perl (>= 5.10) | libmodule-build-perl,
+ quilt (>= 0.46-7)
 Build-Depends-Indep: perl (>= 5.8.8-12), libdbi-perl, libclass-dbi-perl,
- libdbd-sqlite3-perl, libdata-page-perl, libsql-abstract-perl,
+ libdbd-sqlite3-perl, libdata-page-perl, libsql-abstract-perl (>= 1.55),
  libcache-cache-perl, libtest-pod-perl, libtest-pod-coverage-perl,
  libossp-uuid-perl, libdate-simple-perl, libdbd-pg-perl,
  libtime-piece-mysql-perl
@@ -16,7 +17,7 @@
 
 Package: libclass-dbi-sweet-perl
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, libsql-abstract-perl (>= 1.17),
+Depends: ${perl:Depends}, ${misc:Depends}, libsql-abstract-perl (>= 1.55),
  libdata-page-perl, libclass-dbi-perl (>= 3.0.12), libdbi-perl
 Description: sweeter Class::DBI
  Class::DBI::Sweet provides convenient count, search, page, and

Added: trunk/libclass-dbi-sweet-perl/debian/patches/fix-test-new-sql-abstract.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-sweet-perl/debian/patches/fix-test-new-sql-abstract.patch?rev=41219&op=file
==============================================================================
--- trunk/libclass-dbi-sweet-perl/debian/patches/fix-test-new-sql-abstract.patch (added)
+++ trunk/libclass-dbi-sweet-perl/debian/patches/fix-test-new-sql-abstract.patch Mon Aug  3 12:46:46 2009
@@ -1,0 +1,16 @@
+Author: Damyan Ivanov <dmn at debian.org>
+Description: Fix failure to build from source with SQL::Abstract >= 1.55 which
+ generates cleaner SQL
+Debian-Bug: 527750
+Upstream-Bug: http://rt.cpan.org/Public/Bug/Display.html?id=45876
+--- a/t/04join.t
++++ b/t/04join.t
+@@ -29,7 +29,7 @@ my ($sql) = $cds[0]->_search({ 'artist.n
+ 
+ is($sql->{from}, "cd me, artist artist", "FROM statement ok");
+ 
+-is($sql->{where}, "( artist.name = ? ) AND me.artist = artist.artistid",
++is($sql->{where}, "artist.name = ? AND me.artist = artist.artistid",
+     "WHERE clause ok");
+ 
+ cmp_ok($cds[2]->year, '==', 2001, "Last CD returned correctly");

Added: trunk/libclass-dbi-sweet-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-sweet-perl/debian/patches/series?rev=41219&op=file
==============================================================================
--- trunk/libclass-dbi-sweet-perl/debian/patches/series (added)
+++ trunk/libclass-dbi-sweet-perl/debian/patches/series Mon Aug  3 12:46:46 2009
@@ -1,0 +1,1 @@
+fix-test-new-sql-abstract.patch

Modified: trunk/libclass-dbi-sweet-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-sweet-perl/debian/rules?rev=41219&op=diff
==============================================================================
--- trunk/libclass-dbi-sweet-perl/debian/rules (original)
+++ trunk/libclass-dbi-sweet-perl/debian/rules Mon Aug  3 12:46:46 2009
@@ -1,3 +1,3 @@
 #!/usr/bin/make -f
 %:
-	dh $@
+	dh --with quilt $@