diff --git a/Makefile.am b/Makefile.am
index 28551d52da7..381d1e85526 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,6 +98,7 @@ bin-dist:		all
 
 # Remove BK's "SCCS" subdirectories from source distribution
 # Create initial database files for Windows installations.
+# Create default debian control file for debian packaging needs
 dist-hook:
 	rm -rf `find $(distdir) -type d -name SCCS -print`
 	rm -f  `find $(distdir) -type l -print`
@@ -106,6 +107,7 @@ dist-hook:
 		--basedir=$(top_builddir) \
 		--datadir=$(distdir)/win/data \
 		--srcdir=$(top_srcdir)
+	debian/rules control-file && cp $(top_builddir)/debian/control $(distdir)/debian/control
 
 tags:
 	support-files/build-tags
diff --git a/configure.in b/configure.in
index c508fdfc580..bed74b06bd7 100644
--- a/configure.in
+++ b/configure.in
@@ -32,6 +32,9 @@ MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`
 MYSQL_BASE_VERSION=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|\.[[^.]]*$||"`
 MYSQL_VERSION_ID=`echo $MYSQL_NO_DASH_VERSION. | sed -e 's/[[^0-9.]]//g; s/\./  /g; s/ \([[0-9]]\) / 0\\1 /g; s/ //g'`
 
+# Add previous major version for debian package upgrade path
+MYSQL_PREVIOUS_BASE_VERSION=4.1
+
 # The port should be constant for a LONG time
 MYSQL_TCP_PORT_DEFAULT=3306
 MYSQL_UNIX_ADDR_DEFAULT="/tmp/mysql.sock"
@@ -68,6 +71,7 @@ romanian russian serbian slovak spanish swedish ukrainian"
 AC_SUBST(MYSQL_NO_DASH_VERSION)
 AC_SUBST(MYSQL_BASE_VERSION)
 AC_SUBST(MYSQL_VERSION_ID)
+AC_SUBST(MYSQL_PREVIOUS_BASE_VERSION)
 AC_SUBST(PROTOCOL_VERSION)
 AC_DEFINE_UNQUOTED([PROTOCOL_VERSION], [$PROTOCOL_VERSION],
                    [mysql client protocol version])
@@ -2896,7 +2900,7 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
  cmd-line-utils/libedit/Makefile dnl
  win/Makefile dnl
  zlib/Makefile dnl
- debian/Makefile dnl
+ debian/Makefile debian/defs.mk dnl
  cmd-line-utils/readline/Makefile)
  AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h)
  AC_OUTPUT
