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

Nicholas Bamber periapt at alioth.debian.org
Sat May 5 15:27:06 UTC 2012


Author: periapt
Date: 2012-05-05 15:27:06 +0000 (Sat, 05 May 2012)
New Revision: 2085

Added:
   mysql-5.5/branches/experimental/debian/libmysqlclient18.install
Removed:
   mysql-5.5/branches/experimental/debian/libmysqlclient18.files
Modified:
   mysql-5.5/branches/experimental/debian/changelog
   mysql-5.5/branches/experimental/debian/control
   mysql-5.5/branches/experimental/debian/mysql-common.postrm
   mysql-5.5/branches/experimental/debian/mysql-server-5.5.config
   mysql-5.5/branches/experimental/debian/mysql-server-5.5.postinst
   mysql-5.5/branches/experimental/debian/mysql-server-5.5.postrm
   mysql-5.5/branches/experimental/debian/mysql-server-5.5.preinst
   mysql-5.5/branches/experimental/debian/mysql-server-5.5.prerm
Log:
  for determining the number of CPUs.
* Removed dependency on procps as it is required by cmake, cf. #96768
* Migrated libmysqld-dev, libmysqld-pic, libmysqlclient18 to using
  dh_install rather than dh_movefiles
* Moved '-e' from shebang line to explicit 'set -e' as requested by lintian

