BUG#27769 - MySQL should include debian packaging dir

Replaced hardcoded sover reference with variable.
Removed references to added manpages.
---
BUG#27769 
Cleaned up some things to make building the packages go a little smoother. 
---
debian/rules really does need to be called from the source root.
---
Fixed two problems with the build caused by adding debian to the source tree
---
Left off the debian/ prefix to the Makefile filter.
---
BUG#27769 - MySQL should include debian packaging dir
Changed substitution variables to match already existing autoconf vars.
Generate debian/control and debian/defs.mk from autoconf now, since we run that
to make a source package. 
---
Corrected incorrect variable name
---
Renamed template files to have shorter names. 
---
Moved generation of debian/control to dist-hook so make clean won't eat it.
---
A few final changes to make debs build from a source tarball dist. 


debian/libmysqlclientSLIB-dev.README.Maintainer.in:
  Rename: debian/libmysqlclientMYSOVER-dev.README.Maintainer.in -> debian/libmysqlclientSLIB-dev.README.Maintainer.in
debian/libmysqlclientSLIB-dev.dirs.in:
  Rename: debian/libmysqlclientMYSOVER-dev.dirs.in -> debian/libmysqlclientSLIB-dev.dirs.in
debian/libmysqlclientSLIB-dev.docs.in:
  Rename: debian/libmysqlclientMYSOVER-dev.docs.in -> debian/libmysqlclientSLIB-dev.docs.in
debian/libmysqlclientSLIB-dev.examples.in:
  Rename: debian/libmysqlclientMYSOVER-dev.examples.in -> debian/libmysqlclientSLIB-dev.examples.in
debian/libmysqlclientSLIB-dev.files.in:
  Rename: debian/libmysqlclientMYSOVER-dev.files.in -> debian/libmysqlclientSLIB-dev.files.in
debian/libmysqlclientSLIB-dev.links.in:
  Rename: debian/libmysqlclientMYSOVER-dev.links.in -> debian/libmysqlclientSLIB-dev.links.in
debian/libmysqlclientSLIB.README.Debian.in:
  Rename: debian/libmysqlclientMYSOVER.README.Debian.in -> debian/libmysqlclientSLIB.README.Debian.in
debian/libmysqlclientSLIB.dirs.in:
  Rename: debian/libmysqlclientMYSOVER.dirs.in -> debian/libmysqlclientSLIB.dirs.in
debian/libmysqlclientSLIB.docs.in:
  Rename: debian/libmysqlclientMYSOVER.docs.in -> debian/libmysqlclientSLIB.docs.in
debian/libmysqlclientSLIB.files.in:
  Rename: debian/libmysqlclientMYSOVER.files.in -> debian/libmysqlclientSLIB.files.in
debian/libmysqlclientSLIB.postinst.in:
  Rename: debian/libmysqlclientMYSOVER.postinst.in -> debian/libmysqlclientSLIB.postinst.in
debian/libndbclientNLIB-dev.dirs.in:
  Rename: debian/libndbclientNDBSOVER-dev.dirs.in -> debian/libndbclientNLIB-dev.dirs.in
debian/libndbclientNLIB-dev.files.in:
  Rename: debian/libndbclientNDBSOVER-dev.files.in -> debian/libndbclientNLIB-dev.files.in
debian/libndbclientNLIB-dev.links.in:
  Rename: debian/libndbclientNDBSOVER-dev.links.in -> debian/libndbclientNLIB-dev.links.in
debian/libndbclientNLIB.README.Debian.in:
  Rename: debian/libndbclientNDBSOVER.README.Debian.in -> debian/libndbclientNLIB.README.Debian.in
debian/libndbclientNLIB.dirs.in:
  Rename: debian/libndbclientNDBSOVER.dirs.in -> debian/libndbclientNLIB.dirs.in
debian/libndbclientNLIB.files.in:
  Rename: debian/libndbclientNDBSOVER.files.in -> debian/libndbclientNLIB.files.in
