bk commit into 5.0 tree (mtaylor:1.2444)

[Monty Taylor]

Below is the list of changes that have just been committed into a local
5.0 repository of mtaylor. When mtaylor does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-07 21:52:46-07:00, mtaylor@qualinost.(none) +2 -0
  Couple of typo fixes. 

  debian/control.in@stripped, 2007-05-07 21:52:42-07:00, mtaylor@qualinost.(none) +3 -3
    Fixed depends on libmysqlclient15 instead of libmysqlclient15off

  debian/rules@stripped, 2007-05-07 21:52:42-07:00, mtaylor@qualinost.(none) +1 -1
    Fixed a hard-version number instead of a variable ref.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mtaylor
# Host:	qualinost.(none)
# Root:	/home/mtaylor/src/mysql/mysql-5.0-debian

--- 1.5/debian/control.in	2007-05-07 21:52:55 -07:00
+++ 1.6/debian/control.in	2007-05-07 21:52:55 -07:00
@@ -34,7 +34,7 @@
 Package: libmysqlclient@SHARED_LIB_MAJOR_VERSION@-dev
 Architecture: any
 Section: libdevel
-Depends: libmysqlclient@SHARED_LIB_MAJOR_VERSION@ (>= ${Source-Version}), zlib1g-dev, ${shlibs:Depends}
+Depends: libmysqlclient@SHARED_LIB_MAJOR_VERSION@off (>= ${Source-Version}), zlib1g-dev, ${shlibs:Depends}
 Conflicts: libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev
 Provides: libmysqlclient-dev
 Description: mysql database development files
@@ -61,7 +61,7 @@
 Package: libndbclient@NDB_SHARED_LIB_MAJOR_VERSION@
 Section: libs
 Architecture: any
-Depends: mysql-common (>= ${Source-Version}), libmysqlclient@SHARED_LIB_MAJOR_VERSION@, ${shlibs:Depends}
+Depends: mysql-common (>= ${Source-Version}), libmysqlclient@SHARED_LIB_MAJOR_VERSION@off, ${shlibs:Depends}
 Description: mysql cluster NdbApi library
  The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
  and robust SQL (Structured Query Language) database server. MySQL Server
@@ -138,7 +138,7 @@
 
 Package: mysql-client-@MYSQL_BRANDED_BASE_VERSION@
 Architecture: any
-Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mysql-common (>= ${Source-Version}), libmysqlclient@SHARED_LIB_MAJOR_VERSION@ (>= ${Source-Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mysql-common (>= ${Source-Version}), libmysqlclient@SHARED_LIB_MAJOR_VERSION@off (>= ${Source-Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Provides: virtual-mysql-client, mysql-client, mysql-client-@MYSQL_BRANDED_PREVIOUS_BASE_VERSION@
 Conflicts: mysql-client (<< ${Source-Version}), mysql-client-@MYSQL_BRANDED_PREVIOUS_BASE_VERSION@
 Replaces: mysql-client (<< ${Source-Version}), mysql-server, mysql-client-@MYSQL_BRANDED_PREVIOUS_BASE_VERSION@

--- 1.5/debian/rules	2007-05-07 21:52:55 -07:00
+++ 1.6/debian/rules	2007-05-07 21:52:55 -07:00
@@ -387,7 +387,7 @@
 	dh_fixperms -a
 	dh_makeshlibs -a
 	dh_makeshlibs -plibmysqlclient$(SHARED_LIB_MAJOR_VERSION) -V"libmysqlclient$(SHARED_LIB_MAJOR_VERSION) (>= $(PKGVERSION))"
-	dh_makeshlibs -plibndbclient$(NDB_SHARED_LIB_MAJOR_VERSION) -V"libndbclient2 (>= $(PKGVERSION))"
+	dh_makeshlibs -plibndbclient$(NDB_SHARED_LIB_MAJOR_VERSION) -V"libndbclient$(NDB_SHARED_LIB_MAJOR_VERSION) (>= $(PKGVERSION))"
 	dh_installdeb -a
 	dh_perl -a
 	dh_shlibdeps -a -l debian/libmysqlclient$(SHARED_LIB_MAJOR_VERSION)/usr/lib -L libmysqlclient$(SHARED_LIB_MAJOR_VERSION)