[Pkg-mysql-commits] r1029 - branches/sid-5.1/debian

[Norbert Tretkowski]

tags 448776 pending
tags 452558 pending
tags 453127 pending
thanks

Author: nobse
Date: 2007-11-30 14:29:09 +0000 (Fri, 30 Nov 2007)
New Revision: 1029

Modified:
   branches/sid-5.1/debian/changelog
   branches/sid-5.1/debian/control
   branches/sid-5.1/debian/rules
Log:
Merge 5.0 r1025

Modified: branches/sid-5.1/debian/changelog
===================================================================
--- branches/sid-5.1/debian/changelog	2007-11-30 13:27:53 UTC (rev 1028)
+++ branches/sid-5.1/debian/changelog	2007-11-30 14:29:09 UTC (rev 1029)
@@ -191,12 +191,21 @@
 
 mysql-dfsg-5.0 (5.0.45-4) UNRELEASED; urgency=low
 
+  * Re-add manpages, they are licensed under GPL now and redistribution is
+    permitted.
   * Drop linux-libc-dev build-dependency, it's now being pulled by libc-dev
     which is build-essential. (closes: #431018)
   * Remove old optimizations for MySQL 3.23.x, they are no longer required.
     (closes: #436552)
+  * New patch from Ubuntu to fix a crash in mysql_client_test due to gcc 4.x
+    optimizations. (closes: #452558)
+  * Don't fail when upgrading mysql-common if $datadir is empty or not defined
+    (patch from Edward Allcutt). (closes: #453127)
+  * New Finnish debconf translation from Esko Arajärvi. (closes: #448776)
+  * Run testsuite after build (but skip ndb tests for now).
+  * Add Vcs-* and Homepage flags to source stanza in control file.
 
- -- Norbert Tretkowski <nobse at debian.org>  Mon, 19 Nov 2007 21:58:47 +0100
+ -- Norbert Tretkowski <nobse at debian.org>  Fri, 30 Nov 2007 14:19:47 +0100
 
 mysql-dfsg-5.0 (5.0.45-3) unstable; urgency=high
 

Modified: branches/sid-5.1/debian/control
===================================================================
--- branches/sid-5.1/debian/control	2007-11-30 13:27:53 UTC (rev 1028)
+++ branches/sid-5.1/debian/control	2007-11-30 14:29:09 UTC (rev 1029)
@@ -5,6 +5,9 @@
 Uploaders: Christian Hammers <ch at debian.org>, Sean Finney <seanius at debian.org>, Adam Conrad <adconrad at 0c3.net>, Monty Taylor <mtaylor at mysql.com>, Norbert Tretkowski <nobse at debian.org>
 Build-Depends: libtool (>= 1.4.2-7), 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.9, doxygen, texlive-latex-base, gs, dpatch, gawk, bison
 Standards-Version: 3.7.2
+Homepage: http://dev.mysql.com/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-mysql/
 
 Package: libmysqlclient16
 Section: libs

Modified: branches/sid-5.1/debian/rules
===================================================================
--- branches/sid-5.1/debian/rules	2007-11-30 13:27:53 UTC (rev 1028)
+++ branches/sid-5.1/debian/rules	2007-11-30 14:29:09 UTC (rev 1029)
@@ -14,6 +14,12 @@
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEBVERSION = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
 
+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-)
+DEB_UPSTREAM_VERSION ?= $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_UPSTREAM_VERSION_MAJOR_MINOR := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r -n 's/^([0-9]+\.[0-9]+).*/\1/p')
+
 MAKE_J = -j$(shell grep -c processor.* /proc/cpuinfo)
 ifeq (${MAKE_J}, -j0)
   MAKE_J = -j1
@@ -117,6 +123,13 @@
 
 	$(MAKE) $(MAKE_J)
 
+	if [ ! -f testsuite-stamp ]; then \
+	  cd mysql-test ; \
+	  /usr/bin/perl ./mysql-test-run.pl --skip-ndb ; \
+	fi
+
+	touch testsuite-stamp
+
 	touch build-stamp
 	
 
@@ -128,6 +141,7 @@
 	dh_testroot
 	rm -f configure-stamp
 	rm -f build-stamp
+	rm -f testsuite-stamp
 	
 	[ ! -f Makefile ] || $(MAKE) distclean
 
@@ -316,6 +330,19 @@
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
 binary:	binary-indep binary-arch
+
+get-orig-source:
+	@wget -nv -T10 -t3 \
+	  -O /tmp/mysql-$(DEB_UPSTREAM_VERSION).tar.gz \
+	  http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-$(DEB_UPSTREAM_VERSION_MAJOR_MINOR)/mysql-$(DEB_UPSTREAM_VERSION).tar.gz
+	@tar xfz /tmp/mysql-$(DEB_UPSTREAM_VERSION).tar.gz -C /tmp
+	@rm -rf /tmp/mysql-$(DEB_UPSTREAM_VERSION)/Docs
+	@rm -rf /tmp/mysql-$(DEB_UPSTREAM_VERSION)/debian
+	@mv /tmp/mysql-$(DEB_UPSTREAM_VERSION) /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig
+	@cd /tmp ; tar czf $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig
+	@rm -f /tmp/mysql-$(DEB_UPSTREAM_VERSION).tar.gz
+	@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig
+
 .PHONY: clean clean-patched configure build binary binary-indep binary-arch install patch unpatch
 
 # vim: ts=8