--- Begin Message ---
Package: src:amanda
Version: 1:3.3.6-1
Tags: patch
Usertags: origin-ubuntu ubuntu-patch utopic
In Ubuntu, we've applied the attached patch to achieve the following:
* debian/control, debian/rules:
- Switch to dh-autoreconf to update libtool macros for ppc64el.
Because this is an automake-using package, dh-autoreconf can be viewed
as a superset of dh-autotools-dev, in that it still updates config.*
but also updates libtool and configure. Please apply this patch, to
make life easier for new ports.
Adding support for dh-autoreconf provides a FTBFS, which can be fixed by
missing-libs-ftbfs.patch.
We thought you might be interested in doing the same.
diff -pruN -x '*~' amanda-3.3.6.orig/debian/changelog amanda-3.3.6/debian/changelog
--- amanda-3.3.6.orig/debian/changelog 2014-08-05 16:16:41.000000000 +0200
+++ amanda-3.3.6/debian/changelog 2014-08-15 23:34:24.045264636 +0200
@@ -1,3 +1,13 @@
+amanda (1:3.3.6-1ubuntu1) utopic; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - debian/control, debian/rules:
+ + Switch to dh-autoreconf to update libtool macros for ppc64el.
+ - debian/patches/missing-libs-ftbfs.patch:
+ + Add missing libs to link.
+
+ -- Artur Rona <[email protected]> Fri, 15 Aug 2014 23:34:16 +0200
+
amanda (1:3.3.6-1) unstable; urgency=low
* QA upload.
@@ -12,6 +22,16 @@ amanda (1:3.3.6-1) unstable; urgency=low
-- Hideki Yamane <[email protected]> Wed, 30 Jul 2014 23:20:42 +0900
+amanda (1:3.3.3-3ubuntu1) utopic; urgency=medium
+
+ * Reintroduced changes dropped due to sync:
+ - debian/control, debian/rules:
+ + Switch to dh-autoreconf to update libtool macros for ppc64el.
+ - debian/patches/missing-libs-ftbfs.patch:
+ + Add missing libs to link.
+
+ -- Artur Rona <[email protected]> Mon, 30 Jun 2014 00:26:45 +0200
+
amanda (1:3.3.3-3) unstable; urgency=medium
* QA upload.
diff -pruN -x '*~' amanda-3.3.6.orig/debian/control amanda-3.3.6/debian/control
--- amanda-3.3.6.orig/debian/control 2014-08-05 16:16:41.000000000 +0200
+++ amanda-3.3.6/debian/control 2014-08-16 00:49:11.971519072 +0200
@@ -2,7 +2,7 @@ Source: amanda
Section: utils
Priority: optional
Maintainer: Debian QA Group <[email protected]>
-Build-Depends: debhelper (>= 5), dump [linux-any], gnuplot, libncurses5-dev, libreadline-dev, libtool, flex, perl, smbclient, bsd-mailx | mailx, lpr, mtx, xfsdump [linux-any], po-debconf, autotools-dev, libglib2.0-dev, procps, curl, libcurl4-openssl-dev, libssl-dev
+Build-Depends: debhelper (>= 5), dump [linux-any], gnuplot, libncurses5-dev, libreadline-dev, libtool, flex, perl, smbclient, bsd-mailx | mailx, lpr, mtx, xfsdump [linux-any], po-debconf, autotools-dev, libglib2.0-dev, procps, curl, libcurl4-openssl-dev, libssl-dev, dh-autoreconf
Standards-Version: 3.9.5
Vcs-Git: git://anonscm.debian.org/collab-maint/amanda.git
Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/amanda.git;a=summary
diff -pruN -x '*~' amanda-3.3.6.orig/debian/patches/missing-libs-ftbfs.patch amanda-3.3.6/debian/patches/missing-libs-ftbfs.patch
--- amanda-3.3.6.orig/debian/patches/missing-libs-ftbfs.patch 1970-01-01 01:00:00.000000000 +0100
+++ amanda-3.3.6/debian/patches/missing-libs-ftbfs.patch 2014-08-16 00:02:44.177695120 +0200
@@ -0,0 +1,56 @@
+From: Artur Rona <[email protected]>
+Description: Add missing libs to link.
+Author: Daniel T Chen <[email protected]>
+Last-Update: 2014-08-16
+
+diff -pruN -x '*~' amanda-3.3.6.orig/amar-src/Makefile.am amanda-3.3.6/amar-src/Makefile.am
+--- amanda-3.3.6.orig/amar-src/Makefile.am 2014-07-09 16:21:59.000000000 +0200
++++ amanda-3.3.6/amar-src/Makefile.am 2014-08-15 23:59:49.148827283 +0200
+@@ -26,7 +26,8 @@ noinst_HEADERS = \
+ sbin_PROGRAMS = amarchiver
+
+ amarchiver_SOURCES = amarchiver.c
+-amarchiver_LDADD = libamar.la
++amarchiver_LDADD = libamar.la \
++ ../common-src/libamanda.la
+
+ # automake-style tests
+
+@@ -35,4 +36,5 @@ noinst_PROGRAMS = $(TESTS)
+
+ amar_test_SOURCES = amar-test.c
+ amar_test_LDADD = libamar.la \
+- ../common-src/libtestutils.la
++ ../common-src/libtestutils.la \
++ ../common-src/libamanda.la
+diff -pruN -x '*~' amanda-3.3.6.orig/ndmp-src/Makefile.am amanda-3.3.6/ndmp-src/Makefile.am
+--- amanda-3.3.6.orig/ndmp-src/Makefile.am 2014-07-09 16:21:55.000000000 +0200
++++ amanda-3.3.6/ndmp-src/Makefile.am 2014-08-15 23:57:11.100043499 +0200
+@@ -204,10 +204,12 @@ amndmjob_SOURCES = amndmjob_main.c \
+ amndma_tape_simulator.c
+
+ ndmjob_LDADD = libndmjob.la \
+- ../common-src/libamanda.la
++ ../common-src/libamanda.la \
++ libndmlib.la
+
+ amndmjob_LDADD = libndmjob.la \
+- ../common-src/libamanda.la
++ ../common-src/libamanda.la \
++ libndmlib.la
+
+ ndmp0_xdr.c : ndmp0.x
+ $(RPCGEN) ndmp0.x
+diff -pruN -x '*~' amanda-3.3.6.orig/xfer-src/Makefile.am amanda-3.3.6/xfer-src/Makefile.am
+--- amanda-3.3.6.orig/xfer-src/Makefile.am 2014-07-09 16:21:56.000000000 +0200
++++ amanda-3.3.6/xfer-src/Makefile.am 2014-08-15 23:58:27.700423345 +0200
+@@ -53,7 +53,8 @@ noinst_PROGRAMS = $(TESTS)
+ xfer_test_SOURCES = xfer-test.c
+ xfer_test_LDADD = \
+ ../common-src/libtestutils.la \
+- libamxfer.la
++ libamxfer.la \
++ ../common-src/libamanda.la
+
+ # lint support
+
diff -pruN -x '*~' amanda-3.3.6.orig/debian/patches/series amanda-3.3.6/debian/patches/series
--- amanda-3.3.6.orig/debian/patches/series 2014-08-05 16:16:41.000000000 +0200
+++ amanda-3.3.6/debian/patches/series 2014-08-16 00:03:17.477860278 +0200
@@ -1,3 +1,4 @@
dumpdates-path
fix-amserverconfig-path
amandabackup-hard-coded
+missing-libs-ftbfs.patch
diff -pruN -x '*~' amanda-3.3.6.orig/debian/rules amanda-3.3.6/debian/rules
--- amanda-3.3.6.orig/debian/rules 2014-08-05 16:16:41.000000000 +0200
+++ amanda-3.3.6/debian/rules 2014-08-15 23:33:21.236953191 +0200
@@ -16,6 +16,7 @@ configure-stamp:
# pick up latest config files provided by autotools-dev
cp -f /usr/share/misc/config.sub config/config.sub
cp -f /usr/share/misc/config.guess config/config.guess
+ dh_autoreconf
# do we need --{htmldir,dvidir,pdfdir,psdir} to force subdirectories?
# should we re-craft this to use --without-server and --without-client,
# and lose the amanda-common package?
@@ -66,6 +67,7 @@ clean:
[ ! -f Makefile ] || make distclean
-rm -f build-stamp configure-stamp missing config/config.h common-src/genversion
-find . -type d -name .deps -exec rm -rf {} \;
+ dh_autoreconf_clean
dh_clean
# call this before packaging for upload when updating template English text
--- End Message ---