Modified: mysql-5.5/branches/experimental/debian/changelog
===================================================================
--- mysql-5.5/branches/experimental/debian/changelog	2012-05-05 12:32:23 UTC (rev 2084)
+++ mysql-5.5/branches/experimental/debian/changelog	2012-05-05 15:27:06 UTC (rev 2085)
@@ -2,12 +2,13 @@
 
   * Stopped overriding the -j build parameter (Closes: #512964)
   * Stopped testing for /proc filesystem. It is no longer used
-    for determining the number of CPUs. The procps package itself
-    is probably still required as per #96768
-  * Migrated libmysqld-dev, libmysqld-pic to using dh_install rather
-    than dh_movefiles
+    for determining the number of CPUs.
+  * Removed dependency on procps as it is required by cmake, cf. #96768
+  * Migrated libmysqld-dev, libmysqld-pic, libmysqlclient18 to using
+    dh_install rather than dh_movefiles
   * Changed /var/run to /run as required by Debian Policy 3.9.3 (9.1.1)
   * Raised standards version to 3.9.3
+  * Moved '-e' from shebang line to explicit 'set -e' as requested by lintian
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Fri, 04 May 2012 07:26:25 +0100
 

Modified: mysql-5.5/branches/experimental/debian/control
===================================================================
--- mysql-5.5/branches/experimental/debian/control	2012-05-05 12:32:23 UTC (rev 2084)
+++ mysql-5.5/branches/experimental/debian/control	2012-05-05 15:27:06 UTC (rev 2085)
@@ -4,7 +4,7 @@
 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>, Nicholas Bamber <nicholas at periapt.co.uk>
-Build-Depends: libtool (>= 1.4.2-7), procps[!hurd-i386],  debhelper (>= 8.1.3~), file (>= 3.28), libaio-dev [linux-any], 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, libssl-dev
+Build-Depends: libtool (>= 1.4.2-7), debhelper (>= 8.1.3~), file (>= 3.28), libaio-dev [linux-any], 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, libssl-dev
 Standards-Version: 3.9.3
 Homepage: http://dev.mysql.com/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-5.5/

Deleted: mysql-5.5/branches/experimental/debian/libmysqlclient18.files
===================================================================
--- mysql-5.5/branches/experimental/debian/libmysqlclient18.files	2012-05-05 12:32:23 UTC (rev 2084)
+++ mysql-5.5/branches/experimental/debian/libmysqlclient18.files	2012-05-05 15:27:06 UTC (rev 2085)
@@ -1,2 +0,0 @@
-usr/lib/*/libmysqlclient.so.*
-usr/lib/*/libmysqlclient_r.so.*

Added: mysql-5.5/branches/experimental/debian/libmysqlclient18.install
===================================================================
--- mysql-5.5/branches/experimental/debian/libmysqlclient18.install	                        (rev 0)
+++ mysql-5.5/branches/experimental/debian/libmysqlclient18.install	2012-05-05 15:27:06 UTC (rev 2085)
@@ -0,0 +1,2 @@
+usr/lib/*/libmysqlclient.so.*
+usr/lib/*/libmysqlclient_r.so.*

Modified: mysql-5.5/branches/experimental/debian/mysql-common.postrm
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-common.postrm	2012-05-05 12:32:23 UTC (rev 2084)
+++ mysql-5.5/branches/experimental/debian/mysql-common.postrm	2012-05-05 15:27:06 UTC (rev 2085)
@@ -1,5 +1,7 @@
-#!/bin/bash -e
+#!/bin/bash
 
+set -e
+
 if [ "$1" = "purge" ]; then
   rmdir /etc/mysql 2>/dev/null || true
 fi

Modified: mysql-5.5/branches/experimental/debian/mysql-server-5.5.config
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-server-5.5.config	2012-05-05 12:32:23 UTC (rev 2084)
+++ mysql-5.5/branches/experimental/debian/mysql-server-5.5.config	2012-05-05 15:27:06 UTC (rev 2085)
@@ -1,5 +1,7 @@
-#!/bin/bash -e
+#!/bin/bash
 
+set -e
+
 . /usr/share/debconf/confmodule
 
 if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi

Modified: mysql-5.5/branches/experimental/debian/mysql-server-5.5.postinst
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-server-5.5.postinst	2012-05-05 12:32:23 UTC (rev 2084)
+++ mysql-5.5/branches/experimental/debian/mysql-server-5.5.postinst	2012-05-05 15:27:06 UTC (rev 2085)
@@ -1,5 +1,7 @@
-#!/bin/bash -e
+#!/bin/bash
 
+set -e
+
 . /usr/share/debconf/confmodule
 
 if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi

Modified: mysql-5.5/branches/experimental/debian/mysql-server-5.5.postrm
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-server-5.5.postrm	2012-05-05 12:32:23 UTC (rev 2084)
+++ mysql-5.5/branches/experimental/debian/mysql-server-5.5.postrm	2012-05-05 15:27:06 UTC (rev 2085)
@@ -1,5 +1,7 @@
-#!/bin/bash -e
+#!/bin/bash
 
+set -e
+
 # It is possible that Debconf has already been removed, too.
 if [ -f /usr/share/debconf/confmodule ]; then
   . /usr/share/debconf/confmodule

Modified: mysql-5.5/branches/experimental/debian/mysql-server-5.5.preinst
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-server-5.5.preinst	2012-05-05 12:32:23 UTC (rev 2084)
+++ mysql-5.5/branches/experimental/debian/mysql-server-5.5.preinst	2012-05-05 15:27:06 UTC (rev 2085)
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash
 #
 # summary of how this script can be called:
 #        * <new-preinst> install
@@ -7,6 +7,8 @@
 #        * <old-preinst> abort-upgrade <new-version>
 #
 
+set -e
+
 . /usr/share/debconf/confmodule
 
 if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi

Modified: mysql-5.5/branches/experimental/debian/mysql-server-5.5.prerm
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-server-5.5.prerm	2012-05-05 12:32:23 UTC (rev 2084)
+++ mysql-5.5/branches/experimental/debian/mysql-server-5.5.prerm	2012-05-05 15:27:06 UTC (rev 2085)
@@ -1,5 +1,7 @@
-#!/bin/bash -e
+#!/bin/bash
 
+set -e
+
 . /usr/share/debconf/confmodule
 
 if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi




More information about the Pkg-mysql-commits mailing list