bk commit into 5.0 tree (df:1.2458)

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
5.0 repository of df. When df 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-02 18:53:56+02:00, df@stripped +2 -0
  start separating product flavours

  debian/control.in@stripped, 2007-05-02 18:53:54+02:00, df@stripped +24 -17
    add build flavour into package names and add Provides lines

  debian/control.in@stripped, 2007-04-24 19:50:55+02:00, df@stripped +0 -0
    Rename: debian/control.in.in -> debian/control.in

  debian/control.in.in@stripped, 2007-04-24 19:40:24+02:00, df@stripped +0 -0
    Rename: debian/control.in -> debian/control.in.in

  debian/rules@stripped, 2007-05-02 18:53:54+02:00, df@stripped +73 -33
    start separating builds for different products

# 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:	df
# Host:	pippilotta.erinye.com
# Root:	/shared/home/df/mysql/build/mysql-5.0-build-work-debian

--- 1.5/debian/control.in	2007-04-20 03:49:43 +02:00
+++ 1.8/debian/control.in	2007-05-02 18:53:54 +02:00
@@ -6,10 +6,11 @@
 Build-Depends: libtool (>= 1.4.2-7), g++ (>= 4:3.3.5-3), procps | hurd,  debhelper
(>= 4.1.16), file (>= 3.28-1), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0),
libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline5-dev |
libreadline-dev, psmisc, po-debconf, chrpath, automake1.8, doxygen, gs, dpatch, gawk,
bison
 Standards-Version: 3.7.2
 
-Package: libmysqlclient@SHARED_LIB_MAJOR_VERSION@off
+Package: libmysqlclient@SHARED_LIB_MAJOR_VERSION@@MYSQL_FLAVOR@off
 Section: libs
 Architecture: any
-Depends: mysql-common (>= ${Source-Version}), ${shlibs:Depends}
+Depends: mysql-common-@MYSQL_BRANDED_BASE_VERSION@ (>= ${Source-Version}),
${shlibs:Depends}
+Provides: libmysqlclient@SHARED_LIB_MAJOR_VERSION@off
 Description: mysql database client library
  The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
  and robust SQL (Structured Query Language) database server. MySQL Server
@@ -31,12 +32,12 @@
  This package contains the shared libraries (*.so*) which certain
  languages and applications need to dynamically load and use MySQL.
 
-Package: libmysqlclient@SHARED_LIB_MAJOR_VERSION@-dev
+Package: libmysqlclient@SHARED_LIB_MAJOR_VERSION@@MYSQL_FLAVOR@-dev
 Architecture: any
 Section: libdevel
-Depends: libmysqlclient@SHARED_LIB_MAJOR_VERSION@ (>= ${Source-Version}), zlib1g-dev,
${shlibs:Depends}
+Depends: libmysqlclient@SHARED_LIB_MAJOR_VERSION@@MYSQL_FLAVOR@off (>=
${Source-Version}), zlib1g-dev, ${shlibs:Depends}
 Conflicts: libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev
-Provides: libmysqlclient-dev
+Provides: libmysqlclient@SHARED_LIB_MAJOR_VERSION@-dev libmysqlclient-dev
 Description: mysql database development files
  The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
  and robust SQL (Structured Query Language) database server. MySQL Server
@@ -58,10 +59,12 @@
  This package contains the development header files and libraries
  necessary to develop MySQL client applications.
 
-Package: libndbclient@NDB_SHARED_LIB_MAJOR_VERSION@
+#IFCLUSTER
+Package: libndbclient@NDB_SHARED_LIB_MAJOR_VERSION@@MYSQL_FLAVOR@off
 Section: libs
 Architecture: any
-Depends: mysql-common (>= ${Source-Version}),
libmysqlclient@SHARED_LIB_MAJOR_VERSION@, ${shlibs:Depends}
+Depends: mysql-common-@MYSQL_BRANDED_BASE_VERSION@ (>= ${Source-Version}),
libmysqlclient@SHARED_LIB_MAJOR_VERSION@@MYSQL_FLAVOR@off, ${shlibs:Depends}
+Provides: libndbclient@NDB_SHARED_LIB_MAJOR_VERSION@off
 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
