* Updated German translation (Closes: #675766)

* Ensured that /etc/mysql/conf.d is installed as part of mysql-common
  so that client programs work without a co-located server (Closes: #672359)

git-svn-id: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/branches/unstable@2137 bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1

4 files changed, 8 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index 8368099..11b6587 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ mysql-5.5 (5.5.24+dfsg-1) UNRELEASED; urgency=low
   * Updated Russian translation (Closes: #674189)
   * Updated Portuguese translation (Closes: #674953)
   * Updated Swedish translation (Closes: #675108)
+  * Updated German translation (Closes: #675766)
   * Migrated libmysqlclient-dev, mysql-client-5.5, mysql-server-core-5.5
     and mysql-server-5.5 off dh_movefiles
   * Removed dh_movefiles override
@@ -48,6 +49,8 @@ mysql-5.5 (5.5.24+dfsg-1) UNRELEASED; urgency=low
     and (Closes: #673865)
   * Added patch to libmysql/CMakeLists.txt to restore symbol versioning
     and bumped dependency in shlibs (Closes: #660686)
+  * Ensured that /etc/mysql/conf.d is installed as part of mysql-common
+    so that client programs work without a co-located server (Closes: #672359)
 
  -- Nicholas Bamber <nicholas@periapt.co.uk>  Tue, 08 May 2012 09:04:25 +0100
 
diff --git a/debian/mysql-common.install b/debian/mysql-common.install
index 838e425..f77a066 100644
--- a/debian/mysql-common.install
+++ b/debian/mysql-common.install
@@ -1 +1,2 @@
 debian/additions/my.cnf etc/mysql/
+debian/tmp/etc/mysql/conf.d/.keepme etc/mysql/conf.d
diff --git a/debian/po/de.po b/debian/po/de.po
index 6352e7f..94b08f2 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -14,10 +14,10 @@
 # Thomas Mueller <thomas.mueller@tmit.eu>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: mysql-dfsg-5.5_5.5.37-1_de\n"
+"Project-Id-Version: mysql-dfsg 5.5.23-2\n"
 "Report-Msgid-Bugs-To: mysql-5.5@packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
-"PO-Revision-Date: 2009-08-27 22:41+0200\n"
+"PO-Revision-Date: 2012-06-03 10:33+0200\n"
 "Last-Translator: Thomas Mueller <thomas.mueller@tmit.eu>\n"
 "Language-Team: german <debian-l10n-german@lists.debian.org>\n"
 "Language: \n"
@@ -189,10 +189,6 @@ msgstr ""
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:8001
-#, fuzzy
-#| msgid ""
-#| "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for "
-#| "more information."
 msgid ""
 "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
 "information."
@@ -223,17 +219,12 @@ msgstr "NDB-Cluster scheint gerade benutzt zu werden"
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:10001
-#, fuzzy
-#| msgid ""
-#| "MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the "
-#| "new mysql-cluster package and remove all lines starting with \"ndb\" from "
-#| "all config files below /etc/mysql/."
 msgid ""
 "MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster-server package and remove all lines starting with \"ndb\" from "
 "all config files below /etc/mysql/."
 msgstr ""
 "MySQL-5.5 bietet keine NDB-Clusterunterstützung mehr. Bitte migrieren Sie "
-"Ihr System zum neuen »mysql-cluster«-Paket und entfernen Sie alle Zeilen, "
+"Ihr System zum neuen »mysql-cluster-server«-Paket und entfernen Sie alle Zeilen, "
 "die mit »ndb« beginnen aus allen Konfigurationsdateien im Verzeichnis /etc/"
 "mysql/."
diff --git a/debian/rules b/debian/rules
index cd94b47..b1784b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -162,6 +162,7 @@ auto_install-stamp:
 	# This seems to be the only safe place to fix permissions issues
         # not handled by dh_fixperms.
 	mkdir -p $(TMP)/etc/mysql/conf.d/
+	touch $(TMP)/etc/mysql/conf.d/.keepme
 	install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/
 	install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/
 	install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/