[SCM] Debian packaging of libclass-dbi-plugin-pager-perl branch, master, updated. 6ba2975ce3304322ccd5bf4f02e0af2a5377ac9c

Xavier Guimard x.guimard at free.fr
Sun Dec 2 09:08:17 UTC 2012


The following commit has been merged in the master branch:
commit 83d08377469421a15568746c030df8186181de9b
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Sun Dec 2 09:51:59 2012 +0100

    Remove patch now in upstream

diff --git a/debian/changelog b/debian/changelog
index 29879d4..33876a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libclass-dbi-plugin-pager-perl (0.561-5) UNRELEASED; urgency=low
+libclass-dbi-plugin-pager-perl (0.566-1) UNRELEASED; urgency=low
 
   [ Tim Retout ]
   * debian/control: Update my email address.
@@ -14,7 +14,11 @@ libclass-dbi-plugin-pager-perl (0.561-5) UNRELEASED; urgency=low
   [ gregor herrmann ]
   * debian/control: update {versioned,alternative} (build) dependencies.
 
- -- Tim Retout <diocles at debian.org>  Sun, 24 Oct 2010 21:52:56 +0100
+  [ Xavier Guimard ]
+  * Imported Upstream version 0.566
+  * Remove fix-tests-new-sql-abstract.patch included now in upstream
+
+ -- Xavier Guimard <x.guimard at free.fr>  Sun, 02 Dec 2012 09:47:56 +0100
 
 libclass-dbi-plugin-pager-perl (0.561-4) unstable; urgency=low
 
diff --git a/debian/patches/fix-tests-new-sql-abstract.patch b/debian/patches/fix-tests-new-sql-abstract.patch
deleted file mode 100644
index df46112..0000000
--- a/debian/patches/fix-tests-new-sql-abstract.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Author: Tim Retout <tim at retout.co.uk>
-Author: Ansgar Burchardt <ansgar at 43-1.org>
-Bug-Debian: http://bugs.debian.org/531230
-Bug-Debian: http://bugs.debian.org/576644
-Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=47497
-Last-Update: 2010-04-07
-Description: SQL::Abstract 1.55 outputs cleaner SQL, so update 02main.t
- to expect it.
-
---- libclass-dbi-plugin-pager-perl.orig/t/02.main.t
-+++ libclass-dbi-plugin-pager-perl/t/02.main.t
-@@ -105,7 +105,7 @@
- 
- $conf{ where } = [
-     age  => {'<=', 80},
--    age  => {'=>', 20},
-+    age  => {'>=', 20},
-     city => 'Jerusalem',
-     ];
- 
-@@ -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' );
-@@ -130,7 +130,7 @@
- 
- $conf{ where } = [
-     age  => {'<=', 80},
--    age  => {'=>', 20},
-+    age  => {'>=', 20},
-     city => 'Jerusalem',
-     ];
- 
-@@ -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' );
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6359450..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-tests-new-sql-abstract.patch

-- 
Debian packaging of libclass-dbi-plugin-pager-perl



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