[SCM] tango branch, master, updated. debian/7.2.6+dfsg-13-1-g0db071e

[Picca Frédéric-Emma?==?UTF-8?Q?nuel]

The following commit has been merged in the master branch:
commit 0db071e1108b15470281ea7c61602625a75309e9
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Sep 15 08:36:06 2012 +0200

    regenerate the patch series to solve 684332

diff --git a/debian/changelog b/debian/changelog
index 22c6976..56ecfaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tango (7.2.6+dfsg-14) unstable; urgency=low
+
+  * debian/patch
+    - 0002-debian-my.cnf.in.patch (updated) (Closes: #684332)
+      put the right user in my.cnf using dbconfig-common template engine
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Sat, 15 Sep 2012 08:31:51 +0200
+
 tango (7.2.6+dfsg-13) unstable; urgency=low
 
   * Bump Standards-Version to 3.9.3
diff --git a/debian/patches/0002-debian-my.cnf.in.patch b/debian/patches/0002-debian-my.cnf.in.patch
index 71f682c..566494e 100644
--- a/debian/patches/0002-debian-my.cnf.in.patch
+++ b/debian/patches/0002-debian-my.cnf.in.patch
@@ -1,6 +1,5 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?=
- <picca at synchrotron-soleil.fr>
-Date: Tue, 22 Mar 2011 15:25:38 +0100
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Sat, 15 Sep 2012 08:25:42 +0200
 Subject: debian/my.cnf.in
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -10,19 +9,20 @@ set the right parameters for the mysql configuration file
 
 Signed-off-by: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
 ---
- cppserver/database/my.cnf.in |    9 ++++-----
- 1 files changed, 4 insertions(+), 5 deletions(-)
+ cppserver/database/my.cnf.in |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/cppserver/database/my.cnf.in b/cppserver/database/my.cnf.in
-index 69f574c..8bae2c7 100644
+index 69f574c..a43ae74 100644
 --- a/cppserver/database/my.cnf.in
 +++ b/cppserver/database/my.cnf.in
-@@ -29,11 +29,10 @@
+@@ -29,11 +29,11 @@
  # MySQL client library initialization.
  #
  [client]
 -#password	= [your_password]
 -#user			= [your_user]
++user		= _DBC_DBUSER_
 +password	= _DBC_DBPASS_
  
 -port			= 3306
@@ -32,7 +32,7 @@ index 69f574c..8bae2c7 100644
  
  # *** Application-specific options follow here ***
  
-@@ -44,7 +43,7 @@ socket		= /tmp/mysql.sock
+@@ -44,7 +44,7 @@ socket		= /tmp/mysql.sock
  
  # generic configuration options
  port		= 3306
@@ -41,4 +41,3 @@ index 69f574c..8bae2c7 100644
  
  # back_log is the number of connections the operating system can keep in
  # the listen queue, before the MySQL connection manager thread has
--- 

-- 
TANGO distributed control system.