Merge tag 'mariadb-5.5.44' into 5.5-galera

4 files changed, 23 insertions, 23 deletions

diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
index 5472ce86b28..9ff7705b007 100644
--- a/debian/dist/Debian/control
+++ b/debian/dist/Debian/control
@@ -4,12 +4,12 @@ Priority: optional
 Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
 XSBC-Original-Maintainer: Maria Developers <maria-developers@lists.launchpad.net>
 Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28),
-    libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3),
-    zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-dev, libssl-dev,
-    libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen,
-    texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release,
-    hardening-wrapper, ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0)
+Build-Depends: procps | hurd, debhelper, libncurses5-dev (>= 5.0-6),
+               perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3),
+               zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-dev,
+               libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath,
+               dpatch, gawk, bison, lsb-release, hardening-wrapper,
+               ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0)
 Standards-Version: 3.8.3
 Homepage: http://mariadb.org/
 Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files
diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
index ce58ed94914..7d6e90abd82 100644
--- a/debian/dist/Ubuntu/control
+++ b/debian/dist/Ubuntu/control
@@ -4,12 +4,12 @@ Priority: optional
 Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
 XSBC-Original-Maintainer: Maria Developers <maria-developers@lists.launchpad.net>
 Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28),
-    libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3),
-    zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-dev, libssl-dev,
-    libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen,
-    texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release,
-    hardening-wrapper, ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0)
+Build-Depends: procps | hurd, debhelper, libncurses5-dev (>= 5.0-6),
+               perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3),
+               zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-dev,
+               libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath,
+               dpatch, gawk, bison, lsb-release, hardening-wrapper,
+               ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0)
 Standards-Version: 3.8.2
 Homepage: http://mariadb.org/
 Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files
diff --git a/debian/po/it.po b/debian/po/it.po
index 3cb92f9bc3e..b3b0a808303 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -1,8 +1,8 @@
-# Italian (it) translation of debconf templates for mysql-dfsg-5.1

-# Copyright (C) 2009 Software in the Public Interest

-# This file is distributed under the same license as the mysql-dfsg-5.1 package.

-# Luca Monducci <luca.mo@tiscali.it>, 2006 - 2009.

-# 

+# Italian (it) translation of debconf templates for mysql-dfsg-5.1
+# Copyright (C) 2009 Software in the Public Interest
+# This file is distributed under the same license as the mysql-dfsg-5.1 package.
+# Luca Monducci <luca.mo@tiscali.it>, 2006 - 2009.
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.1.37 italian debconf templates\n"
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 374601a97c2..e50af88f373 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -1,9 +1,9 @@
-# Translation of mysql-dfsg-5.1 debconf template to Swedish

-# Copyright (C) 2009 Martin Bagge <brother@bsnet.se>

-# This file is distributed under the same license as the mysql-dfsg-5.1 package.

-# 

-# Andreas Henriksson <andreas@fatal.se>, 2007

-# Martin Bagge <brother@bsnet.se>, 2009

+# Translation of mysql-dfsg-5.1 debconf template to Swedish
+# Copyright (C) 2009 Martin Bagge <brother@bsnet.se>
+# This file is distributed under the same license as the mysql-dfsg-5.1 package.
+# 
+# Andreas Henriksson <andreas@fatal.se>, 2007
+# Martin Bagge <brother@bsnet.se>, 2009
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.0.21-3\n"