diff --git a/debian/Makefile.am b/debian/Makefile.am
index 03abbd09184..665f75253e7 100755
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -14,7 +14,104 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ## Process this file with automake to create Makefile.in
-EXTRA_DIST = mysql-test-MYVER.files.in libndbclientNDBSOVER-dev.files.in mysql-server-MYVER.config.in libndbclientNDBSOVER.README.Debian.in mysql-server-MYVER.postrm.in mysql-server-MYVER.NEWS.in libndbclientNDBSOVER.postinst.in mysql-server-MYVER.links.in libndbclientNDBSOVER.files.in source.lintian-overrides.in mysql-server-MYVER.docs.in libmysqlclientMYSOVER.files.in mysql-server-MYVER.files.in libndbclientNDBSOVER-dev.links.in libmysqlclientMYSOVER.postinst.in mysql-extra-MYVER.dirs.in libmysqlclientMYSOVER-dev.links.in mysql-server-MYVER.dirs.in libmysqlclientMYSOVER-dev.examples.in mysql-client-MYVER.lintian-overrides.in copyright.more libndbclientNDBSOVER-dev.dirs.in mysql-server-MYVER.README.Debian.in libmysqlclientMYSOVER.docs.in compat mysql-test-MYVER.dirs.in libmysqlclientMYSOVER-dev.files.in libmysqlclientMYSOVER.dirs.in mysql-server-MYVER.logcheck.ignore.server.in mysql-storage-MYVER.mysql-storage.init.in libmysqlclientMYSOVER.README.Debian.in mysql-client-MYVER.README.Debian.in Makefile.am mysql-server-MYVER.prerm.in mysql-common.dirs.in defs.mk mysql-server-MYVER.mysql-server.logrotate.in mysql-common.README.Debian.in copyright mysql-storage-MYVER.dirs.in mysql-common.preinst.in mysql-client-MYVER.files.in mysql-server-MYVER.templates.in mysql-tools-MYVER.dirs.in mysql-management-MYVER.mysql-management.init.in watch mysql-common.postrm.in mysql-server-MYVER.preinst.in README.Maintainer mysql-tools-MYVER.files.in mysql-client-MYVER.NEWS.in mysql-server-MYVER.lintian-overrides.in changelog mysql-server-MYVER.logcheck.ignore.paranoid.in mysql-common.files.in mysql-server-MYVER.logcheck.ignore.workstation.in mysql-extra-MYVER.files.in mysql-management-MYVER.files.in mysql-client-MYVER.docs.in libmysqlclientMYSOVER-dev.README.Maintainer.in mysql-storage-MYVER.files.in additions additions/ndb_mgmd.cnf additions/mysql-server.lintian-overrides additions/my.cnf mysql-server-MYVER.postinst.in libndbclientNDBSOVER.dirs.in po po/fr.po po/sv.po po/da.po po/es.po po/ja.po po/tr.po po/nb.po po/POTFILES.in.in po/cs.po po/pt.po po/gl.po po/pt_BR.po po/nl.po po/templates.pot po/de.po po/eu.po po/ro.po po/ru.po po/it.po po/ca.po mysql-client-MYVER.dirs.in control.in libmysqlclientMYSOVER-dev.dirs.in mysql-server-MYOLDVER.preinst.in mysql-server.preinst.in mysql-management-MYVER.dirs.in rules libmysqlclientMYSOVER-dev.docs.in
+EXTRA_DIST =  \
+	mysql-test-BASE.files.in \
+	libndbclientNLIB-dev.files.in \
+	mysql-server-BASE.config.in \
+	libndbclientNLIB.README.Debian.in \
+	mysql-server-BASE.postrm.in \
+	mysql-server-BASE.NEWS.in \
+	libndbclientNLIB.postinst.in \
+	mysql-server-BASE.links.in \
+	libndbclientNLIB.files.in \
+	source.lintian-overrides.in \
+	mysql-server-BASE.docs.in \
+	libmysqlclientSLIB.files.in \
+	mysql-server-BASE.files.in \
+	libndbclientNLIB-dev.links.in \
+	libmysqlclientSLIB.postinst.in \
+	mysql-extra-BASE.dirs.in \
+	libmysqlclientSLIB-dev.links.in \
+	mysql-server-BASE.dirs.in \
+	libmysqlclientSLIB-dev.examples.in \
+	mysql-client-BASE.lintian-overrides.in \
+	copyright.more \
+	libndbclientNLIB-dev.dirs.in \
+	mysql-server-BASE.README.Debian.in \
+	libmysqlclientSLIB.docs.in \
+	compat \
+	mysql-test-BASE.dirs.in \
+	libmysqlclientSLIB-dev.files.in \
+	libmysqlclientSLIB.dirs.in \
+	mysql-server-BASE.logcheck.ignore.server.in \
+	mysql-storage-BASE.mysql-storage.init.in \
+	libmysqlclientSLIB.README.Debian.in \
+	mysql-client-BASE.README.Debian.in \
+	Makefile.am \
+	mysql-server-BASE.prerm.in \
+	mysql-common.dirs.in \
+	defs.mk \
+	defs.mk.in \
+	mysql-server-BASE.mysql-server.logrotate.in \
+	mysql-common.README.Debian.in \
+	copyright \
+	mysql-storage-BASE.dirs.in \
+	mysql-common.preinst.in \
+	mysql-client-BASE.files.in \
+	mysql-server-BASE.templates.in \
+	mysql-tools-BASE.dirs.in \
+	mysql-management-BASE.mysql-management.init.in \
+	watch \
+	mysql-common.postrm.in \
+	mysql-server-BASE.preinst.in \
+	README.Maintainer \
+	mysql-tools-BASE.files.in \
+	mysql-client-BASE.NEWS.in \
+	mysql-server-BASE.lintian-overrides.in \
+	changelog \
+	mysql-server-BASE.logcheck.ignore.paranoid.in \
+	mysql-common.files.in \
+	mysql-server-BASE.logcheck.ignore.workstation.in \
+	mysql-extra-BASE.files.in \
+	mysql-management-BASE.files.in \
+	mysql-client-BASE.docs.in \
+	libmysqlclientSLIB-dev.README.Maintainer.in \
+	mysql-storage-BASE.files.in \
+	additions \
+	additions/ndb_mgmd.cnf \
+	additions/mysql-server.lintian-overrides \
+	additions/my.cnf \
+	mysql-server-BASE.postinst.in \
+	libndbclientNLIB.dirs.in \
+	po \
+	po/fr.po \
+	po/sv.po \
+	po/da.po \
+	po/es.po \
+	po/ja.po \
+	po/tr.po \
+	po/nb.po \
+	po/POTFILES.in.in \
+	po/cs.po \
+	po/pt.po \
+	po/gl.po \
+	po/pt_BR.po \
+	po/nl.po \
+	po/templates.pot \
+	po/de.po \
+	po/eu.po \
+	po/ro.po \
+	po/ru.po \
+	po/it.po \
+	po/ca.po \
+	mysql-client-BASE.dirs.in \
+	control.in \
+	libmysqlclientSLIB-dev.dirs.in \
+	mysql-server-PREV.preinst.in \
+	mysql-server.preinst.in \
+	mysql-management-BASE.dirs.in \
+	rules \
+	libmysqlclientSLIB-dev.docs.in
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
diff --git a/debian/control.in b/debian/control.in
index 305503dcffc..f6ef14de537 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,4 +1,4 @@
-Source: mysql-@MYSRCVER@
+Source: mysql-@MYSQL_BASE_VERSION@
 Section: misc
 Priority: optional
 Maintainer: Monty Taylor <mtaylor@mysql.com>
@@ -6,12 +6,12 @@ Uploaders: Mads Martin Joergensen <mads@mysql.com>, MySQL Build Team <build-priv
 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@MYSOVER@
+Package: libmysqlclient@SHARED_LIB_MAJOR_VERSION@
 Section: libs
 Architecture: any
 Depends: mysql-common (>= ${Source-Version}), ${shlibs:Depends}
-Conflicts: libmysqlclient@MYSOVER@off
-Replaces: libmysqlclient@MYSOVER@off
+Conflicts: libmysqlclient@SHARED_LIB_MAJOR_VERSION@off
+Replaces: 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
@@ -33,10 +33,10 @@ Description: mysql database client library
  This package contains the shared libraries (*.so*) which certain
  languages and applications need to dynamically load and use MySQL.
 
-Package: libmysqlclient@MYSOVER@-dev
+Package: libmysqlclient@SHARED_LIB_MAJOR_VERSION@-dev
 Architecture: any
 Section: libdevel
-Depends: libmysqlclient@MYSOVER@ (>= ${Source-Version}), zlib1g-dev, ${shlibs:Depends}
+Depends: libmysqlclient@SHARED_LIB_MAJOR_VERSION@ (>= ${Source-Version}), zlib1g-dev, ${shlibs:Depends}
 Conflicts: libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev
 Provides: libmysqlclient-dev
 Description: mysql database development files