debian/libndbclientNLIB.postinst.in:
  Rename: debian/libndbclientNDBSOVER.postinst.in -> debian/libndbclientNLIB.postinst.in
debian/mysql-client-BASE.NEWS.in:
  Rename: debian/mysql-client-MYVER.NEWS.in -> debian/mysql-client-BASE.NEWS.in
debian/mysql-client-BASE.README.Debian.in:
  Rename: debian/mysql-client-MYVER.README.Debian.in -> debian/mysql-client-BASE.README.Debian.in
debian/mysql-client-BASE.dirs.in:
  Rename: debian/mysql-client-MYVER.dirs.in -> debian/mysql-client-BASE.dirs.in
debian/mysql-client-BASE.docs.in:
  Rename: debian/mysql-client-MYVER.docs.in -> debian/mysql-client-BASE.docs.in
debian/mysql-extra-BASE.dirs.in:
  Rename: debian/mysql-extra-MYVER.dirs.in -> debian/mysql-extra-BASE.dirs.in
debian/mysql-extra-BASE.files.in:
  Rename: debian/mysql-extra-MYVER.files.in -> debian/mysql-extra-BASE.files.in
debian/mysql-management-BASE.dirs.in:
  Rename: debian/mysql-management-MYVER.dirs.in -> debian/mysql-management-BASE.dirs.in
debian/mysql-management-BASE.files.in:
  Rename: debian/mysql-management-MYVER.files.in -> debian/mysql-management-BASE.files.in
debian/mysql-management-BASE.mysql-management.init.in:
  Rename: debian/mysql-management-MYVER.mysql-management.init.in -> debian/mysql-management-BASE.mysql-management.init.in
debian/mysql-server-BASE.NEWS.in:
  Rename: debian/mysql-server-MYVER.NEWS.in -> debian/mysql-server-BASE.NEWS.in
debian/mysql-server-BASE.README.Debian.in:
  Rename: debian/mysql-server-MYVER.README.Debian.in -> debian/mysql-server-BASE.README.Debian.in
debian/mysql-server-BASE.dirs.in:
  Rename: debian/mysql-server-MYVER.dirs.in -> debian/mysql-server-BASE.dirs.in
debian/mysql-server-BASE.docs.in:
  Rename: debian/mysql-server-MYVER.docs.in -> debian/mysql-server-BASE.docs.in
debian/mysql-server-BASE.links.in:
  Rename: debian/mysql-server-MYVER.links.in -> debian/mysql-server-BASE.links.in
debian/mysql-server-BASE.logcheck.ignore.paranoid.in:
  Rename: debian/mysql-server-MYVER.logcheck.ignore.paranoid.in -> debian/mysql-server-BASE.logcheck.ignore.paranoid.in
debian/mysql-server-BASE.logcheck.ignore.server.in:
  Rename: debian/mysql-server-MYVER.logcheck.ignore.server.in -> debian/mysql-server-BASE.logcheck.ignore.server.in
debian/mysql-server-BASE.logcheck.ignore.workstation.in:
  Rename: debian/mysql-server-MYVER.logcheck.ignore.workstation.in -> debian/mysql-server-BASE.logcheck.ignore.workstation.in
debian/mysql-server-BASE.mysql-server.logrotate.in:
  Rename: debian/mysql-server-MYVER.mysql-server.logrotate.in -> debian/mysql-server-BASE.mysql-server.logrotate.in
debian/mysql-server-BASE.preinst.in:
  Rename: debian/mysql-server-MYVER.preinst.in -> debian/mysql-server-BASE.preinst.in
debian/mysql-server-BASE.prerm.in:
  Rename: debian/mysql-server-MYVER.prerm.in -> debian/mysql-server-BASE.prerm.in
debian/mysql-server-PREV.preinst.in:
  Rename: debian/mysql-server-MYOLDVER.preinst.in -> debian/mysql-server-PREV.preinst.in
debian/mysql-storage-BASE.dirs.in:
  Rename: debian/mysql-storage-MYVER.dirs.in -> debian/mysql-storage-BASE.dirs.in
