[Pkg-mysql-commits] r2041 - mysql-5.5/branches/experimental/debian

[Clint Byrum]

Author: spamaps-guest
Date: 2012-01-24 00:00:58 +0000 (Tue, 24 Jan 2012)
New Revision: 2041

Modified:
   mysql-5.5/branches/experimental/debian/changelog
   mysql-5.5/branches/experimental/debian/control
   mysql-5.5/branches/experimental/debian/rules
Log:
* New Upstream Release
* d/rules, d/control: 5.5.20 Fixes segfault on tests with gcc 4.6,
  change compiler back to system default.

Modified: mysql-5.5/branches/experimental/debian/changelog
===================================================================
--- mysql-5.5/branches/experimental/debian/changelog	2011-11-29 06:01:38 UTC (rev 2040)
+++ mysql-5.5/branches/experimental/debian/changelog	2012-01-24 00:00:58 UTC (rev 2041)
@@ -1,13 +1,16 @@
-mysql-5.5 (5.5.17-5) UNRELEASED; urgency=low
+mysql-5.5 (5.5.20-1) UNRELEASED; urgency=low
 
   [ Guillaume Plessis ]
   * d/rules: Enabling ARCHIVE, BLACKHOLE, and FEDERATED engines.
     (Closes: #649484)
 
-  [Clint Byrum ]
+  [ Clint Byrum ]
+  * New Upstream Release
   * d/copyright: rearranging to have standalone license paragraphs
     silencing lintian complaints about missing paragraphs.
   * d/mysql-client-5.5.files: add mysql_plugin
+  * d/rules, d/control: 5.5.20 Fixes segfault on tests with gcc 4.6,
+    change compiler back to system default.
   * Sync changes back from Ubuntu:
       * d/control: need to also break mysql-client-core-5.1 and
         mysql-server-core-5.1 as well so that apt knows not to
@@ -34,7 +37,7 @@
       * d/patches/70_mysql_va_list.patch: cherry pick patch from
         upstream bug tracker to fix ARM build failure. (LP: #700982)
 
- -- Clint Byrum <clint at ubuntu.com>  Tue, 22 Nov 2011 22:41:18 -0800
+ -- Clint Byrum <clint at ubuntu.com>  Mon, 23 Jan 2012 15:46:40 -0800
 
 mysql-5.5 (5.5.17-4) experimental; urgency=low
 

Modified: mysql-5.5/branches/experimental/debian/control
===================================================================
--- mysql-5.5/branches/experimental/debian/control	2011-11-29 06:01:38 UTC (rev 2040)
+++ mysql-5.5/branches/experimental/debian/control	2012-01-24 00:00:58 UTC (rev 2041)
@@ -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>, Clint Byrum <clint at ubuntu.com>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper (>= 8.1.3~), 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, doxygen-latex, ghostscript,  gawk, bison, lsb-release, hardening-wrapper, cmake, gcc-4.5, g++-4.5
+Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper (>= 8.1.3~), 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, doxygen-latex, ghostscript,  gawk, bison, lsb-release, hardening-wrapper, cmake
 Standards-Version: 3.9.2
 Homepage: http://dev.mysql.com/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-5.5/

Modified: mysql-5.5/branches/experimental/debian/rules
===================================================================
--- mysql-5.5/branches/experimental/debian/rules	2011-11-29 06:01:38 UTC (rev 2040)
+++ mysql-5.5/branches/experimental/debian/rules	2012-01-24 00:00:58 UTC (rev 2041)
@@ -13,8 +13,8 @@
 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
+export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc
+export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++
 
 DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
 DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')