Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint

into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-debian

debian/Makefile.am

@@ -26,10 +26,10 @@ EXTRA_DIST =  \
 	libndbclientNLIB.files.in \
 	source.lintian-overrides.in \
 	mysql-server-BASE.docs.in \
-	libmysqlclientSLIB.files.in \
+	libmysqlclientSLIBoff.files.in \
 	mysql-server-BASE.files.in \
 	libndbclientNLIB-dev.links.in \
-	libmysqlclientSLIB.postinst.in \
+	libmysqlclientSLIBoff.postinst.in \
 	mysql-extra-BASE.dirs.in \
 	libmysqlclientSLIB-dev.links.in \
 	mysql-server-BASE.dirs.in \
@@ -38,14 +38,14 @@ EXTRA_DIST =  \
 	copyright.more \
 	libndbclientNLIB-dev.dirs.in \
 	mysql-server-BASE.README.Debian.in \
-	libmysqlclientSLIB.docs.in \
+	libmysqlclientSLIBoff.docs.in \
 	compat \
 	mysql-test-BASE.dirs.in \
 	libmysqlclientSLIB-dev.files.in \
-	libmysqlclientSLIB.dirs.in \
+	libmysqlclientSLIBoff.dirs.in \
 	mysql-server-BASE.logcheck.ignore.server.in \
 	mysql-storage-BASE.mysql-storage.init.in \
-	libmysqlclientSLIB.README.Debian.in \
+	libmysqlclientSLIBoff.README.Debian.in \
 	mysql-client-BASE.README.Debian.in \
 	Makefile.am \
 	mysql-server-BASE.prerm.in \

debian/changelog

-mysql-5.0 (5.0.38) enterprise; urgency=low
+mysql-5.0 (5.0.42) UNRELEASED; urgency=low
+
+  * Upgraded to 5.0.42 branch.
+
+ -- Monty Taylor <mtaylor@mysql.com>  Thu, 19 Apr 2007 22:18:02 +0200
+
+mysql-5.0 (5.0.38) UNRELEASED; urgency=low
 
   * Imported packaging work from Debian.
   * Removed debian-start, mysqlreport and echo_stderr to align with official
     packages.
 
- -- Monty Taylor <mordred@inaugust.com>  Wed,  7 Mar 2007 07:52:55 +0800
+ -- Monty Taylor <mtaylor@mysql.com>  Wed,  7 Mar 2007 07:52:55 +0800
 
 mysql-dfsg-5.0 (5.0.32-3etch1) testing-proposed-updates; urgency=high
 

debian/control.in

-Source: mysql-@MYSQL_BASE_VERSION@
+Source: mysql-@MYSQL_BRANDED_BASE_VERSION@
 Section: misc
 Priority: optional
 Maintainer: Monty Taylor <mtaylor@mysql.com>
@@ -6,12 +6,10 @@ 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@SHARED_LIB_MAJOR_VERSION@
+Package: libmysqlclient@SHARED_LIB_MAJOR_VERSION@off
 Section: libs
 Architecture: any
 Depends: mysql-common (>= ${Source-Version}), ${shlibs:Depends}
-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
@@ -115,9 +113,9 @@ Package: mysql-common
 Section: misc
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: mysql-common-@MYSQL_PREVIOUS_BASE_VERSION@
-Provides: mysql-common-@MYSQL_PREVIOUS_BASE_VERSION@
-Replaces: mysql-common-@MYSQL_PREVIOUS_BASE_VERSION@
+Conflicts: mysql-common-@MYSQL_BRANDED_PREVIOUS_BASE_VERSION@
+Provides: mysql-common-@MYSQL_BRANDED_PREVIOUS_BASE_VERSION@
+Replaces: mysql-common-@MYSQL_BRANDED_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 +136,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-@MYSQL_BASE_VERSION@
+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}
-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@
+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@
 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 +162,15 @@ Description: mysql database client binaries
  .
  This package contains the standard MySQL clients and administration tools. 
 
-Package: mysql-server-@MYSQL_BASE_VERSION@
+Package: mysql-server-@MYSQL_BRANDED_BASE_VERSION@
 Architecture: any                                                               
 Suggests: tinyca
 Recommends: mailx
 Pre-Depends: mysql-common (>= ${Source-Version}), adduser (>= 3.40)