@@ -83,11 +86,11 @@
  This package contains the shared libraries (*.so*) which certain
  languages and applications need to dynamically load and use MySQL NdbApi.
 
-Package: libndbclient@NDB_SHARED_LIB_MAJOR_VERSION@-dev
+Package: libndbclient@NDB_SHARED_LIB_MAJOR_VERSION@@MYSQL_FLAVOR@-dev
 Architecture: any
 Section: libdevel
-Depends: libndbclient@NDB_SHARED_LIB_MAJOR_VERSION@ (>= ${Source-Version}),
zlib1g-dev, ${shlibs:Depends}
-Provides: libndbclient-dev
+Depends: libndbclient@NDB_SHARED_LIB_MAJOR_VERSION@@MYSQL_FLAVOR@off (>=
${Source-Version}), zlib1g-dev, ${shlibs:Depends}
+Provides: libndbclient-dev libndbclient@NDB_SHARED_LIB_MAJOR_VERSION@-dev
 Description: mysql cluster NdbApi development files
  The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
  and robust SQL (Structured Query Language) database server. MySQL Server
@@ -108,8 +111,9 @@
  .
  This package contains the development header files and libraries
  necessary to develop NdbApi client applications.
+#ENDIFCLUSTER
 
-Package: mysql-common
+Package: mysql-common-@MYSQL_BRANDED_BASE_VERSION@
 Section: misc
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -138,7 +142,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-@MYSQL_BRANDED_BASE_VERSION@ (>= ${Source-Version}),
libmysqlclient@SHARED_LIB_MAJOR_VERSION@@MYSQL_FLAVOR@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@
@@ -166,7 +170,7 @@
 Architecture: any                                                               
 Suggests: tinyca
 Recommends: mailx
-Pre-Depends: mysql-common (>= ${Source-Version}), adduser (>= 3.40)
+Pre-Depends: mysql-common-@MYSQL_BRANDED_BASE_VERSION@ (>= ${Source-Version}), adduser
(>= 3.40)
 Depends: mysql-client-@MYSQL_BRANDED_BASE_VERSION@ (>= ${Source-Version}),
libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd,
lsb-base (>= 3.0-10)
 Conflicts: mysql-server (<< ${Source-Version}),
mysql-server-@MYSQL_BRANDED_PREVIOUS_BASE_VERSION@ (<< 5.0.26-3)
 Provides: mysql-server, virtual-mysql-server,
mysql-server-@MYSQL_BRANDED_PREVIOUS_BASE_VERSION@
@@ -197,7 +201,7 @@
 
 Package: mysql-test-@MYSQL_BRANDED_BASE_VERSION@
 Architecture: any                                                               
-Pre-Depends: mysql-common (>= ${Source-Version})
+Pre-Depends: mysql-common-@MYSQL_BRANDED_BASE_VERSION@ (>= ${Source-Version})
 Depends: mysql-client-@MYSQL_BRANDED_BASE_VERSION@ (>= ${Source-Version}),
libdbd-mysql-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}
 Description: MySQL - test suite
  The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
@@ -219,6 +223,7 @@
  . 
  This package contains the MySQL regression test suite.
 
+#IFCLUSTER
 Package: mysql-storage-@MYSQL_BRANDED_BASE_VERSION@
 Architecture: any                                                               
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -319,7 +324,7 @@
  the advanced user.  
  .
  They should be used with caution
-
+#ENDIFCLUSTER
 
 Package: mysql-server-@MYSQL_BRANDED_PREVIOUS_BASE_VERSION@
 Architecture: any                                                               
@@ -334,18 +339,20 @@
  .
  This is an empty transitional package and can safely be removed.
 
-Package: mysql-server
+Package: mysql-server-@MYSQL_FLAVOR@
 Architecture: all
 Depends: mysql-server-@MYSQL_BRANDED_BASE_VERSION@
