[SCM] tango branch, master, updated. debian/8.0.5+dfsg-1-1-g1dd4c13

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

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

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/changelog
    	debian/patches/0002-debian-my.cnf.in.patch

diff --combined debian/changelog
index 602563f,56ecfaf..71f9b92
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,11 +1,28 @@@
 +tango (8.0.5+dfsg-1) UNRELEASED; urgency=low
 +
 +  * Imported Upstream version 8.0.5+dfsg
 +  * reorganize packages for tango8.
 +  * debian/patches
 +    - 0001-debian-fix_database_scripts.patch (refreshed)
 +    - 0002-debian-my.cnf.in.patch (refreshed)
 +    - 0003-debian-notify_daemon.patch (refreshed)
 +    - 0004-upstream-fix-bug3285674.patch (deleted)
 +    - 0005-upstream-fix-bug3213730.patch (deleted)
 +    - 0006-feature-forwarded-upstream-pkg-config-small-fixes.patch (deleted)
 +    - 0007-upstream-fix-tango-db-start-during-init.patch (deleted)
 +    - 0008-feature-add-jpegmmx-option-to-configure-script.patch (deleted)
 +    - 0009-upstream-fix-bug3339975.patch (deleted)
 +
 + -- Picca Frédéric-Emmanuel <picca at debian.org>  Mon, 28 May 2012 09:38:26 +0200
 +
+ 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

-- 
TANGO distributed control system.