-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@
+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@
+Replaces: mysql-server (<< ${Source-Version}), mysql-server-@MYSQL_BRANDED_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 +193,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-@MYSQL_BASE_VERSION@ as well!
+ package mysql-client-@MYSQL_BRANDED_BASE_VERSION@ as well!
 
-Package: mysql-test-@MYSQL_BASE_VERSION@
+Package: mysql-test-@MYSQL_BRANDED_BASE_VERSION@
 Architecture: any                                                               
 Pre-Depends: mysql-common (>= ${Source-Version})
-Depends: mysql-client-@MYSQL_BASE_VERSION@ (>= ${Source-Version}), libdbd-mysql-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}
+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,
  and robust SQL (Structured Query Language) database server. MySQL Server
@@ -221,7 +219,7 @@ Description: MySQL - test suite
  . 
  This package contains the MySQL regression test suite.
 
-Package: mysql-storage-@MYSQL_BASE_VERSION@
+Package: mysql-storage-@MYSQL_BRANDED_BASE_VERSION@
 Architecture: any                                                               
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: MySQL - ndbcluster storage engine
@@ -248,7 +246,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-@MYSQL_BASE_VERSION@
+Package: mysql-management-@MYSQL_BRANDED_BASE_VERSION@
 Architecture: any                                                               
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: MySQL - ndbcluster storage engine management
@@ -273,7 +271,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-@MYSQL_BASE_VERSION@
+Package: mysql-tools-@MYSQL_BRANDED_BASE_VERSION@
 Architecture: any                                                               
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: MySQL - ndbcluster storage engine basic tools
@@ -296,7 +294,7 @@ Description: MySQL - ndbcluster storage engine basic tools
  . 
  This package contains ndbcluster storage engine basic tools.
 
-Package: mysql-extra-@MYSQL_BASE_VERSION@
+Package: mysql-extra-@MYSQL_BRANDED_BASE_VERSION@
 Architecture: any                                                               
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: MySQL - ndbcluster storage engine extra tools
@@ -323,11 +321,11 @@ Description: MySQL - ndbcluster storage engine extra tools
  They should be used with caution
 
 
-Package: mysql-server-@MYSQL_PREVIOUS_BASE_VERSION@
+Package: mysql-server-@MYSQL_BRANDED_PREVIOUS_BASE_VERSION@
 Architecture: any                                                               
 Section: oldlibs
 Priority: extra
-Depends: mysql-server-@MYSQL_BASE_VERSION@
+Depends: mysql-server-@MYSQL_BRANDED_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 +336,18 @@ Description: mysql database server (transitional package)
 
 Package: mysql-server
 Architecture: all
-Depends: mysql-server-@MYSQL_BASE_VERSION@
+Depends: mysql-server-@MYSQL_BRANDED_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-@MYSQL_BASE_VERSION@), as determined by the MySQL
+ 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
 Architecture: all