debian/mysql-storage-BASE.files.in:
  Rename: debian/mysql-storage-MYVER.files.in -> debian/mysql-storage-BASE.files.in
debian/mysql-storage-BASE.mysql-storage.init.in:
  Rename: debian/mysql-storage-MYVER.mysql-storage.init.in -> debian/mysql-storage-BASE.mysql-storage.init.in
debian/mysql-test-BASE.dirs.in:
  Rename: debian/mysql-test-MYVER.dirs.in -> debian/mysql-test-BASE.dirs.in
debian/mysql-test-BASE.files.in:
  Rename: debian/mysql-test-MYVER.files.in -> debian/mysql-test-BASE.files.in
debian/mysql-tools-BASE.dirs.in:
  Rename: debian/mysql-tools-MYVER.dirs.in -> debian/mysql-tools-BASE.dirs.in
debian/mysql-tools-BASE.files.in:
  Rename: debian/mysql-tools-MYVER.files.in -> debian/mysql-tools-BASE.files.in
Makefile.am:
  Moved generation of debian/control to dist-hook so make clean won't eat it.
  ---
  Need to generate the control file in the dist dir - not the source dir.
configure.in:
  Added variables to support the generation of debian/control and debian/defs.mk from configure
  ---
  Moved generation of debian/control to dist-hook so make clean won't eat it.
debian/Makefile.am:
  Distribute the generated control file so that debuild will work naturally.
  ---
  Broke the EXTRA_DIST line into separate lines. 
  Added defs.mk.in
  ---
  Modified debian/Makefile to use the new shorter template file names.
debian/control.in:
  Changed substitution variables to match already existing autoconf vars.
debian/defs.mk.in:
  Changed substitution variables to match already existing autoconf vars.
  Made defs.mk.in generated from template. 
  Persisted variables here. 
  ---
  Corrected incorrect variable name
debian/mysql-client-BASE.files.in:
  Changed substitution variables to match already existing autoconf vars.
debian/mysql-client-BASE.lintian-overrides.in:
  Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.config.in:
  Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.files.in:
  Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.lintian-overrides.in:
  Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.postinst.in:
  Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.postrm.in:
  Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.templates.in:
  Changed substitution variables to match already existing autoconf vars.
debian/po/POTFILES.in.in:
  Changed substitution variables to match already existing autoconf vars.
