diff options
author | Sven Hartge <sven@svenhartge.de> | 2020-10-02 22:05:06 +0200 |
---|---|---|
committer | Sven Hartge <sven@svenhartge.de> | 2020-10-02 22:05:06 +0200 |
commit | 88c35ef19559c1add8189b2630bd4c6cff51ea78 (patch) | |
tree | 69145acb1ac879ed47b6f626bcc8f47487f9b846 | |
parent | 336e907986930dbcc7767af17540084769727dce (diff) | |
parent | 6b835df88ee59bf4992b8535123be80dcf4fed50 (diff) |
Merge tag 'debian/9.6.6-2' into buster-backportsdebian/9.6.6-2_bpo10+1
bacula release 9.6.6-2 for unstable (sid)
(maintainer view tag generated by dgit --quilt=gbp)
-rw-r--r-- | debian/changelog | 17 | ||||
-rw-r--r-- | debian/patches/series | 1 | ||||
-rw-r--r-- | debian/patches/upstream/fix-make_db-scripts_easier_to_use | 2 | ||||
-rw-r--r-- | debian/patches/upstream/fix_en_AR.po_errors | 126 | ||||
-rwxr-xr-x | debian/rules | 7 |
5 files changed, 150 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 5be4232b..51f14668 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,21 @@ -bacula (9.6.6-1~bpo10+1) buster-backports; urgency=medium +bacula (9.6.6-2~bpo10+1) buster-backports; urgency=medium * Rebuild for buster-backports. - -- Sven Hartge <sven@svenhartge.de> Thu, 01 Oct 2020 13:15:36 +0200 + -- Sven Hartge <sven@svenhartge.de> Fri, 02 Oct 2020 22:04:54 +0200 + +bacula (9.6.6-2) unstable; urgency=medium + + [ Carsten Leonhardt ] + * Add patch to fix errors in po/en_AR.po Although the file is unused, + the Debian QA tools point out the issues. This is to give us peace + of mind. + + [ Sven Hartge ] + * Fix Bacula binaries breaking when linked with symbolic-functions by + stripping it from LDFLAGS. (LP: #1898006) + + -- Carsten Leonhardt <leo@debian.org> Thu, 01 Oct 2020 17:33:19 +0200 bacula (9.6.6-1) unstable; urgency=medium diff --git a/debian/patches/series b/debian/patches/series index a30161d0..1b79e857 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,6 +3,7 @@ upstream/relative-dirs-for-reproduceability upstream/fix-pkg-config-autoconf-macro upstream/fix-narrowing-magic-numbers upstream/fix-8bit-encoding +upstream/fix_en_AR.po_errors upstream/fix-make_db-scripts_easier_to_use debian/fix-default-config debian/fix-default-dbtype diff --git a/debian/patches/upstream/fix-make_db-scripts_easier_to_use b/debian/patches/upstream/fix-make_db-scripts_easier_to_use index f9df7133..b4f1ab27 100644 --- a/debian/patches/upstream/fix-make_db-scripts_easier_to_use +++ b/debian/patches/upstream/fix-make_db-scripts_easier_to_use @@ -1,4 +1,4 @@ -Description: Make variables in database scripts more easy to manually override +Description: Make variables in database scripts easier to manually override Author: Sven Hartge <sven@svenhartge.de> Last-Update: 2020-09-30 diff --git a/debian/patches/upstream/fix_en_AR.po_errors b/debian/patches/upstream/fix_en_AR.po_errors new file mode 100644 index 00000000..0713c86e --- /dev/null +++ b/debian/patches/upstream/fix_en_AR.po_errors @@ -0,0 +1,126 @@ +Description: Fix errors in po/en_AR.po +Bug: https://bugs.bacula.org/view.php?id=2571 +Last-Update: 2020-10-01 +Author: Carsten Leonhardt <leo@debian.org> + + Although the file is unused, the Debian QA tools point out the + issues. This is to give us peace of mind. + +--- a/po/es_AR.po ++++ b/po/es_AR.po +@@ -11,6 +11,7 @@ + "PO-Revision-Date: 2006-04-13 08:15+0200\n" + "Last-Translator: <kern@sibbald.com>\n" + "Language-Team: Spanish\n" ++"Language: Spanish\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +@@ -597,7 +598,7 @@ + #: src/console/console.c:102 + #, c-format + msgid "" +-"Copyright (C) 2000-2016 Kern Sibbald ++"Copyright (C) 2000-2016 Kern Sibbald" + "\n" + "Version: " + msgstr "" +@@ -1204,7 +1205,7 @@ + #: src/dird/dird.c:71 + #, c-format + msgid "" +-"Copyright (C) 2000-2016 Kern Sibbald ++"Copyright (C) 2000-2016 Kern Sibbald" + "\n" + "Version: %s (%s)\n" + "\n" +@@ -5443,7 +5444,7 @@ + #: src/filed/filed.c:62 + #, c-format + msgid "" +-"Copyright (C) 2000-2016 Kern Sibbald ++"Copyright (C) 2000-2016 Kern Sibbald" + "\n" + "Version: %s (%s)\n" + "\n" +@@ -6279,7 +6280,7 @@ + #: src/gnome2-console/console.c:88 + #, c-format + msgid "" +-"Copyright (C) 2000-2016 Kern Sibbald ++"Copyright (C) 2000-2016 Kern Sibbald" + "\n" + "Version: %s (%s) %s %s %s\n" + "\n" +@@ -8852,7 +8853,7 @@ + #: src/stored/bcopy.c:58 + #, c-format + msgid "" +-"Copyright (C) 2000-2016 Kern Sibbald ++"Copyright (C) 2000-2016 Kern Sibbald" + "\n" + "Version: %s (%s)\n" + "\n" +@@ -8923,7 +8924,7 @@ + #: src/stored/bextract.c:70 + #, c-format + msgid "" +-"Copyright (C) 2000-2016 Kern Sibbald ++"Copyright (C) 2000-2016 Kern Sibbald" + "\n" + "Version: %s (%s)\n" + "\n" +@@ -9170,7 +9171,7 @@ + #: src/stored/bls.c:68 + #, c-format + msgid "" +-"Copyright (C) 2000-2016 Kern Sibbald ++"Copyright (C) 2000-2016 Kern Sibbald" + "\n" + "Version: %s (%s)\n" + "\n" +@@ -9266,7 +9267,7 @@ + #: src/stored/bscan.c:109 + #, c-format + msgid "" +-"Copyright (C) 2000-2016 Kern Sibbald ++"Copyright (C) 2000-2016 Kern Sibbald" + "\n" + "Version: %s (%s)\n" + "\n" +@@ -10883,7 +10884,7 @@ + #: src/stored/btape.c:2596 + #, c-format + msgid "" +-"Copyright (C) 2000-2016 Kern Sibbald ++"Copyright (C) 2000-2016 Kern Sibbald" + "\n" + "Version: %s (%s)\n" + "\n" +@@ -12489,7 +12490,7 @@ + #: src/stored/stored.c:65 + #, c-format + msgid "" +-"Copyright (C) 2000-2016 Kern Sibbald ++"Copyright (C) 2000-2016 Kern Sibbald" + "\n" + "Version: %s (%s)\n" + "\n" +@@ -13220,7 +13221,7 @@ + #: src/tray-monitor/tray-monitor.c:102 + #, c-format + msgid "" +-"Copyright (C) 2000-2016 Kern Sibbald ++"Copyright (C) 2000-2016 Kern Sibbald" + "Written by Nicolas Boichat (2004)\n" + "\n" + "Version: %s (%s) %s %s %s\n" +@@ -13321,7 +13322,7 @@ + + #: src/tray-monitor/tray-monitor.c:503 src/tray-monitor/tray-monitor.c:513 + msgid "" +-"Copyright (C) 2000-2016 Kern Sibbald ++"Copyright (C) 2000-2016 Kern Sibbald" + "Written by Nicolas Boichat\n" + msgstr "" + diff --git a/debian/rules b/debian/rules index 1df7ba9d..5b58aa40 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +10,13 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all # https://wiki.debian.org/HardeningWalkthrough export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +# Bacula binaries break if linked with symbolic-functions +# https://bugs.bacula.org/view.php?id=2557 +# Debian does not (yet) use this, but Ubuntu does. Help them out by +# stripping the flag from LDFLAGS +# https://bugs.launchpad.net/ubuntu/+source/bacula/+bug/1898006 +export DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions + # Make qtchooser select Qt5 export QT_SELECT=qt5 |