[Pkg-mysql-commits] r1980 - mysql-proxy/trunk/debian

[Norbert Tretkowski]

tags 578403 pending
thanks

Author: nobse
Date: 2011-06-21 18:24:41 +0000 (Tue, 21 Jun 2011)
New Revision: 1980

Modified:
   mysql-proxy/trunk/debian/changelog
   mysql-proxy/trunk/debian/control
   mysql-proxy/trunk/debian/init
   mysql-proxy/trunk/debian/rules
Log:
Import NMUs.

Modified: mysql-proxy/trunk/debian/changelog
===================================================================
--- mysql-proxy/trunk/debian/changelog	2011-06-21 08:35:45 UTC (rev 1979)
+++ mysql-proxy/trunk/debian/changelog	2011-06-21 18:24:41 UTC (rev 1980)
@@ -1,11 +1,22 @@
-mysql-proxy (0.8.0-2) unstable; urgency=low
+mysql-proxy (0.8.0-1.2) unstable; urgency=low
 
-  * Fix FTBFS on sparc. (closes: #575246)
-  * Bump Standards-Version to 3.8.4 (no changes).
-  * Add ${misc:Depends} dependency to make lintian happy.
+  * Non-maintainer upload.
+  * Fix "DAEMON=".." in initscripts points to": point DAEMON to
+    /usr/bin/mysql-proxy; patch from Chris Lamb (closes: #578403).
+  * init script: add dependency on $remote_fs to Required-Start and
+    Required-Stop.
 
- -- Norbert Tretkowski <norbert at tretkowski.de>  Sat, 15 May 2010 14:52:03 +0200
+ -- gregor herrmann <gregoa at debian.org>  Sat, 02 Oct 2010 16:03:38 +0200
 
+mysql-proxy (0.8.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Clean up after upstream build system properly
+  * Fix FTBFS on sparc (Closes: #575246)
+  * Correctly version the libevent build-dependency
+
+ -- Paul Wise <pabs at debian.org>  Sat, 21 Aug 2010 08:29:43 +0000
+
 mysql-proxy (0.8.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: mysql-proxy/trunk/debian/control
===================================================================
--- mysql-proxy/trunk/debian/control	2011-06-21 08:35:45 UTC (rev 1979)
+++ mysql-proxy/trunk/debian/control	2011-06-21 18:24:41 UTC (rev 1980)
@@ -2,16 +2,16 @@
 Section: database
 Priority: extra
 Maintainer: Debian MySQL Maintainers <pkg-mysql-maint at lists.alioth.debian.org>
-Uploaders: Norbert Tretkowski <norbert at tretkowski.de>
-Build-Depends: debhelper (>= 5), autotools-dev, libmysqlclient-dev, liblua5.1-dev, pkg-config, libglib2.0-dev, libevent-dev, check, dpatch
-Standards-Version: 3.8.4
+Uploaders: Norbert Tretkowski <nobse at debian.org>
+Build-Depends: debhelper (>= 5), autotools-dev, libmysqlclient-dev, liblua5.1-dev, pkg-config, libglib2.0-dev, libevent-dev (>= 1.4), check
+Standards-Version: 3.8.3
 Homepage: http://forge.mysql.com/wiki/MySQL_Proxy
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-proxy/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-mysql/mysql-proxy/
 
 Package: mysql-proxy
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}
 Description: high availability, load balancing and query modification for mysql
  MySQL Proxy stands between database servers and clients to provide load
  balancing and failover. Incoming queries can be filtered and modified using

Modified: mysql-proxy/trunk/debian/init
===================================================================
--- mysql-proxy/trunk/debian/init	2011-06-21 08:35:45 UTC (rev 1979)
+++ mysql-proxy/trunk/debian/init	2011-06-21 18:24:41 UTC (rev 1980)
@@ -2,8 +2,8 @@
 
 ### BEGIN INIT INFO
 # Provides:             mysql-proxy
-# Required-Start:       $syslog
-# Required-Stop:        $syslog
+# Required-Start:       $syslog $remote_fs
+# Required-Stop:        $syslog $remote_fs
 # Default-Start:        2 3 4 5
 # Default-Stop:         0 1 6
 # Short-Description:    MySQL Proxy
@@ -12,7 +12,7 @@
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 LUA_PATH="/usr/share/mysql-proxy/?.lua"
 
-DAEMON="/usr/sbin/mysql-proxy"
+DAEMON="/usr/bin/mysql-proxy"
 PIDFILE="/var/run/mysql-proxy.pid"
 
 test -f $DAEMON || exit 0

Modified: mysql-proxy/trunk/debian/rules
===================================================================
--- mysql-proxy/trunk/debian/rules	2011-06-21 08:35:45 UTC (rev 1979)
+++ mysql-proxy/trunk/debian/rules	2011-06-21 18:24:41 UTC (rev 1980)
@@ -45,7 +45,7 @@
 	rm -f build-stamp 
 
 	# Add here commands to clean up after the build process.
-	#$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f config.sub config.guess
 
 	dh_clean