debian/rules:
  BUG#27769 - MySQL should include debian packaging dir
  Replaced hardcoded sover reference with variable.
  Removed references to added manpages.
  ---
  Prevented the test suite from being run unless requested. 
  ---
  Needed a space between ifneq and (
  ---
  The variable substitution was stepping on the Makefile from automake. 
  ---
  Left off the debian/ prefix to the Makefile filter.
  ---
  Changed substitution variables to match already existing autoconf vars.
  ---
  Save debian/defs.mk from make distclean
debian/source.lintian-overrides.in:
  Changed substitution variables to match already existing autoconf vars.

1 files changed, 48 insertions, 64 deletions

diff --git a/debian/rules b/debian/rules
index 6462580616b..03f85f18160 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,6 @@ export SHELL = /bin/bash
 
 export DH_VERBOSE=1
 
-export VER=5.0
-export OLDVER=4.1
-
 include debian/defs.mk
 
 changelog_values := $(shell dpkg-parsechangelog \
@@ -14,28 +11,18 @@ changelog_values := $(shell dpkg-parsechangelog \
 PKGSOURCE := $(word 1, $(changelog_values))
 PKGVERSION := $(word 2, $(changelog_values))
 PKGDISTRO := $(word 3, $(changelog_values))
-PKGFLAVOR := $(shell echo $(PKGSOURCE) | perl -nle 's/mysql-(.*?)-$(PKGDISTRO).*/$$1/ && print ')
-
-soversions := $(shell  awk -F= '/SHARED_LIB_MAJOR_VERSION=/ {print $$2}' configure.in)
-
-export MYSOVER=$(word 1, $(soversions))
-export NDBSOVER=$(word 2, $(soversions))
+PKGFLAVOR := $(shell echo $(PKGSOURCE) | perl -nle 's/mysql-(.*?)-\d+.*/$$1/ && print ')
 
 ifeq ("x$(MYSQL_FLAVOR)","x")
   export MYSQL_FLAVOR=$(PKGFLAVOR)
 endif
 
-ifeq ("x$(MYSQL_FLAVOR)","x")
-  export MYVER=$(VER)
-  export MYOLDVER=$(OLDVER)
-  export MYSRCVER=$(MYVER)
-else
-  export MYVER=$(MYSQL_FLAVOR)-$(VER)
-  export MYOLDVER=$(MYSQL_FLAVOR)-$(OLDVER)
-  export MYSRCVER=$(MYSQL_FLAVOR)-$(PKGDISTRO)-$(VER)
+ifneq ("x$(MYSQL_FLAVOR)","x")
+  export MYSQL_BASE_VERSION=$(MYSQL_FLAVOR)-$(MYSQL_BASE_VERSION)
+  export MYSQL_PREVIOUS_BASE_VERSION=$(MYSQL_FLAVOR)-$(MYSQL_PREVIOUS_BASE_VERSION)
 endif
 
-PACKAGE=mysql-$(MYVER)
+PACKAGE=mysql-$(MYSQL_BASE_VERSION)
 
 PWD=$(shell pwd)
 TMP=$(PWD)/debian/tmp/
@@ -71,17 +58,19 @@ ifeq ($(STATIC_MYSQLD), 1)
     USE_STATIC_MYSQLD=--with-mysqld-ldflags=-all-static
 endif
 
-
+ifneq ("$(MYSQL_BUILD_TEST)","yes")
+    MYSQL_BUILD_TEST=no
+endif
 
 control-file:
 	@echo "## This file is autogenerated you want to edit control.in instead" > debian/control.tmp
-	sed -e "s/@MYVER@/$(MYVER)/g" \
+	sed -e "s/@MYSQL_BASE_VERSION@/$(MYSQL_BASE_VERSION)/g" \
 	    -e "s/@VER@/$(VER)/g" \
 	    -e "s/@VERSIONSTRING@/$(VERSIONSTRING)/g" \
-	    -e "s/@MYOLDVER@/$(MYOLDVER)/g" \
-	    -e "s/@MYSRCVER@/$(MYSRCVER)/g" \
-	    -e "s/@MYSOVER@/$(MYSOVER)/g" \
-	    -e "s/@NDBSOVER@/$(NDBSOVER)/g" \
+	    -e "s/@MYSQL_PREVIOUS_BASE_VERSION@/$(MYSQL_PREVIOUS_BASE_VERSION)/g" \
+	    -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" \
 		debian/control.in >> debian/control.tmp
 	[ -e debian/control ] \
 	  && cmp -s debian/control debian/control.tmp \
@@ -187,20 +176,19 @@ stamp-control:
 
 	# We have some naming inconsistencies here... 
 	for f in debian/*.in debian/po/POTFILES.in.in ; do \
-            f2=`echo $$f | sed "s,MYVER,$(MYVER),g;\
-                                s,MYSRCVER,$(MYSRCVER),g;\
-                                s,MYOLDVER,$(MYOLDVER),g;\
-                                s,NDBSOVER,$(NDBSOVER),g;\
-                                s,MYSOVER,$(MYSOVER),g;s,\.in$$,,"`; \
-            if [ $$f2 != debian/control ]; then \
-                sed -e "s/@MYVER@/$(MYVER)/g" \
+            f2=`echo $$f | sed "s,BASE,$(MYSQL_BASE_VERSION),g;\
+                                s,PREV,$(MYSQL_PREVIOUS_BASE_VERSION),g;\
+                                s,NLIB,$(NDB_SHARED_LIB_MAJOR_VERSION),g;\
+                                s,SLIB,$(SHARED_LIB_MAJOR_VERSION),g;s,\.in$$,,"`; \
+            if [ $$f2 != debian/control -a $$f2 != debian/Makefile ]; then \
+                sed -e "s/@MYSQL_BASE_VERSION@/$(MYSQL_BASE_VERSION)/g" \
 		    -e "s/@VERSIONSTRING@/$(VERSIONSTRING)/g" \
 		    -e "s/@VER@/$(VER)/g" \
                     -e "s/@PRIORITY@/$(PRIORITY)/g" \
-		    -e "s/@MYOLDVER@/$(MYOLDVER)/g" \
-		    -e "s/@MYSRCVER@/$(MYSRCVER)/g" \
-		    -e "s/@MYSOVER@/$(MYSOVER)/g" \
-		    -e "s/@NDBSOVER@/$(NDBSOVER)/g" \
+		    -e "s/@MYSQL_PREVIOUS_BASE_VERSION@/$(MYSQL_PREVIOUS_BASE_VERSION)/g" \
+		    -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,@SCRIPTDIR@,/$(scriptdir),g" \
                     -e "s,@INFO@,$(findstring info, $(doc_dependencies)),g" \
                   <$$f >$$f2; \
@@ -212,7 +200,7 @@ stamp-control:
 # files somewhere else.
 clean: configure.in Makefile.am control-file
 
-	rm -f debian/mysql-server-$(MYVER).mysql.init
+	rm -f debian/mysql-server-$(MYSQL_BASE_VERSION).mysql.init
 
 	# We depend on this later, and delete the results in the mean time
 	$(MAKE) -f debian/rules stamp-control
@@ -221,23 +209,26 @@ clean: configure.in Makefile.am control-file
 	rm -f configure-stamp
 	rm -f build-stamp
 
+	cp debian/defs.mk debian/defs.mk.sav
 	-make distclean
+	cp debian/defs.mk.sav debian/defs.mk
 
 	debconf-updatepo
 
 	for f in debian/*.in; do \
-            f2=`echo $$f | sed "s,MYVER,$(MYVER),g;\
-                                s,MYOLDVER,$(MYOLDVER),g;\
-                                s,MYSRCVER,$(MYSRCVER),g;\
-                                s,NDBSOVER,$(NDBSOVER),g;\
-                                s,MYSOVER,$(MYSOVER),g;s,\.in$$,,"`; \
-            if [ $$f2 != debian/control ]; then \
+            f2=`echo $$f | sed "s,MYSQL_BASE_VERSION,$(MYSQL_BASE_VERSION),g;\
+                                s,MYSQL_PREVIOUS_BASE_VERSION,$(MYSQL_PREVIOUS_BASE_VERSION),g;\
+                                s,MYSQL_SOURCE_BASE_VERSION,$(MYSQL_SOURCE_BASE_VERSION),g;\
+                                s,NDB_SHARED_LIB_MAJOR_VERSION,$(NDB_SHARED_LIB_MAJOR_VERSION),g;\
+                                s,SHARED_LIB_MAJOR_VERSION,$(SHARED_LIB_MAJOR_VERSION),g;s,\.in$$,,"`; \
+            if [ $$f2 != debian/control -a $$f2 != debian/Makefile -a $$f2 != debian/defs.mk ]; then \
 		rm -f $$f2; \
             fi; \
         done
 	rm -f po/POTFILES.in
 
 	dh_clean -v
+	
 
 
 install:
@@ -250,21 +241,14 @@ install: build stamp-control
 
 	# Sort of hackish way to make sure we have a init script 
 	# for dh_installinit
-	cp support-files/mysql.server debian/mysql-server-$(MYVER).mysql.init
+	cp support-files/mysql.server debian/mysql-server-$(MYSQL_BASE_VERSION).mysql.init
 
-	# some self written manpages which hopefully
-	# gets overwritten sooner or later with upstreams
-	mkdir -p $(TMP)/usr/share/man/man1/
-	mkdir -p $(TMP)/usr/share/man/man8/
 	mkdir -p $(TMP)/usr/lib/mysql/mysqld.sym
-	cp debian/additions/*.1 $(TMP)/usr/share/man/man1/
-	ln -s mysqlmanager.1 $(TMP)/usr/share/man/man1/mysqlmanager-pwgen.1
-	ln -s mysqlmanager.1 $(TMP)/usr/share/man/man1/mysqlmanagerc.1
 	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
+	#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)/
 
@@ -285,11 +269,11 @@ install: build stamp-control
 	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.15.0.0 | grep -c libmysqlclient_15`" -lt 500 ]; then \
+	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.2.0.0 | grep -c libndbclient_2`" -lt 500 ]; then \
+	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
@@ -306,8 +290,8 @@ install: build stamp-control
 
 	# mysql-server
 	install -m 0755 scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe
-	mkdir -p $(TMP)/usr/share/doc/mysql-server-$(MYVER)/examples
-	mv $(TMP)/usr/share/mysql/*cnf 	    $(TMP)/usr/share/doc/mysql-server-$(MYVER)/examples/
+	mkdir -p $(TMP)/usr/share/doc/mysql-server-$(MYSQL_BASE_VERSION)/examples
+	mv $(TMP)/usr/share/mysql/*cnf 	    $(TMP)/usr/share/doc/mysql-server-$(MYSQL_BASE_VERSION)/examples/
 	rm -vf $(TMP)/usr/share/mysql/mi_test_all* \
 	       $(TMP)/usr/share/mysql/mysql-log-rotate \
 	       $(TMP)/usr/share/mysql/mysql.server \
@@ -319,14 +303,14 @@ install: build stamp-control
 	cp -a sql-bench $(TMP)/usr/share/mysql/
 	# lintian overrides
 	mkdir -p $(TMP)/usr/share/lintian/overrides/
-	cp debian/mysql-server-$(MYVER).lintian-overrides $(TMP)/usr/share/lintian/overrides/mysql-server-$(MYVER)
-	cp debian/mysql-client-$(MYVER).lintian-overrides $(TMP)/usr/share/lintian/overrides/mysql-client-$(MYVER)
+	cp debian/mysql-server-$(MYSQL_BASE_VERSION).lintian-overrides $(TMP)/usr/share/lintian/overrides/mysql-server-$(MYSQL_BASE_VERSION)
+	cp debian/mysql-client-$(MYSQL_BASE_VERSION).lintian-overrides $(TMP)/usr/share/lintian/overrides/mysql-client-$(MYSQL_BASE_VERSION)
 
 	# For 4.1 -> 5.0 transition
 	d=$(TMP)/usr/share/mysql-common/internal-use-only/; \
 	mkdir -p $$d; \
-	cp debian/mysql-server-$(MYVER).mysql.init $$d/_etc_init.d_mysql; \
-	cp debian/mysql-server-$(MYVER).mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \
+	cp debian/mysql-server-$(MYSQL_BASE_VERSION).mysql.init $$d/_etc_init.d_mysql; \
+	cp debian/mysql-server-$(MYSQL_BASE_VERSION).mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \
 
 	dh_movefiles
 
@@ -381,12 +365,12 @@ binary-arch: build install
 	dh_compress -a
 	dh_fixperms -a
 	dh_makeshlibs -a
-	dh_makeshlibs -plibmysqlclient$(MYSOVER) -V"libmysqlclient$(MYSOVER) (>= $(PKGVERSION))"
-	dh_makeshlibs -plibndbclient$(NDBSOVER) -V"libndbclient2 (>= $(PKGVERSION))"
+	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_installdeb -a
 	dh_perl -a
-	dh_shlibdeps -a -l debian/libmysqlclient$(MYSOVER)/usr/lib -L libmysqlclient$(MYSOVER)
-	dh_shlibdeps -a -l debian/libndbclient$(NDBSOVER)/usr/lib -L libndbclient$(NDBSOVER)
+	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_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a