diff -Nru bacula-5.2.6+dfsg/debian/changelog bacula-5.2.6+dfsg/debian/changelog --- bacula-5.2.6+dfsg/debian/changelog 2013-11-11 16:07:53.000000000 +0000 +++ bacula-5.2.6+dfsg/debian/changelog 2013-12-20 17:14:15.000000000 +0000 @@ -1,3 +1,16 @@ +bacula (5.2.6+dfsg-9.1ubuntu3) trusty; urgency=medium + + * Update "libtool" harder. + + -- Dimitri John Ledkov Fri, 20 Dec 2013 17:14:01 +0000 + +bacula (5.2.6+dfsg-9.1ubuntu2) trusty; urgency=medium + + * Update libtool. + * Bump to postgresql-9.3. + + -- Dimitri John Ledkov Fri, 20 Dec 2013 15:47:22 +0000 + bacula (5.2.6+dfsg-9.1ubuntu1) trusty; urgency=low * Merge from Debian unstable. Remaining changes: diff -Nru bacula-5.2.6+dfsg/debian/control bacula-5.2.6+dfsg/debian/control --- bacula-5.2.6+dfsg/debian/control 2013-10-08 03:39:07.000000000 +0000 +++ bacula-5.2.6+dfsg/debian/control 2013-12-20 17:14:24.000000000 +0000 @@ -6,7 +6,7 @@ Uploaders: Jan Hauke Rahm , Luca Capello Build-Depends: autotools-dev, autoconf, debhelper (>= 8.1.3), po-debconf, zlib1g-dev, libreadline-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev - (>= 9.1), postgresql-server-dev-9.1, libwrap0-dev, python-dev, libgtk2.0-dev, + (>= 9.3), postgresql-server-dev-9.3, libwrap0-dev, python-dev, libgtk2.0-dev, libgnome2-dev, libacl1-dev, libkrb5-dev, libgnomeui-dev, libx11-dev, mtx, bc, libxt-dev, libqt4-dev, libssl-dev, liblzo2-dev, libcap-dev [linux-any], libncurses-dev diff -Nru bacula-5.2.6+dfsg/debian/patches/ppc64el-libtoolize.patch bacula-5.2.6+dfsg/debian/patches/ppc64el-libtoolize.patch --- bacula-5.2.6+dfsg/debian/patches/ppc64el-libtoolize.patch 1970-01-01 00:00:00.000000000 +0000 +++ bacula-5.2.6+dfsg/debian/patches/ppc64el-libtoolize.patch 2013-12-20 17:14:55.000000000 +0000 @@ -0,0 +1,53 @@ +Description: Update "libtool" harder. +Author: Dimitri John Ledkov + +--- 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 -Nru bacula-5.2.6+dfsg/debian/patches/series bacula-5.2.6+dfsg/debian/patches/series --- bacula-5.2.6+dfsg/debian/patches/series 2013-10-08 03:39:07.000000000 +0000 +++ bacula-5.2.6+dfsg/debian/patches/series 2013-12-20 17:14:43.000000000 +0000 @@ -17,3 +17,4 @@ fix_dump_resources_acl.patch xattr-btrfs-crash.patch fix-save-only-one-xattr.patch +ppc64el-libtoolize.patch