[Pkg-mysql-commits] r1978 - mysql-5.1/branches/unstable/debian

Sat Jun 18 17:31:57 UTC 2011

tags 614044 pending
tags 630672 pending
thanks

Author: nobse
Date: 2011-06-18 17:31:57 +0000 (Sat, 18 Jun 2011)
New Revision: 1978

Modified:
   mysql-5.1/branches/unstable/debian/changelog
   mysql-5.1/branches/unstable/debian/control
   mysql-5.1/branches/unstable/debian/mysql-server-5.1.preinst
   mysql-5.1/branches/unstable/debian/rules
Log:
Fix syntax warning in preinst.

Modified: mysql-5.1/branches/unstable/debian/changelog
===================================================================

--- mysql-5.1/branches/unstable/debian/changelog	2011-06-04 14:10:40 UTC (rev 1977)
+++ mysql-5.1/branches/unstable/debian/changelog	2011-06-18 17:31:57 UTC (rev 1978)
@@ -1,3 +1,34 @@
+mysql-5.1 (5.1.57-2) unstable; urgency=low
+
+  * Acknowledge NMUs. (closes: #614044)
+  * Fix syntax warning in preinst. (closes: #630672)
+
+ -- Norbert Tretkowski <norbert at tretkowski.de>  Sat, 18 Jun 2011 19:28:35 +0200
+
+mysql-5.1 (5.1.57-1.3) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Use correct DEB_HOST_GNU_TYPE and not DEB_HOST_BUILD_TYPE.
+
+ -- Ondřej Surý <ondrej at debian.org>  Mon, 13 Jun 2011 17:02:50 +0200
+
+mysql-5.1 (5.1.57-1.2) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Prefix gcc-4.5 and g++-4.5 with DEB_BUILD_GNU_TYPE to fix FTBFS on
+    ia64, s390 and maybe more.
+
+ -- Ondřej Surý <ondrej at debian.org>  Mon, 13 Jun 2011 13:20:37 +0200
+
+mysql-5.1 (5.1.57-1.1) unstable; urgency=high
+
+  * Non-maintainer upload (with permission of maintainer).
+  * Build with gcc-4.5 (Closes: #614044)
+  * Revert: "Build with -O2 instead -O3, MySQL seems not yet ready for -
+    O3 when using gcc-4.6." since we are building with gcc-4.5.
+
+ -- Ondřej Surý <ondrej at debian.org>  Mon, 13 Jun 2011 08:51:51 +0200
+
 mysql-5.1 (5.1.57-1) unstable; urgency=medium
 
   * Bump libmysqlclient16 shlibs to 5.1.50-1 as it introduced a new symbol.

Modified: mysql-5.1/branches/unstable/debian/control
===================================================================
--- mysql-5.1/branches/unstable/debian/control	2011-06-04 14:10:40 UTC (rev 1977)
+++ mysql-5.1/branches/unstable/debian/control	2011-06-18 17:31:57 UTC (rev 1978)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian MySQL Maintainers <pkg-mysql-maint at lists.alioth.debian.org>
 Uploaders: Norbert Tretkowski <norbert at tretkowski.de>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper (>= 7.0.15), file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen-latex, ghostscript, dpatch, gawk, bison, lsb-release, hardening-wrapper
+Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper (>= 7.0.15), file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen-latex, ghostscript, dpatch, gawk, bison, lsb-release, hardening-wrapper, gcc-4.5, g++-4.5
 Standards-Version: 3.9.1
 Homepage: http://dev.mysql.com/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-dfsg-5.1/

Modified: mysql-5.1/branches/unstable/debian/mysql-server-5.1.preinst
===================================================================
--- mysql-5.1/branches/unstable/debian/mysql-server-5.1.preinst	2011-06-04 14:10:40 UTC (rev 1977)
+++ mysql-5.1/branches/unstable/debian/mysql-server-5.1.preinst	2011-06-18 17:31:57 UTC (rev 1978)
@@ -49,7 +49,7 @@
 this_version=5.1
 
 # Abort if an NDB cluster is in use.
-if egrep -qi -r '^[^#]*ndb.connectstring|^[:space:]*\[[:space:]*ndb_mgmd' /etc/mysql/; then
+if egrep -qi -r '^[^#]*ndb.connectstring|^[[:space:]]*\[[:space:]*ndb_mgmd' /etc/mysql/; then
   db_fset mysql-server/no_upgrade_when_using_ndb seen false || true
   db_input high mysql-server/no_upgrade_when_using_ndb || true
   db_go

Modified: mysql-5.1/branches/unstable/debian/rules
===================================================================
--- mysql-5.1/branches/unstable/debian/rules	2011-06-04 14:10:40 UTC (rev 1977)
+++ mysql-5.1/branches/unstable/debian/rules	2011-06-18 17:31:57 UTC (rev 1978)
@@ -15,6 +15,9 @@
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEBVERSION = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
 
+export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc-4.5
+export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++-4.5
+
 DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
 DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-)
@@ -73,9 +76,9 @@
 	( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
 	sh -c  'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
 	    	CC=$${MYSQL_BUILD_CC:-gcc} \
-		CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -DBIG_JOINS=1 ${FORCE_FPIC_CFLAGS} -fno-strict-aliasing"} \
+		CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O3 -DBIG_JOINS=1 ${FORCE_FPIC_CFLAGS} -fno-strict-aliasing"} \
 	    	CXX=$${MYSQL_BUILD_CXX:-g++} \
-	    	CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O2 -DBIG_JOINS=1 -felide-constructors -fno-exceptions -fno-rtti ${FORCE_FPIC_CFLAGS}"} \
+	    	CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -DBIG_JOINS=1 -felide-constructors -fno-exceptions -fno-rtti ${FORCE_FPIC_CFLAGS}"} \
 	    ../configure \
 		--build=${DEB_BUILD_GNU_TYPE} \
 		--host=${DEB_HOST_GNU_TYPE} \