+Provides: mysql-server
 Description: mysql database server (meta package depending on the latest version)
  This is an empty package that depends on the current "best" version of
  mysql-server (currently mysql-server-@MYSQL_BRANDED_BASE_VERSION@), as determined by the
MySQL
  maintainers.  Install this package if in doubt about which MySQL version
  you want, as this is the one we consider to be in the best shape.
 
-Package: mysql-client
+Package: mysql-client-@MYSQL_FLAVOR@
 Architecture: all
 Depends: mysql-client-@MYSQL_BRANDED_BASE_VERSION@
+Provides: mysql-server
 Description: mysql database client (meta package depending on the latest version)
  This is an empty package that depends on the current "best" version of
  mysql-client (currently mysql-client-@MYSQL_BRANDED_BASE_VERSION@), as determined by the
MySQL

--- 1.5/debian/rules	2007-04-19 23:42:47 +02:00
+++ 1.6/debian/rules	2007-05-02 18:53:54 +02:00
@@ -80,7 +80,15 @@
 	    -e "s/@MYSQL_SOURCE_BASE_VERSION@/$(MYSQL_SOURCE_BASE_VERSION)/g" \
 	    -e "s/@SHARED_LIB_MAJOR_VERSION@/$(SHARED_LIB_MAJOR_VERSION)/g" \
 	    -e "s/@NDB_SHARED_LIB_MAJOR_VERSION@/$(NDB_SHARED_LIB_MAJOR_VERSION)/g" \
+	    -e "s/@MYSQL_FLAVOR@/$(MYSQL_FLAVOR)/g" \
 		debian/control.in >> debian/control.tmp
+
+	if [ x"$(CLUSTER_BUILD)" == x"no" ] ; then \
+	  sed -i '/^#IFCLUSTER/,/^#ENDIFCLUSTER/d' debian/control.tmp ; \
+	else \
+	  sed -i '/^#.*IFCLUSTER/d' debian/control.tmp ; \
+	fi
+
 	[ -e debian/control ] \
 	  && cmp -s debian/control debian/control.tmp \
 	  && rm -f debian/control.tmp && exit 0; \
