r17164 - in /trunk/libdbd-sqlite3-perl/debian: changelog control patches/ patches/error-reset.patch patches/series rules

ntyni at users.alioth.debian.org ntyni at users.alioth.debian.org
Mon Mar 10 19:23:29 UTC 2008 

Author: ntyni
Date: Mon Mar 10 19:23:28 2008
New Revision: 17164

URL: http://svn.debian.org/wsvn/?sc=1&rev=17164
Log:
* Switch to my @debian.org address.
* Manage debian/patches with quilt.
* error_reset.patch: fix sqlite error handling.        (Closes: #450744)
  + fixes a test failure with sqlite3 3.5.6.           (Closes: #470281)
  + fixes libdbix-class-perl FTBFS with sqlite3 3.5.6. (Closes: #470272)
* Upgrade to Standards-Version 3.7.3. No changes needed.
* Minor tweaks to debian/rules.
* Depend on ${misc:Depends}, as per debhelper(7).

Added:
    trunk/libdbd-sqlite3-perl/debian/patches/
    trunk/libdbd-sqlite3-perl/debian/patches/error-reset.patch
    trunk/libdbd-sqlite3-perl/debian/patches/series
Modified:
    trunk/libdbd-sqlite3-perl/debian/changelog
    trunk/libdbd-sqlite3-perl/debian/control
    trunk/libdbd-sqlite3-perl/debian/rules

Modified: trunk/libdbd-sqlite3-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libdbd-sqlite3-perl/debian/changelog?rev=17164&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/debian/changelog (original)
+++ trunk/libdbd-sqlite3-perl/debian/changelog Mon Mar 10 19:23:28 2008
@@ -7,6 +7,16 @@
 
   [ David Paleino ]
   * debian/control: removed myself from Uploaders
+
+  [ Niko Tyni ]
+  * Switch to my @debian.org address.
+  * Manage debian/patches with quilt.
+  * error_reset.patch: fix sqlite error handling.        (Closes: #450744)
+    + fixes a test failure with sqlite3 3.5.6.           (Closes: #470281)
+    + fixes libdbix-class-perl FTBFS with sqlite3 3.5.6. (Closes: #470272)
+  * Upgrade to Standards-Version 3.7.3. No changes needed.
+  * Minor tweaks to debian/rules.
+  * Depend on ${misc:Depends}, as per debhelper(7).
 
  -- David Paleino <d.paleino at gmail.com>  Fri, 22 Feb 2008 12:49:06 +0100
 

Modified: trunk/libdbd-sqlite3-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libdbd-sqlite3-perl/debian/control?rev=17164&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/debian/control (original)
+++ trunk/libdbd-sqlite3-perl/debian/control Mon Mar 10 19:23:28 2008
@@ -2,13 +2,13 @@
 Section: perl
 Priority: optional
 Build-Depends: debhelper (>= 5.0), perl (>= 5.8), libdbi-perl (>= 1.03),
- libsqlite3-dev (>> 3.1.3)
+ libsqlite3-dev (>> 3.1.3), quilt (>= 0.40)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Krzysztof Krzyzaniak (eloy) <eloy at debian.org>,
  Marcelo E. Magallon <mmagallo at debian.org>,
- Niko Tyni <ntyni at iki.fi>, gregor herrmann <gregor+debian at comodo.priv.at>,
+ Niko Tyni <ntyni at debian.org>, gregor herrmann <gregor+debian at comodo.priv.at>,
  Carlo Segre <segre at debian.org>
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 Homepage: http://search.cpan.org/dist/DBD-SQLite/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libdbd-sqlite3-perl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-sqlite3-perl/
@@ -17,7 +17,8 @@
 Section: perl
 Priority: optional
 Architecture: any
-Depends: ${perl:Depends}, libdbi-perl (>= 1.03), ${shlibs:Depends}
+Depends: ${perl:Depends}, libdbi-perl (>= 1.03), ${shlibs:Depends},
+ ${misc:Depends}
 Conflicts: libdbd-sqlite-perl
 Description: Perl DBI driver with a self-contained RDBMS
  This module embeds a small fast embedded SQL database engine called

Added: trunk/libdbd-sqlite3-perl/debian/patches/error-reset.patch
URL: http://svn.debian.org/wsvn/trunk/libdbd-sqlite3-perl/debian/patches/error-reset.patch?rev=17164&op=file
==============================================================================
--- trunk/libdbd-sqlite3-perl/debian/patches/error-reset.patch (added)
+++ trunk/libdbd-sqlite3-perl/debian/patches/error-reset.patch Mon Mar 10 19:23:28 2008
@@ -1,0 +1,24 @@
+Call sqlite3_reset() instead of sqlite3_finalize() in error
+situations. See #450744.
+diff --git a/dbdimp.c b/dbdimp.c
+index 8dcab51..4b1bb96 100644
+--- a/dbdimp.c
++++ b/dbdimp.c
+@@ -399,7 +399,7 @@ sqlite_st_execute (SV *sth, imp_sth_t *imp_sth)
+                 continue;
+             }
+             /* There are bug reports that say this should be sqlite3_reset() */
+-            sqlite3_finalize(imp_sth->stmt);
++            sqlite3_reset(imp_sth->stmt);
+             sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db));
+             return -5;
+         }
+@@ -419,7 +419,7 @@ sqlite_st_execute (SV *sth, imp_sth_t *imp_sth)
+                           sqlite_trace(5, "exec ok - %d rows, %d cols\n", imp_sth->nrow, DBIc_NUM_FIELDS(imp_sth));
+                           return 0;
+                           /* There are bug reports that say this should be sqlite3_reset() */
+-        default:          sqlite3_finalize(imp_sth->stmt);
++        default:          sqlite3_reset(imp_sth->stmt);
+                           sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db));
+                           return -6;
+     }

Added: trunk/libdbd-sqlite3-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libdbd-sqlite3-perl/debian/patches/series?rev=17164&op=file
==============================================================================
--- trunk/libdbd-sqlite3-perl/debian/patches/series (added)
+++ trunk/libdbd-sqlite3-perl/debian/patches/series Mon Mar 10 19:23:28 2008
@@ -1,0 +1,1 @@
+error-reset.patch

Modified: trunk/libdbd-sqlite3-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libdbd-sqlite3-perl/debian/rules?rev=17164&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/debian/rules (original)
+++ trunk/libdbd-sqlite3-perl/debian/rules Mon Mar 10 19:23:28 2008
@@ -3,9 +3,12 @@
 # uncomment this to turn on verbose mode
 #export DH_VERBOSE=1
 
-b := $(shell pwd)/debian/libdbd-sqlite3-perl
+include /usr/share/quilt/quilt.make
 
-clean:
+PACKAGE=$(shell dh_listpackages)
+b := $(CURDIR)/debian/$(PACKAGE)
+
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	dh_clean build-stamp install-stamp
@@ -13,7 +16,7 @@
 	-rm -rf output junk
 
 build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	perl Makefile.PL INSTALLDIRS=vendor USE_LOCAL_SQLITE=0
 	mkdir -p junk/
@@ -22,13 +25,13 @@
 	touch $@
 
 install: install-stamp
-install-stamp:	build
+install-stamp:	build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) install PREFIX=$(b)/usr
-	mv $(b)/usr/lib/perl5/DBD/ $(b)/usr/share/perl5/
+	$(MAKE) install DESTDIR=$(b) PREFIX=/usr
+	[ ! -d $(b)/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(b)/usr/share/perl5
 	touch $@
 
 binary-indep:

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