[pkg-bacula-commits] [bacula] 02/02: import changes from NMU 5.2.6+dfsg-9.3

[Carsten Leonhardt]

This is an automated email from the git hooks/post-receive script.

cl-guest pushed a commit to branch master
in repository bacula.

commit 28a526ad332f6907fc097439fd08d303fe575b04
Author: Carsten Leonhardt <leo at debian.org>
Date:   Sun Jul 19 23:18:17 2015 +0200

    import changes from NMU 5.2.6+dfsg-9.3
---
 debian/changelog                        | 14 +++++++++
 debian/patches/ppc64el-libtoolize.patch | 54 +++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 69 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 64df559..0853e2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+bacula (5.2.6+dfsg-9.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix my last upload and really build on ppc64el now.
+
+ -- Andreas Barth <aba at ayous.org>  Mon, 08 Sep 2014 11:16:35 +0000
+
+bacula (5.2.6+dfsg-9.2) unstable; urgency=low
+
+  * Non-maintainer upload to delayed.
+  * Add support for ppc64el. Closes: #758125
+
+ -- Andreas Barth <aba at ayous.org>  Mon, 18 Aug 2014 20:06:20 +0000
+
 bacula (5.2.6+dfsg-9.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/patches/ppc64el-libtoolize.patch b/debian/patches/ppc64el-libtoolize.patch
new file mode 100644
index 0000000..9715df1
--- /dev/null
+++ b/debian/patches/ppc64el-libtoolize.patch
@@ -0,0 +1,54 @@
+Description: Update "libtool" harder.
+Author: Dimitri John Ledkov <xnox at ubuntu.com>
+Bug-Debian: 758125
+
+--- bacula-5.2.6+dfsg.orig/autoconf/config.guess
++++ bacula-5.2.6+dfsg/autoconf/config.guess
+@@ -945,6 +945,12 @@ EOF
+     parisc64:Linux:*:* | hppa64:Linux:*:*)
+ 	echo hppa64-unknown-linux-gnu
+ 	exit ;;
++    ppc64el:Linux:*:*)
++	echo powerpc64le-unknown-linux-${LIBC}
++	exit ;;
++    ppcle:Linux:*:*)
++	echo powerpcle-unknown-linux-${LIBC}
++	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-ibm-linux
+ 	exit ;;
+--- bacula-5.2.6+dfsg.orig/autoconf/libtool/libtool.m4
++++ bacula-5.2.6+dfsg/autoconf/libtool/libtool.m4
+@@ -1268,7 +1268,7 @@ ia64-*-hpux*)
+   rm -rf conftest*
+   ;;
+ 
+-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+@@ -1282,7 +1282,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+ 	  x86_64-*linux*)
+ 	    LD="${LD-ld} -m elf_i386"
+ 	    ;;
+-	  ppc64-*linux*|powerpc64-*linux*)
++	  powerpc64le-*)
++	    LD="${LD-ld} -m elf32lppclinux"
++	    ;;
++	  powerpc64-*)
+ 	    LD="${LD-ld} -m elf32ppclinux"
+ 	    ;;
+ 	  s390x-*linux*)
+@@ -1301,7 +1304,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+ 	  x86_64-*linux*)
+ 	    LD="${LD-ld} -m elf_x86_64"
+ 	    ;;
+-	  ppc*-*linux*|powerpc*-*linux*)
++	  powerpcle-*)
++	    LD="${LD-ld} -m elf64lppc"
++	    ;;
++	  powerpc-*)
+ 	    LD="${LD-ld} -m elf64ppc"
+ 	    ;;
+ 	  s390*-*linux*|s390*-*tpf*)
diff --git a/debian/patches/series b/debian/patches/series
index 0124404..370104a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ path-to-logdir.patch
 fix_dump_resources_acl.patch
 xattr-btrfs-crash.patch
 fix-save-only-one-xattr.patch
+ppc64el-libtoolize.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git