@@ -60,10 +60,10 @@ Description: mysql database development files
  This package contains the development header files and libraries
  necessary to develop MySQL client applications.
 
-Package: libndbclient@NDBSOVER@
+Package: libndbclient@NDB_SHARED_LIB_MAJOR_VERSION@
 Section: libs
 Architecture: any
-Depends: mysql-common (>= ${Source-Version}), libmysqlclient@MYSOVER@, ${shlibs:Depends}
+Depends: mysql-common (>= ${Source-Version}), libmysqlclient@SHARED_LIB_MAJOR_VERSION@, ${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
@@ -85,10 +85,10 @@ Description: mysql cluster NdbApi library
  This package contains the shared libraries (*.so*) which certain
  languages and applications need to dynamically load and use MySQL NdbApi.
 
-Package: libndbclient@NDBSOVER@-dev
+Package: libndbclient@NDB_SHARED_LIB_MAJOR_VERSION@-dev
 Architecture: any
 Section: libdevel
-Depends: libndbclient@NDBSOVER@ (>= ${Source-Version}), zlib1g-dev, ${shlibs:Depends}
+Depends: libndbclient@NDB_SHARED_LIB_MAJOR_VERSION@ (>= ${Source-Version}), zlib1g-dev, ${shlibs:Depends}
 Provides: libndbclient-dev
 Description: mysql cluster NdbApi development files
  The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
@@ -115,9 +115,9 @@ Package: mysql-common
 Section: misc
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: mysql-common-@MYOLDVER@
-Provides: mysql-common-@MYOLDVER@
-Replaces: mysql-common-@MYOLDVER@
+Conflicts: mysql-common-@MYSQL_PREVIOUS_BASE_VERSION@
+Provides: mysql-common-@MYSQL_PREVIOUS_BASE_VERSION@
+Replaces: mysql-common-@MYSQL_PREVIOUS_BASE_VERSION@
 Description: mysql database common files (e.g. /etc/mysql/my.cnf)
  The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
  and robust SQL (Structured Query Language) database server. MySQL Server
@@ -138,12 +138,12 @@ Description: mysql database common files (e.g. /etc/mysql/my.cnf)
  .
  This package includes files needed by all versions of the client library.
 
-Package: mysql-client-@MYVER@
+Package: mysql-client-@MYSQL_BASE_VERSION@
 Architecture: any
-Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mysql-common (>= ${Source-Version}), libmysqlclient@MYSOVER@ (>= ${Source-Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Provides: virtual-mysql-client, mysql-client, mysql-client-@MYOLDVER@
-Conflicts: mysql-client (<< ${Source-Version}), mysql-client-@MYOLDVER@
-Replaces: mysql-client (<< ${Source-Version}), mysql-server, mysql-client-@MYOLDVER@
+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}
+Provides: virtual-mysql-client, mysql-client, mysql-client-@MYSQL_PREVIOUS_BASE_VERSION@
+Conflicts: mysql-client (<< ${Source-Version}), mysql-client-@MYSQL_PREVIOUS_BASE_VERSION@
+Replaces: mysql-client (<< ${Source-Version}), mysql-server, mysql-client-@MYSQL_PREVIOUS_BASE_VERSION@
 Description: mysql database client binaries
  The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
  and robust SQL (Structured Query Language) database server. MySQL Server
@@ -164,15 +164,15 @@ Description: mysql database client binaries
  .
  This package contains the standard MySQL clients and administration tools. 
 
-Package: mysql-server-@MYVER@
+Package: mysql-server-@MYSQL_BASE_VERSION@
 Architecture: any                                                               
 Suggests: tinyca
 Recommends: mailx
 Pre-Depends: mysql-common (>= ${Source-Version}), adduser (>= 3.40)
-Depends: mysql-client-@MYVER@ (>= ${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-@MYOLDVER@ (<< 5.0.26-3)
-Provides: mysql-server, virtual-mysql-server, mysql-server-@MYOLDVER@
-Replaces: mysql-server (<< ${Source-Version}), mysql-server-@MYOLDVER@
+Depends: mysql-client-@MYSQL_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_PREVIOUS_BASE_VERSION@ (<< 5.0.26-3)
+Provides: mysql-server, virtual-mysql-server, mysql-server-@MYSQL_PREVIOUS_BASE_VERSION@
+Replaces: mysql-server (<< ${Source-Version}), mysql-server-@MYSQL_PREVIOUS_BASE_VERSION@
 Description: mysql database server binaries
  The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
  and robust SQL (Structured Query Language) database server. MySQL Server
@@ -195,12 +195,12 @@ Description: mysql database server binaries
  as related utilities to run and administrate a MySQL server.
  .
  If you want to access and work with the database, you have to install
- package mysql-client-@MYVER@ as well!
+ package mysql-client-@MYSQL_BASE_VERSION@ as well!
 
-Package: mysql-test-@MYVER@
+Package: mysql-test-@MYSQL_BASE_VERSION@
 Architecture: any                                                               
 Pre-Depends: mysql-common (>= ${Source-Version})
-Depends: mysql-client-@MYVER@ (>= ${Source-Version}), libdbd-mysql-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}
+Depends: mysql-client-@MYSQL_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,
  and robust SQL (Structured Query Language) database server. MySQL Server
@@ -221,7 +221,7 @@ Description: MySQL - test suite
  . 
  This package contains the MySQL regression test suite.
 
-Package: mysql-storage-@MYVER@
+Package: mysql-storage-@MYSQL_BASE_VERSION@
 Architecture: any                                                               
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: MySQL - ndbcluster storage engine
@@ -248,7 +248,7 @@ Description: MySQL - ndbcluster storage engine
  Note that this storage engine can only be used in conjunction
  with the MySQL Max server.
 
-Package: mysql-management-@MYVER@
+Package: mysql-management-@MYSQL_BASE_VERSION@
 Architecture: any                                                               
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: MySQL - ndbcluster storage engine management
@@ -273,7 +273,7 @@ Description: MySQL - ndbcluster storage engine management
  It is necessary to have this package installed on at least 
  one computer in the cluster.
 
-Package: mysql-tools-@MYVER@
+Package: mysql-tools-@MYSQL_BASE_VERSION@
 Architecture: any                                                               
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: MySQL - ndbcluster storage engine basic tools
@@ -296,7 +296,7 @@ Description: MySQL - ndbcluster storage engine basic tools
  . 
  This package contains ndbcluster storage engine basic tools.
 
-Package: mysql-extra-@MYVER@
+Package: mysql-extra-@MYSQL_BASE_VERSION@
 Architecture: any                                                               
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: MySQL - ndbcluster storage engine extra tools
@@ -323,11 +323,11 @@ Description: MySQL - ndbcluster storage engine extra tools
  They should be used with caution
 
 
-Package: mysql-server-@MYOLDVER@
+Package: mysql-server-@MYSQL_PREVIOUS_BASE_VERSION@
 Architecture: any                                                               
 Section: oldlibs
 Priority: extra
-Depends: mysql-server-@MYVER@
+Depends: mysql-server-@MYSQL_BASE_VERSION@
 Description: mysql database server (transitional package)
  MySQL is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -338,18 +338,18 @@ Description: mysql database server (transitional package)
 
 Package: mysql-server
 Architecture: all
-Depends: mysql-server-@MYVER@
+Depends: mysql-server-@MYSQL_BASE_VERSION@
 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-@MYVER@), as determined by the MySQL
+ mysql-server (currently mysql-server-@MYSQL_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
 Architecture: all
-Depends: mysql-client-@MYVER@
+Depends: mysql-client-@MYSQL_BASE_VERSION@
 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-@MYVER@), as determined by the MySQL
+ mysql-client (currently mysql-client-@MYSQL_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.
diff --git a/debian/defs.mk b/debian/defs.mk
deleted file mode 100644
index fe1d611f3d6..00000000000
--- a/debian/defs.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-MYSQL_BUILD_OPTS=--with-comment='MySQL Server (custom)' --with-server-suffix='-custom'
-MYSQL_BUILD_CXXFLAGS=-DBIG_JOINS=1 -felide-constructors -fno-rtti -O2
-MYSQL_BUILD_CFLAGS=-DBIG_JOINS=1 -O2
-MYSQL_BUILD_CC=gcc
-MYSQL_BUILD_CXX=gcc
diff --git a/debian/defs.mk.in b/debian/defs.mk.in
new file mode 100644
index 00000000000..7aeb4596a9a
--- /dev/null
+++ b/debian/defs.mk.in
@@ -0,0 +1,12 @@
+MYSQL_BUILD_OPTS=--with-comment='MySQL Server (custom)' --with-server-suffix='-custom'
+MYSQL_BUILD_CXXFLAGS=-DBIG_JOINS=1 -felide-constructors -fno-rtti -O2
+MYSQL_BUILD_CFLAGS=-DBIG_JOINS=1 -O2
+MYSQL_BUILD_CC=gcc
+MYSQL_BUILD_CXX=gcc
+# These two never pick up the flavor when we persist settings
+VER=@MYSQL_BASE_VERSION@
+OLDVER=@MYSQL_PREVIOUS_BASE_VERSION@
+MYSQL_BASE_VERSION=@MYSQL_BASE_VERSION@
+MYSQL_PREVIOUS_BASE_VERSION=@MYSQL_PREVIOUS_BASE_VERSION@
+SHARED_LIB_MAJOR_VERSION=@SHARED_LIB_MAJOR_VERSION@
+NDB_SHARED_LIB_MAJOR_VERSION=@NDB_SHARED_LIB_MAJOR_VERSION@
diff --git a/debian/libmysqlclientMYSOVER-dev.README.Maintainer.in b/debian/libmysqlclientSLIB-dev.README.Maintainer.in
similarity index 100%
rename from debian/libmysqlclientMYSOVER-dev.README.Maintainer.in
rename to debian/libmysqlclientSLIB-dev.README.Maintainer.in
diff --git a/debian/libmysqlclientMYSOVER-dev.dirs.in b/debian/libmysqlclientSLIB-dev.dirs.in
similarity index 100%
rename from debian/libmysqlclientMYSOVER-dev.dirs.in
rename to debian/libmysqlclientSLIB-dev.dirs.in
diff --git a/debian/libmysqlclientMYSOVER-dev.docs.in b/debian/libmysqlclientSLIB-dev.docs.in
similarity index 100%
rename from debian/libmysqlclientMYSOVER-dev.docs.in
rename to debian/libmysqlclientSLIB-dev.docs.in
diff --git a/debian/libmysqlclientMYSOVER-dev.examples.in b/debian/libmysqlclientSLIB-dev.examples.in
similarity index 100%
rename from debian/libmysqlclientMYSOVER-dev.examples.in
rename to debian/libmysqlclientSLIB-dev.examples.in
diff --git a/debian/libmysqlclientMYSOVER-dev.files.in b/debian/libmysqlclientSLIB-dev.files.in
similarity index 100%
rename from debian/libmysqlclientMYSOVER-dev.files.in
rename to debian/libmysqlclientSLIB-dev.files.in
diff --git a/debian/libmysqlclientMYSOVER-dev.links.in b/debian/libmysqlclientSLIB-dev.links.in
similarity index 100%
rename from debian/libmysqlclientMYSOVER-dev.links.in
rename to debian/libmysqlclientSLIB-dev.links.in
diff --git a/debian/libmysqlclientMYSOVER.README.Debian.in b/debian/libmysqlclientSLIB.README.Debian.in
similarity index 100%
rename from debian/libmysqlclientMYSOVER.README.Debian.in
rename to debian/libmysqlclientSLIB.README.Debian.in
diff --git a/debian/libmysqlclientMYSOVER.dirs.in b/debian/libmysqlclientSLIB.dirs.in
similarity index 100%
rename from debian/libmysqlclientMYSOVER.dirs.in
rename to debian/libmysqlclientSLIB.dirs.in
diff --git a/debian/libmysqlclientMYSOVER.docs.in b/debian/libmysqlclientSLIB.docs.in
similarity index 100%
rename from debian/libmysqlclientMYSOVER.docs.in
rename to debian/libmysqlclientSLIB.docs.in
diff --git a/debian/libmysqlclientMYSOVER.files.in b/debian/libmysqlclientSLIB.files.in
similarity index 100%
rename from debian/libmysqlclientMYSOVER.files.in
rename to debian/libmysqlclientSLIB.files.in
diff --git a/debian/libmysqlclientMYSOVER.postinst.in b/debian/libmysqlclientSLIB.postinst.in
similarity index 100%
rename from debian/libmysqlclientMYSOVER.postinst.in
rename to debian/libmysqlclientSLIB.postinst.in
diff --git a/debian/libndbclientNDBSOVER-dev.dirs.in b/debian/libndbclientNLIB-dev.dirs.in
similarity index 100%
rename from debian/libndbclientNDBSOVER-dev.dirs.in
rename to debian/libndbclientNLIB-dev.dirs.in
diff --git a/debian/libndbclientNDBSOVER-dev.files.in b/debian/libndbclientNLIB-dev.files.in
similarity index 100%
rename from debian/libndbclientNDBSOVER-dev.files.in
rename to debian/libndbclientNLIB-dev.files.in
diff --git a/debian/libndbclientNDBSOVER-dev.links.in b/debian/libndbclientNLIB-dev.links.in
similarity index 100%
rename from debian/libndbclientNDBSOVER-dev.links.in
rename to debian/libndbclientNLIB-dev.links.in
diff --git a/debian/libndbclientNDBSOVER.README.Debian.in b/debian/libndbclientNLIB.README.Debian.in
similarity index 100%
rename from debian/libndbclientNDBSOVER.README.Debian.in
rename to debian/libndbclientNLIB.README.Debian.in
diff --git a/debian/libndbclientNDBSOVER.dirs.in b/debian/libndbclientNLIB.dirs.in
similarity index 100%
rename from debian/libndbclientNDBSOVER.dirs.in
rename to debian/libndbclientNLIB.dirs.in
diff --git a/debian/libndbclientNDBSOVER.files.in b/debian/libndbclientNLIB.files.in
similarity index 100%
rename from debian/libndbclientNDBSOVER.files.in
rename to debian/libndbclientNLIB.files.in
diff --git a/debian/libndbclientNDBSOVER.postinst.in b/debian/libndbclientNLIB.postinst.in
similarity index 100%
rename from debian/libndbclientNDBSOVER.postinst.in
rename to debian/libndbclientNLIB.postinst.in
diff --git a/debian/mysql-client-MYVER.NEWS.in b/debian/mysql-client-BASE.NEWS.in
similarity index 100%
rename from debian/mysql-client-MYVER.NEWS.in
rename to debian/mysql-client-BASE.NEWS.in
diff --git a/debian/mysql-client-MYVER.README.Debian.in b/debian/mysql-client-BASE.README.Debian.in
similarity index 100%
rename from debian/mysql-client-MYVER.README.Debian.in
rename to debian/mysql-client-BASE.README.Debian.in
diff --git a/debian/mysql-client-MYVER.dirs.in b/debian/mysql-client-BASE.dirs.in
similarity index 100%
rename from debian/mysql-client-MYVER.dirs.in
rename to debian/mysql-client-BASE.dirs.in
diff --git a/debian/mysql-client-MYVER.docs.in b/debian/mysql-client-BASE.docs.in
similarity index 100%
rename from debian/mysql-client-MYVER.docs.in
rename to debian/mysql-client-BASE.docs.in
diff --git a/debian/mysql-client-MYVER.files.in b/debian/mysql-client-BASE.files.in
similarity index 86%
rename from debian/mysql-client-MYVER.files.in
rename to debian/mysql-client-BASE.files.in
index 15b57817347..bff49a052c5 100644
--- a/debian/mysql-client-MYVER.files.in
+++ b/debian/mysql-client-BASE.files.in
@@ -10,7 +10,7 @@ usr/bin/mysqlcheck
 usr/bin/mysqldump
 usr/bin/mysqlimport
 usr/bin/mysqlshow
-usr/share/lintian/overrides/mysql-client-@MYVER@
+usr/share/lintian/overrides/mysql-client-@MYSQL_BASE_VERSION@
 usr/share/man/man1/mysql.1
 usr/share/man/man1/mysqlaccess.1
 usr/share/man/man1/mysqladmin.1
diff --git a/debian/mysql-client-BASE.lintian-overrides.in b/debian/mysql-client-BASE.lintian-overrides.in
new file mode 100644
index 00000000000..501147bc425
--- /dev/null
+++ b/debian/mysql-client-BASE.lintian-overrides.in
@@ -0,0 +1 @@
+mysql-client-@MYSQL_BASE_VERSION@: package-has-a-duplicate-relation
diff --git a/debian/mysql-client-MYVER.lintian-overrides.in b/debian/mysql-client-MYVER.lintian-overrides.in
deleted file mode 100644
index 85b5592658d..00000000000
--- a/debian/mysql-client-MYVER.lintian-overrides.in
+++ /dev/null
@@ -1 +0,0 @@
-mysql-client-@MYVER@: package-has-a-duplicate-relation
diff --git a/debian/mysql-extra-MYVER.dirs.in b/debian/mysql-extra-BASE.dirs.in
similarity index 100%
rename from debian/mysql-extra-MYVER.dirs.in
rename to debian/mysql-extra-BASE.dirs.in
diff --git a/debian/mysql-extra-MYVER.files.in b/debian/mysql-extra-BASE.files.in
similarity index 100%
rename from debian/mysql-extra-MYVER.files.in
rename to debian/mysql-extra-BASE.files.in
diff --git a/debian/mysql-management-MYVER.dirs.in b/debian/mysql-management-BASE.dirs.in
similarity index 100%
rename from debian/mysql-management-MYVER.dirs.in
rename to debian/mysql-management-BASE.dirs.in
diff --git a/debian/mysql-management-MYVER.files.in b/debian/mysql-management-BASE.files.in
similarity index 100%
rename from debian/mysql-management-MYVER.files.in
rename to debian/mysql-management-BASE.files.in
diff --git a/debian/mysql-management-MYVER.mysql-management.init.in b/debian/mysql-management-BASE.mysql-management.init.in
similarity index 100%
rename from debian/mysql-management-MYVER.mysql-management.init.in
rename to debian/mysql-management-BASE.mysql-management.init.in
diff --git a/debian/mysql-server-MYVER.NEWS.in b/debian/mysql-server-BASE.NEWS.in
similarity index 100%
rename from debian/mysql-server-MYVER.NEWS.in
rename to debian/mysql-server-BASE.NEWS.in
diff --git a/debian/mysql-server-MYVER.README.Debian.in b/debian/mysql-server-BASE.README.Debian.in
similarity index 100%
rename from debian/mysql-server-MYVER.README.Debian.in
rename to debian/mysql-server-BASE.README.Debian.in
diff --git a/debian/mysql-server-MYVER.config.in b/debian/mysql-server-BASE.config.in
similarity index 90%
rename from debian/mysql-server-MYVER.config.in
rename to debian/mysql-server-BASE.config.in
index f5383c3d909..0b031b2d3f8 100644
--- a/debian/mysql-server-MYVER.config.in
+++ b/debian/mysql-server-BASE.config.in
@@ -9,7 +9,7 @@ CNF=/etc/mysql/my.cnf
 
 # Beware that there are two ypwhich one of them needs the 2>/dev/null!
 if test -n "`which ypwhich 2>/dev/null`"  &&  ypwhich >/dev/null 2>&1; then
-  db_input high mysql-server-@MYVER@/nis_warning || true
+  db_input high mysql-server-@MYSQL_BASE_VERSION@/nis_warning || true
   db_go
 fi
 
@@ -34,6 +34,6 @@ if [ "$1" = "configure" ] &&
      egrep -q -i '^[[:space:]]*old.passwords[[:space:]]*=[[:space:]]*(1|true)' $CNF
    ) 
 then
-	db_input medium mysql-server-@MYVER@/need_sarge_compat || true
+	db_input medium mysql-server-@MYSQL_BASE_VERSION@/need_sarge_compat || true
 	db_go
 fi
diff --git a/debian/mysql-server-MYVER.dirs.in b/debian/mysql-server-BASE.dirs.in
similarity index 100%
rename from debian/mysql-server-MYVER.dirs.in
rename to debian/mysql-server-BASE.dirs.in
diff --git a/debian/mysql-server-MYVER.docs.in b/debian/mysql-server-BASE.docs.in
similarity index 100%
rename from debian/mysql-server-MYVER.docs.in
rename to debian/mysql-server-BASE.docs.in
diff --git a/debian/mysql-server-MYVER.files.in b/debian/mysql-server-BASE.files.in
similarity index 95%
rename from debian/mysql-server-MYVER.files.in
rename to debian/mysql-server-BASE.files.in
index d3f23f1c18f..f44044deb91 100644
--- a/debian/mysql-server-MYVER.files.in
+++ b/debian/mysql-server-BASE.files.in
@@ -26,7 +26,7 @@ usr/bin/resolveip
 usr/sbin/mysqld
 usr/sbin/mysqlmanager
 usr/lib/mysql/mysqld.sym
-usr/share/lintian/overrides/mysql-server-@MYVER@
+usr/share/lintian/overrides/mysql-server-@MYSQL_BASE_VERSION@
 usr/share/info/mysql.info
 usr/share/man/man1/mysqlman.1
 usr/share/man/man1/my_print_defaults.1
diff --git a/debian/mysql-server-MYVER.links.in b/debian/mysql-server-BASE.links.in
similarity index 100%
rename from debian/mysql-server-MYVER.links.in
rename to debian/mysql-server-BASE.links.in
diff --git a/debian/mysql-server-BASE.lintian-overrides.in b/debian/mysql-server-BASE.lintian-overrides.in
new file mode 100644
index 00000000000..ea9afce1e7e
--- /dev/null
+++ b/debian/mysql-server-BASE.lintian-overrides.in
@@ -0,0 +1,4 @@
+mysql-server-@MYSQL_BASE_VERSION@: possible-bashism-in-maintainer-script postinst:81 'p{("a".."z","A".."Z",0..9)[int(rand(62))]}'
+mysql-server-@MYSQL_BASE_VERSION@: possible-bashism-in-maintainer-script preinst:33 '${cmd/ */}'
+mysql-server-@MYSQL_BASE_VERSION@: statically-linked-binary ./usr/bin/mysql_tzinfo_to_sql
+mysql-server-@MYSQL_BASE_VERSION@: statically-linked-binary ./usr/sbin/mysqld
diff --git a/debian/mysql-server-MYVER.logcheck.ignore.paranoid.in b/debian/mysql-server-BASE.logcheck.ignore.paranoid.in
similarity index 100%
rename from debian/mysql-server-MYVER.logcheck.ignore.paranoid.in
rename to debian/mysql-server-BASE.logcheck.ignore.paranoid.in
diff --git a/debian/mysql-server-MYVER.logcheck.ignore.server.in b/debian/mysql-server-BASE.logcheck.ignore.server.in
similarity index 100%
rename from debian/mysql-server-MYVER.logcheck.ignore.server.in
rename to debian/mysql-server-BASE.logcheck.ignore.server.in
diff --git a/debian/mysql-server-MYVER.logcheck.ignore.workstation.in b/debian/mysql-server-BASE.logcheck.ignore.workstation.in
similarity index 100%
rename from debian/mysql-server-MYVER.logcheck.ignore.workstation.in
rename to debian/mysql-server-BASE.logcheck.ignore.workstation.in
diff --git a/debian/mysql-server-MYVER.mysql-server.logrotate.in b/debian/mysql-server-BASE.mysql-server.logrotate.in
similarity index 100%
rename from debian/mysql-server-MYVER.mysql-server.logrotate.in
rename to debian/mysql-server-BASE.mysql-server.logrotate.in
diff --git a/debian/mysql-server-MYVER.postinst.in b/debian/mysql-server-BASE.postinst.in
similarity index 98%
rename from debian/mysql-server-MYVER.postinst.in
rename to debian/mysql-server-BASE.postinst.in
index e7618b8b9d1..1457eca4be5 100644
--- a/debian/mysql-server-MYVER.postinst.in
+++ b/debian/mysql-server-BASE.postinst.in
@@ -137,12 +137,12 @@ EOF
 
     # On dist-upgrades, we ensure that the old_password setting is updated
     # before passwords are changed. Except for that config files are taboo!
-    db_get mysql-server-@MYVER@/need_sarge_compat_done || true
+    db_get mysql-server-@MYSQL_BASE_VERSION@/need_sarge_compat_done || true
     if [ "$RET" = "false" ]; then
- 	db_get mysql-server-@MYVER@/need_sarge_compat
+ 	db_get mysql-server-@MYSQL_BASE_VERSION@/need_sarge_compat
 	echo -e "# created by debconf but save to be edited\n[mysqld]\nold_passwords = $RET" > /etc/mysql/conf.d/old_passwords.cnf
     fi
-    db_set mysql-server-@MYVER@/need_sarge_compat_done true
+    db_set mysql-server-@MYSQL_BASE_VERSION@/need_sarge_compat_done true
 
     # initiate databases. Output is not allowed by debconf :-(
     # Debian: beware of the bashisms... 
diff --git a/debian/mysql-server-MYVER.postrm.in b/debian/mysql-server-BASE.postrm.in
similarity index 93%
rename from debian/mysql-server-MYVER.postrm.in
rename to debian/mysql-server-BASE.postrm.in
index 7446344a33c..14c61f1f90a 100644
--- a/debian/mysql-server-MYVER.postrm.in
+++ b/debian/mysql-server-BASE.postrm.in
@@ -49,9 +49,9 @@ if [ "$1" = "purge" -a ! \( -x /usr/sbin/mysqld -o -L /usr/sbin/mysqld \) ]; the
   rm -f /var/log/mysql.{log,err}{,.0,.[1234567].gz}
   rm -rf /var/log/mysql
 
-  db_input high mysql-server-@MYVER@/postrm_remove_databases || true
+  db_input high mysql-server-@MYSQL_BASE_VERSION@/postrm_remove_databases || true
   db_go
-  db_get mysql-server-@MYVER@/postrm_remove_databases || true
+  db_get mysql-server-@MYSQL_BASE_VERSION@/postrm_remove_databases || true
   if [ "$RET" = "true" ]; then
     # never remove the debian.cnf when the databases are still existing
     # else we ran into big trouble on the next install!
@@ -87,6 +87,6 @@ if [ "$1" = "purge" ] ; then
 fi
 # (normally) End automatically added section
 
-# no DEBHELPER here, "update-rc.d remove" fails if mysql-server-@MYVER@ is installed
+# no DEBHELPER here, "update-rc.d remove" fails if mysql-server-@MYSQL_BASE_VERSION@ is installed
 
 exit 0
diff --git a/debian/mysql-server-MYVER.preinst.in b/debian/mysql-server-BASE.preinst.in
similarity index 100%
rename from debian/mysql-server-MYVER.preinst.in
rename to debian/mysql-server-BASE.preinst.in
diff --git a/debian/mysql-server-MYVER.prerm.in b/debian/mysql-server-BASE.prerm.in
similarity index 100%
rename from debian/mysql-server-MYVER.prerm.in
rename to debian/mysql-server-BASE.prerm.in
diff --git a/debian/mysql-server-MYVER.templates.in b/debian/mysql-server-BASE.templates.in
similarity index 83%
rename from debian/mysql-server-MYVER.templates.in
rename to debian/mysql-server-BASE.templates.in
index 9e8e6977889..dd3b63c1e8a 100644
--- a/debian/mysql-server-MYVER.templates.in
+++ b/debian/mysql-server-BASE.templates.in
@@ -1,4 +1,4 @@
-Template: mysql-server-@MYVER@/really_downgrade
+Template: mysql-server-@MYSQL_BASE_VERSION@/really_downgrade
 Type: boolean
 Default: false
 _Description: Do you really want to downgrade?
@@ -6,7 +6,7 @@ _Description: Do you really want to downgrade?
  mysql-server package with a higher version has been installed before.
  It can not be guaranteed that this version can use its data.
 
-Template: mysql-server-@MYVER@/nis_warning
+Template: mysql-server-@MYSQL_BASE_VERSION@/nis_warning
 Type: note
 _Description: Important note for NIS/YP users!
  To use mysql you must install an equivalent user and group to the
@@ -19,7 +19,7 @@ _Description: Important note for NIS/YP users!
  .
  /var/lib/mysql:   drwxr-xr-x   mysql    mysql
 
-Template: mysql-server-@MYVER@/postrm_remove_databases
+Template: mysql-server-@MYSQL_BASE_VERSION@/postrm_remove_databases
 Type: boolean
 Default: false
 _Description: Remove the databases used by all MySQL versions?
@@ -27,7 +27,7 @@ _Description: Remove the databases used by all MySQL versions?
  If it is planned to just install a higher MySQL version or if a different
  mysql-server package is already using it, the data should be kept.
 
-Template: mysql-server-@MYVER@/start_on_boot
+Template: mysql-server-@MYSQL_BASE_VERSION@/start_on_boot
 Type: boolean
 Default: true
 _Description: Should MySQL start on boot?
@@ -54,16 +54,16 @@ _Description: Unable to set password for MySQL "root" user
  is properly protected with a password (see README.Debian for more
  information).
 
-Template: mysql-server-@MYVER@/need_sarge_compat
+Template: mysql-server-@MYSQL_BASE_VERSION@/need_sarge_compat
 Type: boolean
 Default: false
 _Description: Support MySQL connections from hosts running Debian "sarge" or older?
  The way passwords were stored was not very secure. This has been improved
  with the drawback that clients (e.g. PHP) from hosts running Debian 3.1 Sarge
  will not be able to connect to account which are new or whose password have
- been changed. See /usr/share/doc/mysql-server-@MYVER@/README.Debian.
+ been changed. See /usr/share/doc/mysql-server-@MYSQL_BASE_VERSION@/README.Debian.
 
-Template: mysql-server-@MYVER@/need_sarge_compat_done
+Template: mysql-server-@MYSQL_BASE_VERSION@/need_sarge_compat_done
 Type: boolean
 Default: false
 Description: for internal use
diff --git a/debian/mysql-server-MYVER.lintian-overrides.in b/debian/mysql-server-MYVER.lintian-overrides.in
deleted file mode 100644
index c70a2a4bc64..00000000000
--- a/debian/mysql-server-MYVER.lintian-overrides.in
+++ /dev/null
@@ -1,4 +0,0 @@
-mysql-server-@MYVER@: possible-bashism-in-maintainer-script postinst:81 'p{("a".."z","A".."Z",0..9)[int(rand(62))]}'
-mysql-server-@MYVER@: possible-bashism-in-maintainer-script preinst:33 '${cmd/ */}'
-mysql-server-@MYVER@: statically-linked-binary ./usr/bin/mysql_tzinfo_to_sql
-mysql-server-@MYVER@: statically-linked-binary ./usr/sbin/mysqld
diff --git a/debian/mysql-server-MYOLDVER.preinst.in b/debian/mysql-server-PREV.preinst.in
similarity index 100%
rename from debian/mysql-server-MYOLDVER.preinst.in
rename to debian/mysql-server-PREV.preinst.in
diff --git a/debian/mysql-storage-MYVER.dirs.in b/debian/mysql-storage-BASE.dirs.in
similarity index 100%
rename from debian/mysql-storage-MYVER.dirs.in
rename to debian/mysql-storage-BASE.dirs.in
diff --git a/debian/mysql-storage-MYVER.files.in b/debian/mysql-storage-BASE.files.in
similarity index 100%
rename from debian/mysql-storage-MYVER.files.in
rename to debian/mysql-storage-BASE.files.in
diff --git a/debian/mysql-storage-MYVER.mysql-storage.init.in b/debian/mysql-storage-BASE.mysql-storage.init.in
similarity index 100%
rename from debian/mysql-storage-MYVER.mysql-storage.init.in
rename to debian/mysql-storage-BASE.mysql-storage.init.in
diff --git a/debian/mysql-test-MYVER.dirs.in b/debian/mysql-test-BASE.dirs.in
similarity index 100%
rename from debian/mysql-test-MYVER.dirs.in
rename to debian/mysql-test-BASE.dirs.in
diff --git a/debian/mysql-test-MYVER.files.in b/debian/mysql-test-BASE.files.in
similarity index 100%
rename from debian/mysql-test-MYVER.files.in
rename to debian/mysql-test-BASE.files.in
diff --git a/debian/mysql-tools-MYVER.dirs.in b/debian/mysql-tools-BASE.dirs.in
similarity index 100%
rename from debian/mysql-tools-MYVER.dirs.in
rename to debian/mysql-tools-BASE.dirs.in
diff --git a/debian/mysql-tools-MYVER.files.in b/debian/mysql-tools-BASE.files.in
similarity index 100%
rename from debian/mysql-tools-MYVER.files.in
rename to debian/mysql-tools-BASE.files.in
diff --git a/debian/po/POTFILES.in.in b/debian/po/POTFILES.in.in
index f641502d508..98a5aa969d7 100644
--- a/debian/po/POTFILES.in.in
+++ b/debian/po/POTFILES.in.in
@@ -1 +1 @@
-[type: gettext/rfc822deb] mysql-server-@MYVER@.templates
+[type: gettext/rfc822deb] mysql-server-@MYSQL_BASE_VERSION@.templates
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
diff --git a/debian/source.lintian-overrides.in b/debian/source.lintian-overrides.in
index 3f0ec78a1cd..8af64e3a256 100644
--- a/debian/source.lintian-overrides.in
+++ b/debian/source.lintian-overrides.in
@@ -1,5 +1,5 @@
-maintainer-script-lacks-debhelper-token debian/mysql-server-@MYVER@.postinst
-maintainer-script-lacks-debhelper-token debian/mysql-server-@MYVER@.postrm
+maintainer-script-lacks-debhelper-token debian/mysql-server-@MYSQL_BASE_VERSION@.postinst
+maintainer-script-lacks-debhelper-token debian/mysql-server-@MYSQL_BASE_VERSION@.postrm
 outdated-autotools-helper-file bdb/dist/config.sub 2002-07-03
 outdated-autotools-helper-file bdb/dist/config.guess 2002-07-23
 bad-distribution-in-changes-file sarge