diff -Nru lustre-1.8.5+dfsg/debian/changelog lustre-1.8.5+dfsg/debian/changelog --- lustre-1.8.5+dfsg/debian/changelog 2011-11-16 13:36:55.000000000 +0100 +++ lustre-1.8.5+dfsg/debian/changelog 2012-01-08 21:10:41.000000000 +0100 @@ -1,3 +1,15 @@ +lustre (1.8.5+dfsg-3ubuntu1) precise; urgency=low + + * Merge from Debian testing (LP: #913526). Remaining changes: + - Add ldadd_for_loadgen.patch (updated) to correctly link against + libreadline. Fixes FTBFS. + * Drop changes: + - 615749_no_add_needed.dpatch now in debian + - Fix a bashism in lustre/liblustre/genlib.sh now in debian + - debian/rules: link against -lpthread to fix FTBFS no more needed + + -- Leo Iannacone Sun, 08 Jan 2012 20:25:29 +0100 + lustre (1.8.5+dfsg-3) unstable; urgency=low * [9194f2d] Build ldiskfs kernel module also on plain @@ -61,6 +73,25 @@ -- Patrick Winnertz Thu, 19 Aug 2010 10:05:29 +0200 +lustre (1.8.3-4ubuntu2) oneiric; urgency=low + + * Add ldadd_for_loadgen.dpatch to correctly link against + libreadline. Fixes FTBFS. (LP: #770758) + * Backport 615749_no_add_needed.dpatch from 1.8.5+dfsg-2 to + correctly link against libpthread. Fixes FTBFS. + + -- Daniel T Chen Mon, 12 Sep 2011 20:58:38 -0400 + +lustre (1.8.3-4ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: + - Fix a bashism in lustre/liblustre/genlib.sh + - Build lustre without stack protector as the linker is called with + -nostdlib. + * link against -lpthread to fix FTBFS + + -- Bhavani Shankar Fri, 12 Nov 2010 11:25:22 +0530 + lustre (1.8.3-4) unstable; urgency=low * [98ac0eb] Fix a small typo in the control file (Closes: #587201) @@ -81,6 +112,14 @@ -- Patrick Winnertz Wed, 28 Jul 2010 12:24:21 +0200 +lustre (1.8.3-2ubuntu1) maverick; urgency=low + + * Fix a bashism in lustre/liblustre/genlib.sh + * Build lustre without stack protector as the linker is called with + -nostdlib. + + -- Michael Bienia Sat, 26 Jun 2010 00:02:43 +0200 + lustre (1.8.3-2) unstable; urgency=low * [df329e4] Add bug15587_security.capability_xattr.dpatch diff -Nru lustre-1.8.5+dfsg/debian/control lustre-1.8.5+dfsg/debian/control --- lustre-1.8.5+dfsg/debian/control 2011-11-16 13:36:55.000000000 +0100 +++ lustre-1.8.5+dfsg/debian/control 2012-01-08 20:32:00.000000000 +0100 @@ -1,7 +1,8 @@ Source: lustre Section: admin Priority: optional -Maintainer: Debian Lustre Packaging team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Lustre Packaging team Uploaders: Patrick Winnertz , Noèl Köthe Standards-Version: 3.9.1 Build-Depends: libreadline-dev, debhelper (>=6.0.7), dh-kpatches (>= 0.99.3), lyx, automake1.7, libsnmp-dev, bzip2, texlive-extra-utils, quilt, texlive-latex-recommended, libncurses-dev diff -Nru lustre-1.8.5+dfsg/debian/patches/ldadd_for_loadgen.patch lustre-1.8.5+dfsg/debian/patches/ldadd_for_loadgen.patch --- lustre-1.8.5+dfsg/debian/patches/ldadd_for_loadgen.patch 1970-01-01 01:00:00.000000000 +0100 +++ lustre-1.8.5+dfsg/debian/patches/ldadd_for_loadgen.patch 2012-01-08 20:56:03.000000000 +0100 @@ -0,0 +1,17 @@ +Description: Fix FTBFS with gcc-4.6 ld-as-needed +Author: Daniel T Chen +--- + lustre/utils/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- lustre-1.8.5+dfsg.orig/lustre/utils/Makefile.am ++++ lustre-1.8.5+dfsg/lustre/utils/Makefile.am +@@ -36,7 +36,7 @@ lfs_LDADD := $(LIBREADLINE) liblustreapi + lfs_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a + + loadgen_SOURCES = loadgen.c lustre_cfg.c obd.c +-loadgen_LDADD := $(LIBREADLINE) liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS) ++loadgen_LDADD := liblustreapi.a $(LIBPTLCTL) $(LIBREADLINE) $(PTHREAD_LIBS) + loadgen_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a + + lshowmount_SOURCES = lshowmount.c nidlist.c nidlist.h diff -Nru lustre-1.8.5+dfsg/debian/patches/series lustre-1.8.5+dfsg/debian/patches/series --- lustre-1.8.5+dfsg/debian/patches/series 2011-11-16 13:36:55.000000000 +0100 +++ lustre-1.8.5+dfsg/debian/patches/series 2012-01-08 20:55:00.000000000 +0100 @@ -25,3 +25,4 @@ cacheflush_remove_mark_rodata.patch 615749_no_add_needed modified-debian-specific-stuff.patch +ldadd_for_loadgen.patch