-Depends: mysql-client-@MYSQL_BASE_VERSION@
+Depends: mysql-client-@MYSQL_BRANDED_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-@MYSQL_BASE_VERSION@), as determined by the MySQL
+ mysql-client (currently mysql-client-@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.

debian/defs.mk.in

@@ -6,9 +6,9 @@ MYSQL_BUILD_CXX=gcc
 # we re-write state into this file. MYSQL_BASE_VERSION might get a suffix added
 # by debian/rules which could result in a nasty loop. VER is there to hold the 
 # original unadorned version from autoconf
-VER=@MYSQL_BASE_VERSION@
-OLDVER=@MYSQL_PREVIOUS_BASE_VERSION@
 MYSQL_BASE_VERSION=@MYSQL_BASE_VERSION@
 MYSQL_PREVIOUS_BASE_VERSION=@MYSQL_PREVIOUS_BASE_VERSION@
+MYSQL_BRANDED_BASE_VERSION=@MYSQL_BRANDED_BASE_VERSION@
+MYSQL_BRANDED_PREVIOUS_BASE_VERSION=@MYSQL_BRANDED_PREVIOUS_BASE_VERSION@
 SHARED_LIB_MAJOR_VERSION=@SHARED_LIB_MAJOR_VERSION@
 NDB_SHARED_LIB_MAJOR_VERSION=@NDB_SHARED_LIB_MAJOR_VERSION@

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-@MYSQL_BASE_VERSION@
+usr/share/lintian/overrides/mysql-client-@MYSQL_BRANDED_BASE_VERSION@
 usr/share/man/man1/mysql.1
 usr/share/man/man1/mysqlaccess.1
 usr/share/man/man1/mysqladmin.1

debian/mysql-client-BASE.lintian-overrides.in

-mysql-client-@MYSQL_BASE_VERSION@: package-has-a-duplicate-relation
+mysql-client-@MYSQL_BRANDED_BASE_VERSION@: package-has-a-duplicate-relation

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-@MYSQL_BASE_VERSION@/nis_warning || true
+  db_input high mysql-server-@MYSQL_BRANDED_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-@MYSQL_BASE_VERSION@/need_sarge_compat || true
+	db_input medium mysql-server-@MYSQL_BRANDED_BASE_VERSION@/need_sarge_compat || true
 	db_go
 fi

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-@MYSQL_BASE_VERSION@
+usr/share/lintian/overrides/mysql-server-@MYSQL_BRANDED_BASE_VERSION@
 usr/share/info/mysql.info
 usr/share/man/man1/mysqlman.1
 usr/share/man/man1/my_print_defaults.1

debian/mysql-server-BASE.lintian-overrides.in

-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
+mysql-server-@MYSQL_BRANDED_BASE_VERSION@: possible-bashism-in-maintainer-script postinst:81 'p{("a".."z","A".."Z",0..9)[int(rand(62))]}'
+mysql-server-@MYSQL_BRANDED_BASE_VERSION@: possible-bashism-in-maintainer-script preinst:33 '${cmd/ */}'
+mysql-server-@MYSQL_BRANDED_BASE_VERSION@: statically-linked-binary ./usr/bin/mysql_tzinfo_to_sql
+mysql-server-@MYSQL_BRANDED_BASE_VERSION@: statically-linked-binary ./usr/sbin/mysqld

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-@MYSQL_BASE_VERSION@/need_sarge_compat_done || true
+    db_get mysql-server-@MYSQL_BRANDED_BASE_VERSION@/need_sarge_compat_done || true
     if [ "$RET" = "false" ]; then
- 	db_get mysql-server-@MYSQL_BASE_VERSION@/need_sarge_compat
+ 	db_get mysql-server-@MYSQL_BRANDED_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-@MYSQL_BASE_VERSION@/need_sarge_compat_done true
+    db_set mysql-server-@MYSQL_BRANDED_BASE_VERSION@/need_sarge_compat_done true
 
     # initiate databases. Output is not allowed by debconf :-(
     # Debian: beware of the bashisms... 

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-@MYSQL_BASE_VERSION@/postrm_remove_databases || true
+  db_input high mysql-server-@MYSQL_BRANDED_BASE_VERSION@/postrm_remove_databases || true
   db_go
-  db_get mysql-server-@MYSQL_BASE_VERSION@/postrm_remove_databases || true
+  db_get mysql-server-@MYSQL_BRANDED_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-@MYSQL_BASE_VERSION@ is installed
+# no DEBHELPER here, "update-rc.d remove" fails if mysql-server-@MYSQL_BRANDED_BASE_VERSION@ is installed
 
 exit 0

debian/mysql-server-BASE.templates.in

-Template: mysql-server-@MYSQL_BASE_VERSION@/really_downgrade
+Template: mysql-server-@MYSQL_BRANDED_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-@MYSQL_BASE_VERSION@/nis_warning
+Template: mysql-server-@MYSQL_BRANDED_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-@MYSQL_BASE_VERSION@/postrm_remove_databases
+Template: mysql-server-@MYSQL_BRANDED_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-@MYSQL_BASE_VERSION@/start_on_boot
+Template: mysql-server-@MYSQL_BRANDED_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-@MYSQL_BASE_VERSION@/need_sarge_compat
+Template: mysql-server-@MYSQL_BRANDED_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-@MYSQL_BASE_VERSION@/README.Debian.
+ been changed. See /usr/share/doc/mysql-server-@MYSQL_BRANDED_BASE_VERSION@/README.Debian.
 
-Template: mysql-server-@MYSQL_BASE_VERSION@/need_sarge_compat_done
+Template: mysql-server-@MYSQL_BRANDED_BASE_VERSION@/need_sarge_compat_done
 Type: boolean
 Default: false
 Description: for internal use

debian/po/POTFILES.in.in

-[type: gettext/rfc822deb] mysql-server-@MYSQL_BASE_VERSION@.templates
+[type: gettext/rfc822deb] mysql-server-@MYSQL_BRANDED_BASE_VERSION@.templates

debian/rules

@@ -18,11 +18,19 @@ ifeq ("x$(MYSQL_FLAVOR)","x")
 endif
 
 ifneq ("x$(MYSQL_FLAVOR)","x")
-  MYSQL_BASE_VERSION:=$(MYSQL_FLAVOR)-$(MYSQL_BASE_VERSION)
-  MYSQL_PREVIOUS_BASE_VERSION:=$(MYSQL_FLAVOR)-$(MYSQL_PREVIOUS_BASE_VERSION)
+  MYSQL_BRANDED_BASE_VERSION:=$(MYSQL_FLAVOR)-$(MYSQL_BASE_VERSION)
+  MYSQL_BRANDED_PREVIOUS_BASE_VERSION:=$(MYSQL_FLAVOR)-$(MYSQL_PREVIOUS_BASE_VERSION)
+else
+  ifeq ( "$(MYSQL_BRANDED_BASE_VERSION)","@MYSQL_BRANDED_BASE_VERSION@" )
+    MYSQL_BRANDED_BASE_VERSION:=$(MYSQL_BASE_VERSION)
+    MYSQL_BRANDED_PREVIOUS_BASE_VERSION:=$(MYSQL_PREVIOUS_BASE_VERSION)
+  else
+    MYSQL_BRANDED_BASE_VERSION:=$(MYSQL_BRANDED_BASE_VERSION)
+    MYSQL_BRANDED_PREVIOUS_BASE_VERSION:=$(MYSQL_BRANDED_PREVIOUS_BASE_VERSION)
+  endif 
 endif
 
-PACKAGE=mysql-$(MYSQL_BASE_VERSION)
+PACKAGE=mysql-$(MYSQL_BRANDED_BASE_VERSION)
 
 PWD=$(shell pwd)
 TMP=$(PWD)/debian/tmp/
@@ -65,9 +73,10 @@ endif
 control-file:
 	@echo "## This file is autogenerated you want to edit control.in instead" > debian/control.tmp
 	sed -e "s/@MYSQL_BASE_VERSION@/$(MYSQL_BASE_VERSION)/g" \
-	    -e "s/@VER@/$(VER)/g" \
+	    -e "s/@MYSQL_BRANDED_BASE_VERSION@/$(MYSQL_BRANDED_BASE_VERSION)/g" \
 	    -e "s/@VERSIONSTRING@/$(VERSIONSTRING)/g" \
 	    -e "s/@MYSQL_PREVIOUS_BASE_VERSION@/$(MYSQL_PREVIOUS_BASE_VERSION)/g" \
+	    -e "s/@MYSQL_BRANDED_PREVIOUS_BASE_VERSION@/$(MYSQL_BRANDED_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" \
@@ -90,6 +99,7 @@ ifneq ($(ARCH_OS),hurd)
 	@if [ ! -d /proc/self ]; then echo "/proc IS NEEDED" 1>&2; exit 1; fi 
 endif
 
+	@cp debian/control debian/control.sav
 	( \
 	CC="$(MYSQL_BUILD_CC)"  \
 	CXX="$(MYSQL_BUILD_CXX)" \
@@ -143,6 +153,8 @@ endif
 		$(MYSQL_BUILD_OPTS) \
 	)
 
+	@mv debian/control.sav debian/control
+
 	touch configure-stamp
 
 
@@ -174,18 +186,20 @@ build-stamp: configure
 stamp-control:
 	# We have to prepare the various control files
 
+	echo "in stamp-control - BASE_VER==$(MYSQL_BASE_VERSION)"
 	# We have some naming inconsistencies here... 
 	for f in debian/*.in debian/po/POTFILES.in.in ; do \
-            f2=`echo $$f | sed "s,BASE,$(MYSQL_BASE_VERSION),g;\
-                                s,PREV,$(MYSQL_PREVIOUS_BASE_VERSION),g;\
+            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$$,,"`; \
             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" \
 		    -e "s/@VERSIONSTRING@/$(VERSIONSTRING)/g" \
-		    -e "s/@VER@/$(VER)/g" \
                     -e "s/@PRIORITY@/$(PRIORITY)/g" \
 		    -e "s/@MYSQL_PREVIOUS_BASE_VERSION@/$(MYSQL_PREVIOUS_BASE_VERSION)/g" \
+	    	    -e "s/@MYSQL_BRANDED_PREVIOUS_BASE_VERSION@/$(MYSQL_BRANDED_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" \
@@ -194,13 +208,19 @@ stamp-control:
                   <$$f >$$f2; \
             fi; \
         done
+	echo "MYSQL_BUILD_OPTS=$(MYSQL_BUILD_OPTS)" >> debian/defs.mk
+	echo "MYSQL_BUILD_CXXFLAGS=$(MYSQL_BUILD_CXXFLAGS)" >> debian/defs.mk
+	echo "MYSQL_BUILD_CFLAGS=$(MYSQL_BUILD_CFLAGS)" >> debian/defs.mk
+	echo "MYSQL_BUILD_CC=$(MYSQL_BUILD_CC)" >> debian/defs.mk
+	echo "MYSQL_BUILD_CXX=$(MYSQL_BUILD_CXX)" >> debian/defs.mk
+
 
 # depending on two files we expect to be in the root
 # to protect from accidentally deleting a whole bunch of 
 # files somewhere else.
 clean: configure.in Makefile.am control-file
 
-	rm -f debian/mysql-server-$(MYSQL_BASE_VERSION).mysql.init
+	rm -f debian/mysql-server-$(MYSQL_BRANDED_BASE_VERSION).mysql.init
 
 	# We depend on this later, and delete the results in the mean time
 	$(MAKE) -f debian/rules stamp-control
@@ -218,11 +238,10 @@ clean: configure.in Makefile.am control-file
 	debconf-updatepo
 
 	for f in debian/*.in; do \
-            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$$,,"`; \
+            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$$,,"`; \
             if [ $$f2 != debian/control -a $$f2 != debian/Makefile -a $$f2 != debian/defs.mk ]; then \
 		rm -f $$f2; \
             fi; \
@@ -243,7 +262,7 @@ 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-$(MYSQL_BASE_VERSION).mysql.init
+	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
@@ -292,8 +311,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-$(MYSQL_BASE_VERSION)/examples
-	mv $(TMP)/usr/share/mysql/*cnf 	    $(TMP)/usr/share/doc/mysql-server-$(MYSQL_BASE_VERSION)/examples/
+	mkdir -p $(TMP)/usr/share/doc/mysql-server-$(MYSQL_BRANDED_BASE_VERSION)/examples
+	mv $(TMP)/usr/share/mysql/*cnf 	    $(TMP)/usr/share/doc/mysql-server-$(MYSQL_BRANDED_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 \
@@ -305,14 +324,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-$(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)
+	cp debian/mysql-server-$(MYSQL_BRANDED_BASE_VERSION).lintian-overrides $(TMP)/usr/share/lintian/overrides/mysql-server-$(MYSQL_BRANDED_BASE_VERSION)
+	cp debian/mysql-client-$(MYSQL_BRANDED_BASE_VERSION).lintian-overrides $(TMP)/usr/share/lintian/overrides/mysql-client-$(MYSQL_BRANDED_BASE_VERSION)
 
 	# For 4.1 -> 5.0 transition
 	d=$(TMP)/usr/share/mysql-common/internal-use-only/; \
 	mkdir -p $$d; \
-	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; \
+	cp debian/mysql-server-$(MYSQL_BRANDED_BASE_VERSION).mysql.init $$d/_etc_init.d_mysql; \
+	cp debian/mysql-server-$(MYSQL_BRANDED_BASE_VERSION).mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \
 
 	dh_movefiles
 

debian/source.lintian-overrides.in

-maintainer-script-lacks-debhelper-token debian/mysql-server-@MYSQL_BASE_VERSION@.postinst
-maintainer-script-lacks-debhelper-token debian/mysql-server-@MYSQL_BASE_VERSION@.postrm
+maintainer-script-lacks-debhelper-token debian/mysql-server-@MYSQL_BRANDED_BASE_VERSION@.postinst
+maintainer-script-lacks-debhelper-token debian/mysql-server-@MYSQL_BRANDED_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