[Commits] Rev 3233: Fix two .deb problems causing build/install failures in Buildbot. in http://bazaar.launchpad.net/~maria-captains/maria/5.5

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Tue Jan 24 11:47:57 EET 2012


At http://bazaar.launchpad.net/~maria-captains/maria/5.5

------------------------------------------------------------
revno: 3233
revision-id: knielsen at knielsen-hq.org-20120124094757-de1zyppcl66mj6aw
parent: wlad at montyprogram.com-20120123161225-wk0lbksury143n5x
committer: knielsen at knielsen-hq.org
branch nick: mariadb-5.5
timestamp: Tue 2012-01-24 10:47:57 +0100
message:
  Fix two .deb problems causing build/install failures in Buildbot.
=== modified file 'debian/autobake-deb.sh'
--- a/debian/autobake-deb.sh	2012-01-23 11:20:16 +0000
+++ b/debian/autobake-deb.sh	2012-01-24 09:47:57 +0000
@@ -61,9 +61,9 @@ done;
 #
 echo "Incrementing changelog and starting build scripts"
 
-dch -b -D ${CODENAME} -v "${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}~${CODENAME}" "Automatic build with ${LOGSTRING}."
+dch -b -D ${CODENAME} -v "${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME}" "Automatic build with ${LOGSTRING}."
 
-echo "Creating package version ${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}~${CODENAME} ... "
+echo "Creating package version ${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME} ... "
 
 # Build the package.
 #

=== modified file 'debian/dist/Debian/control'
--- a/debian/dist/Debian/control	2012-01-23 11:20:16 +0000
+++ b/debian/dist/Debian/control	2012-01-24 09:47:57 +0000
@@ -89,12 +89,14 @@ Package: mariadb-client-core-5.5
 Architecture: any
 Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5
-Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, mysql-client-5.5,
+Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0,
+    mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}),
     mysql-client-core-5.1, mysql-client-core-5.5,
     mariadb-client-5.1, mariadb-client-core-5.1,
     mariadb-client-5.2, mariadb-client-core-5.2,
     mariadb-client-5.3, mariadb-client-core-5.3
-Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, mysql-client-5.5,
+Replaces: mysql-client (<< 5.0.51), mysql-client-5.0,
+    mysql-client-5.1, mysql-client-5.5,
     mysql-client-core-5.1, mysql-client-core-5.5,
     mariadb-client-5.1, mariadb-client-core-5.1,
     mariadb-client-5.2, mariadb-client-core-5.2,

=== modified file 'debian/dist/Ubuntu/control'
--- a/debian/dist/Ubuntu/control	2012-01-23 11:20:16 +0000
+++ b/debian/dist/Ubuntu/control	2012-01-24 09:47:57 +0000
@@ -89,12 +89,14 @@ Package: mariadb-client-core-5.5
 Architecture: any
 Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5
-Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, mysql-client-5.5,
+Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0,
+    mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}),
     mysql-client-core-5.1, mysql-client-core-5.5,
     mariadb-client-5.1, mariadb-client-core-5.1,
     mariadb-client-5.2, mariadb-client-core-5.2,
     mariadb-client-5.3, mariadb-client-core-5.3
-Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, mysql-client-5.5,
+Replaces: mysql-client (<< 5.0.51), mysql-client-5.0,
+    mysql-client-5.1, mysql-client-5.5,
     mysql-client-core-5.1, mysql-client-core-5.5,
     mariadb-client-5.1, mariadb-client-core-5.1,
     mariadb-client-5.2, mariadb-client-core-5.2,



More information about the commits mailing list