Fix two .deb problems causing build/install failures in Buildbot.

debian/autobake-deb.sh

@@ -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.
 #

debian/dist/Debian/control

@@ -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,

debian/dist/Ubuntu/control

@@ -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,