r56188 - in /trunk/libdbi-perl/debian: changelog clean control get-dbdabi-version.cpp libdbi-perl.install rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Fri Apr 16 18:42:44 2010
New Revision: 56188

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=56188
Log:
* Address breakage in the DBD<>DBI binary interface on partial upgrades
  (see #577209):
  + Provides: perl-dbdabi-95 so that libdbd-*-perl plugins can depend on that
  + the recommended binNMU safe way to generate the perl-dbdabi-*
    dependency is to include /usr/share/libdbi-perl/perl-dbdabi.make
    in debian/rules and use PERL_DBDABI_DEPENDS
  + Breaks: entries against older libdbd-*-perl versions still need
    to be added later once all of them have switched to the
    perl-dbdabi-* scheme.

Added:
    trunk/libdbi-perl/debian/clean
    trunk/libdbi-perl/debian/get-dbdabi-version.cpp
    trunk/libdbi-perl/debian/libdbi-perl.install
Modified:
    trunk/libdbi-perl/debian/changelog
    trunk/libdbi-perl/debian/control
    trunk/libdbi-perl/debian/rules

Modified: trunk/libdbi-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbi-perl/debian/changelog?rev=56188&op=diff
==============================================================================
--- trunk/libdbi-perl/debian/changelog (original)
+++ trunk/libdbi-perl/debian/changelog Fri Apr 16 18:42:44 2010
@@ -1,10 +1,22 @@
 libdbi-perl (1.610.90+is+1.609-1) UNRELEASED; urgency=low
 
+  [ gregor herrmann ]
   * Re-upload 1.609 as 1.610.90+is+1.609-1 as a preparation for a clean
     DBI<>DBD interface change transition (cf. #577209).
   * debian/watch: ignore development versions again.
   * debian/control: remove build dependency on Test::Simple 0.84.
 
+  [ Niko Tyni ]
+  * Address breakage in the DBD<>DBI binary interface on partial upgrades
+    (see #577209):
+    + Provides: perl-dbdabi-95 so that libdbd-*-perl plugins can depend on that
+    + the recommended binNMU safe way to generate the perl-dbdabi-*
+      dependency is to include /usr/share/libdbi-perl/perl-dbdabi.make
+      in debian/rules and use PERL_DBDABI_DEPENDS
+    + Breaks: entries against older libdbd-*-perl versions still need
+      to be added later once all of them have switched to the
+      perl-dbdabi-* scheme.
+  
  -- gregor herrmann <gregoa at debian.org>  Fri, 16 Apr 2010 20:29:00 +0200
 
 libdbi-perl (1.610.90-1) unstable; urgency=low

Added: trunk/libdbi-perl/debian/clean
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbi-perl/debian/clean?rev=56188&op=file
==============================================================================
--- trunk/libdbi-perl/debian/clean (added)
+++ trunk/libdbi-perl/debian/clean Fri Apr 16 18:42:44 2010
@@ -1,0 +1,1 @@
+debian/perl-dbdabi.make

Modified: trunk/libdbi-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbi-perl/debian/control?rev=56188&op=diff
==============================================================================
--- trunk/libdbi-perl/debian/control (original)
+++ trunk/libdbi-perl/debian/control Fri Apr 16 18:42:44 2010
@@ -6,7 +6,7 @@
  Damyan Ivanov <dmn at debian.org>, Niko Tyni <ntyni at debian.org>,
  gregor herrmann <gregoa at debian.org>, Ryan Niebur <ryan at debian.org>,
  Jonathan Yu <jawnsy at cpan.org>
-Build-Depends: perl, debhelper (>= 7),
+Build-Depends: perl, debhelper (>= 7.0.50~),
  libplrpc-perl, libtest-pod-perl, libtest-pod-coverage-perl
 Standards-Version: 3.8.4
 Homepage: http://dbi.perl.org/
@@ -16,6 +16,7 @@
 Package: libdbi-perl
 Architecture: any
 Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, libplrpc-perl
+Provides: perl-dbdabi-${perl-dbdabi-version}
 Description: Perl Database Interface (DBI)
  DBI (DataBase Interface) is a Perl framework that provides a common interface
  to access various backend databases in a uniform manner. DBD (DataBase Driver)

Added: trunk/libdbi-perl/debian/get-dbdabi-version.cpp
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbi-perl/debian/get-dbdabi-version.cpp?rev=56188&op=file
==============================================================================
--- trunk/libdbi-perl/debian/get-dbdabi-version.cpp (added)
+++ trunk/libdbi-perl/debian/get-dbdabi-version.cpp Fri Apr 16 18:42:44 2010
@@ -1,0 +1,7 @@
+// this script gets piped through cpp to sh
+// cpp reads DBIXS.h and substitutes DBISTATE_VERSION, sh echoes it out
+cat >/dev/null <<END-OF-DBI
+#include "../DBIXS.h"
+END-OF-DBI
+
+echo DBISTATE_VERSION

Added: trunk/libdbi-perl/debian/libdbi-perl.install
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbi-perl/debian/libdbi-perl.install?rev=56188&op=file
==============================================================================
--- trunk/libdbi-perl/debian/libdbi-perl.install (added)
+++ trunk/libdbi-perl/debian/libdbi-perl.install Fri Apr 16 18:42:44 2010
@@ -1,0 +1,1 @@
+debian/perl-dbdabi.make /usr/share/libdbi-perl

Modified: trunk/libdbi-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbi-perl/debian/rules?rev=56188&op=diff
==============================================================================
--- trunk/libdbi-perl/debian/rules (original)
+++ trunk/libdbi-perl/debian/rules Fri Apr 16 18:42:44 2010
@@ -1,4 +1,14 @@
 #!/usr/bin/make -f
+
+DBDABI_VERSION = $(shell cpp `perl -MExtUtils::Embed -e ccopts` debian/get-dbdabi-version.cpp | sh)
 
 %:
 	dh $@
+
+override_dh_auto_build:
+	dh_auto_build
+	echo PERL_DBDABI_DEPENDS=perl-dbdabi-$(DBDABI_VERSION) > debian/perl-dbdabi.make
+
+override_dh_gencontrol:
+	dh_gencontrol -- -Vperl-dbdabi-version=$(DBDABI_VERSION)
+