@@ -101,12 +109,9 @@
 
 	@cp debian/control debian/control.sav
 	( \
-	CC="$(MYSQL_BUILD_CC)"  \
-	CXX="$(MYSQL_BUILD_CXX)" \
-	BUILD_OPTS="${MYSQL_BUILD_OPTS:-''}"  \
-	CFLAGS="${MYSQL_BUILD_CFLAGS:-'-DBIG_JOINS=1 -O2'}" \
-	CXXFLAGS="${MYSQL_BUILD_CXXFLAGS:-'-DBIG_JOINS=1 -felide-constructors -fno-rtti -O2'}" \
-	./configure \
+	\
+	if [ x"$(MYSQL_RELEASE_BUILD)" != x"yes" ] ; then \
+	export CONFIGURE_OPTIONS="\
 		--build=${DEB_BUILD_GNU_TYPE} \
 		--host=${DEB_HOST_GNU_TYPE} \
 		\
@@ -119,8 +124,8 @@
 	        --infodir=/usr/share/info \
 	        --mandir=/usr/share/man \
 		\
-		--with-comment="MySQL Server (custom build)" \
-		--with-server-suffix="-custom" \
+		--with-comment='MySQL Server (unofficial)' \
+		--with-server-suffix='-custom' \
 		\
 		--enable-shared \
 		--enable-thread-safe-client \
@@ -150,7 +155,24 @@
 		--without-ndb-sci \
 		--without-ndb-test \
 		--with-ndb-docs \
-		$(MYSQL_BUILD_OPTS) \
+	"; \
+	else \
+	  export CONFIGURE_OPTIONS="\
+		--build=${DEB_BUILD_GNU_TYPE} \
+		--host=${DEB_HOST_GNU_TYPE} \
+	  "; \
+	fi ; \
+	export CC="$(MYSQL_BUILD_CC)"  ; \
+	export CXX="$(MYSQL_BUILD_CXX)" ; \
+	export BUILD_OPTS="${MYSQL_BUILD_OPTS:-''}"  l \
+	export CFLAGS="${MYSQL_BUILD_CFLAGS:-'-DBIG_JOINS=1 -O2'}" ; \
+	export CXXFLAGS="${MYSQL_BUILD_CXXFLAGS:-'-DBIG_JOINS=1 -felide-constructors -fno-rtti
-O2'}" ; \
+	echo CONFIGURE $$CONFIGURE_OPTIONS $(MYSQL_BUILD_OPTS) $(MYSQL_BUILD_OPTS_RELEASE) ; \
+	./configure $$CONFIGURE_OPTIONS $(MYSQL_BUILD_OPTS) $(MYSQL_BUILD_OPTS_RELEASE) ; \
+	echo CONFIGURE $$CONFIGURE_OPTIONS $(MYSQL_BUILD_OPTS) $(MYSQL_BUILD_OPTS_DEBUG) ; \
+	mkdir .debug_build ; \
+	cp -pR * .debug_build ; \
+	cd .debug_build && ./configure $$CONFIGURE_OPTIONS $(MYSQL_BUILD_OPTS)
$(MYSQL_BUILD_OPTS_DEBUG) --with-debug=full \
 	)
 
 	@mv debian/control.sav debian/control
@@ -162,6 +184,8 @@
 build-stamp: configure
 	dh_testdir
 
+	cd .debug_build && $(MAKE) $(MAKE_J)
+
 	$(MAKE) $(MAKE_J)
 
 	if [ -f sql/.libs/mysqld ] ; then \
@@ -170,17 +194,21 @@
 		nm --numeric-sort sql/mysqld > sql/mysqld.sym ; \
 	fi
 
+	if [ -f .debug_build/sql/.libs/mysqld ] ; then \
+		cp .debug_build/sql/.libs/mysqld sql/.libs/mysqld-debug ; \
+		nm --numeric-sort sql/.libs/mysqld-debug > sql/mysqld-debug.sym ; \
+	else \
+		cp .debug_build/sql/mysqld sql/mysqld-debug ; \
+		nm --numeric-sort sql/mysqld-debug > sql/mysqld-debug.sym ; \
+	fi
 
 	if [ "${MYSQL_BUILD_TEST}" != "no" ] ; then \
-	  ( cd mysql-test ;\
-	    MTR_BUILD_THREAD=auto ; \
-	    export MTR_BUILD_THREAD ; \
-            perl ./mysql-test-run.pl --force --report-features ; \
-            perl ./mysql-test-run.pl --force --ps-protocol ; \
-            true ) \
+	    if [ -f .tested ] ; then exit 0 ; fi ; \
+	    ( cd .debug_build && make test-bt-debug ) ; \
+            make test-bt ; \
+	    touch .tested ; \
 	fi
 
-
 	touch build-stamp
 
 stamp-control:
@@ -191,8 +219,8 @@
 	for f in debian/*.in debian/po/POTFILES.in.in ; do \
             f2=`echo $$f | sed "s,BASE,$(MYSQL_BRANDED_BASE_VERSION),g;\
                                 s,PREV,$(MYSQL_BRANDED_PREVIOUS_BASE_VERSION),g;\
-                                s,NLIB,$(NDB_SHARED_LIB_MAJOR_VERSION),g;\
-                                s,SLIB,$(SHARED_LIB_MAJOR_VERSION),g;s,\.in$$,,"`; \
+                                s,NLIB,$(NDB_SHARED_LIB_MAJOR_VERSION)$(MYSQL_FLAVOR),g;\
+                               
s,SLIB,$(SHARED_LIB_MAJOR_VERSION)$(MYSQL_FLAVOR),g;s,\.in$$,,"`; \
             if [ $$f2 != debian/control -a $$f2 != debian/Makefile ]; then \
                 sed -e "s/@MYSQL_BASE_VERSION@/$(MYSQL_BASE_VERSION)/g" \
 	    	    -e "s/@MYSQL_BRANDED_BASE_VERSION@/$(MYSQL_BRANDED_BASE_VERSION)/g" \
@@ -203,6 +231,7 @@
 		    -e "s/@MYSQL_SOURCE_BASE_VERSION@/$(MYSQL_SOURCE_BASE_VERSION)/g" \
 		    -e "s/@SHARED_LIB_MAJOR_VERSION@/$(SHARED_LIB_MAJOR_VERSION)/g" \
 		    -e "s/@NDB_SHARED_LIB_MAJOR_VERSION@/$(NDB_SHARED_LIB_MAJOR_VERSION)/g" \
+		    -e "s/@MYSQL_FLAVOR@/$(MYSQL_FLAVOR)/g" \
                     -e "s,@SCRIPTDIR@,/$(scriptdir),g" \
                     -e "s,@INFO@,$(findstring info, $(doc_dependencies)),g" \
                   <$$f >$$f2; \
@@ -220,6 +249,8 @@
 # files somewhere else.
 clean: configure.in Makefile.am control-file
 
+	rm -rf .debug_build
+
 	rm -f debian/mysql-server-$(MYSQL_BRANDED_BASE_VERSION).mysql.init
 
 	# We depend on this later, and delete the results in the mean time
@@ -240,8 +271,8 @@
 	for f in debian/*.in; do \
             f2=`echo $$f | sed "s,BASE,$(MYSQL_BRANDED_BASE_VERSION),g;\
                                 s,PREV,$(MYSQL_BRANDED_PREVIOUS_BASE_VERSION),g;\
-                                s,NLIB,$(NDB_SHARED_LIB_MAJOR_VERSION),g;\
-                                s,SLIB,$(SHARED_LIB_MAJOR_VERSION),g;s,\.in$$,,"`; \
+                                s,NLIB,$(NDB_SHARED_LIB_MAJOR_VERSION)$(MYSQL_FLAVOR),g;\
+                               
s,SLIB,$(SHARED_LIB_MAJOR_VERSION)$(MYSQL_FLAVOR),g;s,\.in$$,,"`; \
             if [ $$f2 != debian/control -a $$f2 != debian/Makefile -a $$f2 !=
debian/defs.mk ]; then \
 		rm -f $$f2; \
             fi; \
@@ -264,14 +295,16 @@
 	# for dh_installinit
 	cp support-files/mysql.server
debian/mysql-server-$(MYSQL_BRANDED_BASE_VERSION).mysql.init
 
-	mkdir -p $(TMP)/usr/lib/mysql/mysqld.sym
-	cp sql/mysqld.sym $(TMP)/usr/lib/mysql/mysqld.sym
-
 	# TODO: need real man pages!
 	#for f in mysql mysqldump mysqlaccess mysqladmin mysqlshow myisam_ftdump myisamlog
myisampack mysql_explain_log mysqld_multi mysqld_safe mysql_fix_privilege_tables
mysql_upgrade mysql_tzinfo_to_sql mysql_zap perror replace safe_mysqld ; do touch
$(TMP)/usr/share/man/man1/$$f.1 ; done
 	#for f in mysqld mysqlmanager ; do touch $(TMP)/usr/share/man/man8/$$f.8 ; done
 	# make install (trailing slash needed for innobase)
 	$(MAKE) install DESTDIR=$(TMP)/
+	
+	# copy debug files
+	mkdir -p $(TMP)/usr/lib/mysql/mysqld.sym
+	cp sql/mysqld{,-debug}.sym $(TMP)/usr/lib/mysql/mysqld.sym
+	cp sql/mysqld-debug $(TMP)/usr/sbin
 
 	# After installing, remove rpath to make lintian happy.
 	set +e; \
@@ -284,19 +317,23 @@
 
 	# libmysqlclient: move shared libraries (but not the rest like libheap.a & co)
 	mv $(TMP)/usr/lib/mysql/libmysqlclient* $(TMP)/usr/lib
-	mv $(TMP)/usr/lib/mysql/libndbclient* $(TMP)/usr/lib
 	perl -pi -e 's#/usr/lib/mysql#/usr/lib#' $(TMP)/usr/lib/libmysqlclient.la
 	perl -pi -e 's#/usr/lib/mysql#/usr/lib#' $(TMP)/usr/lib/libmysqlclient_r.la
-	perl -pi -e 's#/usr/lib/mysql#/usr/lib#' $(TMP)/usr/lib/libndbclient.la
-
+	
 	# Check if our beloved versioned symbols are really there
 	if [ "`objdump -T $(TMP)/usr/lib/libmysqlclient.so.$(SHARED_LIB_MAJOR_VERSION).0.0 |
grep -c libmysqlclient_$(SHARED_LIB_MAJOR_VERSION)`" -lt 500 ]; then \
 	  echo "ERROR: versioned symbols are absent"; \
 	  exit 1; \
 	fi     
-	if [ "`objdump -T $(TMP)/usr/lib/libndbclient.so.$(NDB_SHARED_LIB_MAJOR_VERSION).0.0 |
grep -c libndbclient_$(NDB_SHARED_LIB_MAJOR_VERSION)`" -lt 500 ]; then \
-          echo "ERROR: versioned symbols are absent from libndbclient"; \
-          exit 1; \
+	
+	# move libndbclient if it exists only, and check if its beloved versioned symbols are
also there
+	if [ -f $(TMP)/usr/lib/mysql/libndbclient.la ] ; then \
+	  mv $(TMP)/usr/lib/mysql/libndbclient* $(TMP)/usr/lib ; \
+	  perl -pi -e 's#/usr/lib/mysql#/usr/lib#' $(TMP)/usr/lib/libndbclient.la ; \
+	  if [ "`objdump -T $(TMP)/usr/lib/libndbclient.so.$(NDB_SHARED_LIB_MAJOR_VERSION).0.0 |
grep -c libndbclient_$(NDB_SHARED_LIB_MAJOR_VERSION)`" -lt 500 ]; then \
+            echo "ERROR: versioned symbols are absent from libndbclient"; \
+            exit 1; \
+          fi \
         fi
 
 	# libmysqlclient-dev: forgotten header file since 3.23.25?
@@ -319,7 +356,10 @@
 	       $(TMP)/usr/share/mysql/binary-configure
 
 	# we can't install *.pl into /usr/bin - so we have to rename it.
-	sed "s#filename => 'ndb_size.tmpl#filename => '/usr/share/mysql/ndb_size.tmpl#"
< $(TMP)/usr/bin/ndb_size.pl > $(TMP)/usr/bin/ndb_size
+	if [ -f $(TMP)/usr/bin/ndb_size.pl ] ; then \
+	  sed "s#filename => 'ndb_size.tmpl#filename => '/usr/share/mysql/ndb_size.tmpl#"
< $(TMP)/usr/bin/ndb_size.pl > $(TMP)/usr/bin/ndb_size ; \
+	fi
+
 	cp -a mysql-test $(TMP)/usr/share/mysql/
 	cp -a sql-bench $(TMP)/usr/share/mysql/
 	# lintian overrides
@@ -382,16 +422,16 @@
 	dh_installlogcheck -a
 	dh_installchangelogs -a
 	dh_strip -a
-	dh_link -a	# .so muss nach .so.1.2.3 installier werden!
+	dh_link -a	# .so has to be installed after .so.1.2.3!
 	dh_compress -a
 	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"libndbclient2 (>=
$(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)
-	dh_shlibdeps -a -l debian/libndbclient$(NDB_SHARED_LIB_MAJOR_VERSION)/usr/lib -L
libndbclient$(NDB_SHARED_LIB_MAJOR_VERSION)
+	-dh_shlibdeps -a -l debian/libndbclient$(NDB_SHARED_LIB_MAJOR_VERSION)/usr/lib -L
libndbclient$(NDB_SHARED_LIB_MAJOR_VERSION)
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a