tags 665485 + patch pending thanks
Dear maintainer, I've prepared an NMU for lustre (versioned as 1.8.5+dfsg-3.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards.
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-08-03 23:01:51.000000000 +0200 @@ -1,3 +1,14 @@ +lustre (1.8.5+dfsg-3.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/control: + - Build-depend on automake1.10 instead of 1.7 (Closes: #665485). + * debian/patches/automake1.10.patch: + - Cherry-pick patch from upstream VCS to enable build with more + recent automake versions. + + -- Luca Falavigna <dktrkr...@debian.org> Fri, 03 Aug 2012 22:17:39 +0200 + lustre (1.8.5+dfsg-3) unstable; urgency=low * [9194f2d] Build ldiskfs kernel module also on plain 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-08-03 22:31:08.000000000 +0200 @@ -4,7 +4,7 @@ Maintainer: Debian Lustre Packaging team <pkg-lustre-maintain...@lists.alioth.debian.org> Uploaders: Patrick Winnertz <win...@debian.org>, Noèl Köthe <n...@debian.org> 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 +Build-Depends: libreadline-dev, debhelper (>=6.0.7), dh-kpatches (>= 0.99.3), lyx, automake1.10, libsnmp-dev, bzip2, texlive-extra-utils, quilt, texlive-latex-recommended, libncurses-dev Homepage: http://www.lustre.org/ Vcs-Git: git://git.lustre.org/prime/lustre.git diff -Nru lustre-1.8.5+dfsg/debian/patches/automake1.10.patch lustre-1.8.5+dfsg/debian/patches/automake1.10.patch --- lustre-1.8.5+dfsg/debian/patches/automake1.10.patch 1970-01-01 01:00:00.000000000 +0100 +++ lustre-1.8.5+dfsg/debian/patches/automake1.10.patch 2012-08-03 23:01:36.000000000 +0200 @@ -0,0 +1,62 @@ +Index: lustre-1.8.5+dfsg/build/autogen.sh +=================================================================== +--- lustre-1.8.5+dfsg.orig/build/autogen.sh 2012-08-03 22:12:51.000000000 +0200 ++++ lustre-1.8.5+dfsg/build/autogen.sh 2012-08-03 22:31:59.886248718 +0200 +@@ -105,15 +105,21 @@ + fi + done + +-check_version automake automake-1.7 "1.7.8" ++for AMVER in 1.7 1.8 1.9 1.10; do ++ [ "$(which automake-$AMVER 2> /dev/null)" ] && break ++done ++ ++[ "$AMVER" = "1.10" ] && AMOPT="-W no-portability" ++ ++check_version automake automake-$AMVER "1.7.8" + check_version autoconf autoconf "2.57" + +-echo "Running aclocal-1.7 $ACLOCAL_FLAGS..." +-aclocal-1.7 $ACLOCAL_FLAGS || exit 1 ++echo "Running aclocal-$AMVER $ACLOCAL_FLAGS..." ++aclocal-$AMVER $ACLOCAL_FLAGS || exit 1 + echo "Running autoheader..." + autoheader || exit 1 +-echo "Running automake-1.7..." +-automake-1.7 -a -c || exit 1 ++echo "Running automake-$AMVER..." ++automake-$AMVER -a -c $AMOPT || exit 1 + echo "Running autoconf..." + autoconf || exit 1 + +Index: lustre-1.8.5+dfsg/ldiskfs/build/autogen.sh +=================================================================== +--- lustre-1.8.5+dfsg.orig/ldiskfs/build/autogen.sh 2012-08-03 22:59:38.190299521 +0200 ++++ lustre-1.8.5+dfsg/ldiskfs/build/autogen.sh 2012-08-03 22:59:50.274299888 +0200 +@@ -105,15 +105,21 @@ + fi + done + +-check_version automake automake-1.7 "1.7.8" ++for AMVER in 1.7 1.8 1.9 1.10; do ++ [ "$(which automake-$AMVER 2> /dev/null)" ] && break ++done ++ ++[ "$AMVER" = "1.10" ] && AMOPT="-W no-portability" ++ ++check_version automake automake-$AMVER "1.7.8" + check_version autoconf autoconf "2.57" + +-echo "Running aclocal-1.7 $ACLOCAL_FLAGS..." +-aclocal-1.7 $ACLOCAL_FLAGS || exit 1 ++echo "Running aclocal-$AMVER $ACLOCAL_FLAGS..." ++aclocal-$AMVER $ACLOCAL_FLAGS || exit 1 + echo "Running autoheader..." + autoheader || exit 1 +-echo "Running automake-1.7..." +-automake-1.7 -a -c || exit 1 ++echo "Running automake-$AMVER..." ++automake-$AMVER -a -c $AMOPT || exit 1 + echo "Running autoconf..." + autoconf || exit 1 + 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-08-03 22:31:38.000000000 +0200 @@ -25,3 +25,4 @@ cacheflush_remove_mark_rodata.patch 615749_no_add_needed modified-debian-specific-stuff.patch +automake1.10.patch
