tags 398636 + patch
thanks
Hi,
Attached is the diff for my sqlrelay 1:0.37.1-3.1 NMU.
I fixed more than just this bug since the package was not bin-NMU safe and
since php5-sqlrelay was empty.
Cheers,
--
Raphaël Hertzog
Premier livre français sur Debian GNU/Linux :
http://www.ouaza.com/livre/admin-debian/
reverted:
--- sqlrelay-0.37.1/debian/php4-sqlrelay.install
+++ sqlrelay-0.37.1.orig/debian/php4-sqlrelay.install
@@ -1,2 +0,0 @@
-usr/lib/php4/*
-usr/share/pear/DB/sqlrelay.php usr/share/doc/php4-sqlrelay/
reverted:
--- sqlrelay-0.37.1/debian/php4-sqlrelay.substvars
+++ sqlrelay-0.37.1.orig/debian/php4-sqlrelay.substvars
@@ -1 +0,0 @@
-php:Depends=phpapi-
diff -u sqlrelay-0.37.1/debian/control sqlrelay-0.37.1/debian/control
--- sqlrelay-0.37.1/debian/control
+++ sqlrelay-0.37.1/debian/control
@@ -9,7 +9,7 @@
Package: sqlrelay
Architecture: any
Depends: libxml2-utils, ${shlibs:Depends}, adduser
-Suggests: sqlrelay-doc (= ${Source-Version}), sqlrelay-config-gtk (=
${Source-Version}), sqlrelay-connection-daemon, sqlrelay-api
+Suggests: sqlrelay-doc (= ${source:Version}), sqlrelay-config-gtk (=
${binary:Version}), sqlrelay-connection-daemon, sqlrelay-api
Description: Database connection pooling, proxying and load balancing
SQL Relay is a persistent database connection pooling, proxying and
load balancing system for Unix and Linux supporting ODBC, Oracle,
@@ -37,7 +37,7 @@
Package: sqlrelay-dev
Section: devel
Architecture: any
-Depends: ${shlibs:Depends}, libsqlrelay-0.37 (= ${Source-Version}), sqlrelay
(= ${Source-Version}), sqlrelay-mysql (= ${Source-Version}), librudiments-dev
(>= 0.29)
+Depends: ${shlibs:Depends}, libsqlrelay-0.37 (= ${binary:Version}), sqlrelay
(= ${binary:Version}), sqlrelay-mysql (= ${binary:Version}), librudiments-dev
(>= 0.29)
Provides: sqlrelay-api
Suggests: sqlrelay-doc
Description: SQL Relay C and C++ APIs
@@ -76,7 +76,7 @@
Package: python-sqlrelay
Section: python
Architecture: any
-Depends: ${python:Depends}, sqlrelay (= ${Source-Version}), ${shlibs:Depends}
+Depends: ${python:Depends}, sqlrelay (= ${binary:Version}), ${shlibs:Depends}
Suggests: sqlrelay-doc
Conflicts: python2.3-sqlrelay, python2.4-sqlrelay
Replaces: python2.3-sqlrelay, python2.4-sqlrelay
@@ -90,8 +90,9 @@
Replaces: zsqlrelayda
Architecture: all
Provides: sqlrelay-api
-Depends: python-sqlrelay (= ${Source-Version}), zope2.9 | zope2.8 | zope,
${misc:Depends}
+Depends: python-sqlrelay (>= ${source:Version}), zope2.9 | zope2.8 | zope,
${misc:Depends}
Suggests: sqlrelay-doc
+XB-Python-Version: ${python:Versions}
Description: SQL Relay Zope database adapter
SQL Relay is a persistent database connection pooling, proxying and
load balancing system for Unix and Linux.
@@ -168,7 +169,7 @@
Package: sqlrelay-config-gtk
Architecture: any
-Depends: sqlrelay (= ${Source-Version}), ${shlibs:Depends}
+Depends: sqlrelay (= ${binary:Version}), ${shlibs:Depends}
Suggests: sqlrelay-doc
Description: SQL Relay configuration GTK+ client
SQL Relay is a persistent database connection pooling, proxying and
@@ -178,7 +179,7 @@
Package: sqlrelay-test
Architecture: any
-Depends: ${shlibs:Depends}, sqlrelay (= ${Source-Version}), ${shlibs:Depends}
+Depends: ${shlibs:Depends}, sqlrelay (= ${binary:Version}), ${shlibs:Depends}
Suggests: sqlrelay-doc
Description: SQL Relay tests
SQL Relay is a persistent database connection pooling, proxying and
@@ -189,7 +190,7 @@
Package: libdbd-sqlrelay-perl
Section: perl
Architecture: all
-Depends: ${perl:Depends}, sqlrelay (= ${Source-Version}),
libfirstworks-sqlr-perl (= ${Source-Version})
+Depends: ${perl:Depends}, sqlrelay (>= ${source:Version}),
libfirstworks-sqlr-perl (>= ${source:Version})
Suggests: sqlrelay-doc
Provides: sqlrelay-api
Description: SQL Relay Perl DBD API
@@ -202,7 +203,7 @@
Package: libfirstworks-sqlr-perl
Section: perl
Architecture: any
-Depends: ${perl:Depends}, sqlrelay (= ${Source-Version}), ${shlibs:Depends}
+Depends: ${perl:Depends}, sqlrelay (= ${binary:Version}), ${shlibs:Depends}
Suggests: sqlrelay-doc
Provides: sqlrelay-api
Conflicts: libdbd-sqlrelay-perl (<< 1:0.35-4)
@@ -216,7 +217,7 @@
Package: libsqlrelay-java
Architecture: any
-Depends: java-gcj-compat | java-runtime2, sqlrelay (= ${Source-Version}),
${shlibs:Depends}
+Depends: java-gcj-compat | java-runtime2, sqlrelay (= ${binary:Version}),
${shlibs:Depends}
Suggests: sqlrelay-doc
Provides: sqlrelay-api
Description: SQL Relay Java API
@@ -227,7 +228,7 @@
Package: libsqlrelay-ruby
Architecture: any
-Depends: ruby, sqlrelay (= ${Source-Version}), ${shlibs:Depends}
+Depends: ruby, sqlrelay (= ${binary:Version}), ${shlibs:Depends}
Suggests: sqlrelay-doc
Provides: sqlrelay-api
Description: SQL Relay Ruby API
@@ -238,7 +239,7 @@
Package: libsqlrelay-tcl
Architecture: any
-Depends: tcl8.4, sqlrelay (= ${Source-Version}), ${shlibs:Depends}
+Depends: tcl8.4, sqlrelay (= ${binary:Version}), ${shlibs:Depends}
Suggests: sqlrelay-doc
Provides: sqlrelay-api
Description: SQL Relay Tcl API
@@ -249,7 +250,7 @@
Package: php5-sqlrelay
Architecture: any
-Depends: ${php:Depends}, sqlrelay (= ${Source-Version}), ${shlibs:Depends}
+Depends: ${php:Depends}, sqlrelay (= ${binary:Version}), ${shlibs:Depends}
Suggests: sqlrelay-doc
Provides: sqlrelay-api
Description: SQL Relay PHP API
diff -u sqlrelay-0.37.1/debian/changelog sqlrelay-0.37.1/debian/changelog
--- sqlrelay-0.37.1/debian/changelog
+++ sqlrelay-0.37.1/debian/changelog
@@ -1,3 +1,16 @@
+sqlrelay (1:0.37.1-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Make various dependencies bin-NMU safe. But this implied loosening
+ some dependencies (changed "=" into ">=") from "arch: all" packages
+ depending on "arch: any" packages.
+ * Fix zope-sqlrelayda to include a Python-Version field. Closes: #398636
+ * Fix php5-sqlrelay to actually have some content (renamed
+ debian/php4-sqlrelay.install to debian/php5-sqlrelay.install and update
+ its content).
+
+ -- Raphael Hertzog <[EMAIL PROTECTED]> Thu, 23 Nov 2006 11:30:27 +0100
+
sqlrelay (1:0.37.1-3) unstable; urgency=low
* Remove java-gcj-compat-dev build dependency for arm.
only in patch2:
unchanged:
--- sqlrelay-0.37.1.orig/debian/php5-sqlrelay.install
+++ sqlrelay-0.37.1/debian/php5-sqlrelay.install
@@ -0,0 +1,2 @@
+usr/lib/php5/*
+usr/share/pear/DB/sqlrelay.php usr/share/doc/php5-sqlrelay/
