[Pkg-mysql-commits] r2134 - in mysql-5.5/branches/wheezy/debian: . po

[Nicholas Bamber]

tags 675766 pending
thanks

Author: periapt
Date: 2012-06-03 22:32:07 +0000 (Sun, 03 Jun 2012)
New Revision: 2134

Modified:
   mysql-5.5/branches/wheezy/debian/changelog
   mysql-5.5/branches/wheezy/debian/control
   mysql-5.5/branches/wheezy/debian/po/de.po
Log:
* Updated German translation (Closes: #675766)
* Added versioned Breaks clause against amarok (cf. #675304)

Modified: mysql-5.5/branches/wheezy/debian/changelog
===================================================================
--- mysql-5.5/branches/wheezy/debian/changelog	2012-06-03 17:28:15 UTC (rev 2133)
+++ mysql-5.5/branches/wheezy/debian/changelog	2012-06-03 22:32:07 UTC (rev 2134)
@@ -3,11 +3,13 @@
   * New upstream release. Fixes CVE-2012-2102 mysql DoS by authenticated user
   * Updated Portuguese translation (Closes: #674953)
   * Updated Swedish translation (Closes: #675108)
+  * Updated German translation (Closes: #675766)
   * Refreshed spelling patch
   * 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)
+  * Added versioned Breaks clause against amarok (cf. #675304)
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Thu, 31 May 2012 09:00:25 +0100
 

Modified: mysql-5.5/branches/wheezy/debian/control
===================================================================
--- mysql-5.5/branches/wheezy/debian/control	2012-06-03 17:28:15 UTC (rev 2133)
+++ mysql-5.5/branches/wheezy/debian/control	2012-06-03 22:32:07 UTC (rev 2134)
@@ -66,7 +66,7 @@
 Package: mysql-common
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: mysql-server-5.1 (<< 5.5), mysql-client-5.1 (<< 5.5), mysql-server-core-5.1 (<< 5.5)
+Breaks: mysql-server-5.1 (<< 5.5), mysql-client-5.1 (<< 5.5), mysql-server-core-5.1 (<< 5.5), amarok (<< 2.5.0-2)
 Multi-Arch: foreign
 Description: MySQL database common files, e.g. /etc/mysql/my.cnf
  MySQL is a fast, stable and true multi-user, multi-threaded SQL database

Modified: mysql-5.5/branches/wheezy/debian/po/de.po
===================================================================
--- mysql-5.5/branches/wheezy/debian/po/de.po	2012-06-03 17:28:15 UTC (rev 2133)
+++ mysql-5.5/branches/wheezy/debian/po/de.po	2012-06-03 22:32:07 UTC (rev 2134)
@@ -14,10 +14,10 @@
 # Thomas Mueller <thomas.mueller at 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 at 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 at tmit.eu>\n"
 "Language-Team: german <debian-l10n-german at lists.debian.org>\n"
 "Language: \n"
@@ -189,10 +189,6 @@
 #. 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 @@
 #. 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/."