Control: tag 713207 patch pending Dear maintainer,
I've prepared an NMU for qd (versioned as 2.3.11.dfsg-2.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards, -- Colin Watson [cjwat...@debian.org]
diff -u qd-2.3.11.dfsg/debian/rules qd-2.3.11.dfsg/debian/rules --- qd-2.3.11.dfsg/debian/rules +++ qd-2.3.11.dfsg/debian/rules @@ -3,12 +3,10 @@ ## control update does not seem t be a good practice ## DEB_AUTO_UPDATE_DEBIAN_CONTROL := yes -DEB_AUTO_UPDATE_LIBTOOL := -DEB_AUTO_UPDATE_AUTOCONF:= -DEB_AUTO_UPDATE_AUTOMAKE:= 1.11 include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk diff -u qd-2.3.11.dfsg/debian/control qd-2.3.11.dfsg/debian/control --- qd-2.3.11.dfsg/debian/control +++ qd-2.3.11.dfsg/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Science Maintainers <debian-science-maintain...@lists.alioth.debian.org> Uploaders: Christophe Prud'homme <prudh...@debian.org> -Build-Depends: cdbs, debhelper (>= 7), quilt, autotools-dev, g++ (>= 4.1), gfortran (>= 4.1), automake, autoconf, libtool +Build-Depends: cdbs, debhelper (>= 7), quilt, dh-autoreconf, g++ (>= 4.1), gfortran (>= 4.1) Standards-Version: 3.9.1 Homepage: http://crd.lbl.gov/~dhbailey/mpdist/ Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/qd/trunk diff -u qd-2.3.11.dfsg/debian/changelog qd-2.3.11.dfsg/debian/changelog --- qd-2.3.11.dfsg/debian/changelog +++ qd-2.3.11.dfsg/debian/changelog @@ -1,3 +1,12 @@ +qd (2.3.11.dfsg-2.2) unstable; urgency=low + + * Convert to dh-autoreconf, which is more robust than CDBS + DEB_AUTO_UPDATE_* (closes: #713207). + * Adjust pkglibdir.patch to work with current Autotools. + * Remove sh4.patch, automatically applied by autoreconf. + + -- Colin Watson <cjwat...@debian.org> Wed, 18 Sep 2013 09:31:53 +0100 + qd (2.3.11.dfsg-2.1) unstable; urgency=low * Non-maintainer upload. reverted: --- qd-2.3.11.dfsg/debian/patches/sh4.patch +++ qd-2.3.11.dfsg.orig/debian/patches/sh4.patch @@ -1,11 +0,0 @@ ---- a/configure 2010-07-26 03:24:03.000000000 +0000 -+++ b/configure 2010-07-26 03:24:32.000000000 +0000 -@@ -8040,7 +8040,7 @@ - - ;; - # Ignore these flags. -- -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*) -+ -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -little | -LANG:=* | -LIST:* | -LNO:*) - ;; - -lkernel32) - test x"$CYGWIN" != xyes && ac_cv_fc_libs="$ac_cv_fc_libs $ac_arg" diff -u qd-2.3.11.dfsg/debian/patches/series qd-2.3.11.dfsg/debian/patches/series --- qd-2.3.11.dfsg/debian/patches/series +++ qd-2.3.11.dfsg/debian/patches/series @@ -1,3 +1,2 @@ libtool.patch -sh4.patch pkglibdir.patch diff -u qd-2.3.11.dfsg/debian/patches/pkglibdir.patch qd-2.3.11.dfsg/debian/patches/pkglibdir.patch --- qd-2.3.11.dfsg/debian/patches/pkglibdir.patch +++ qd-2.3.11.dfsg/debian/patches/pkglibdir.patch @@ -5,8 +5,8 @@ $(QDEXT): qdext.o -pkglib_DATA = $(QDMOD) $(QDEXT) $(DDMOD) $(DDEXT) -+qd_pkglibdir = $(pkglibdir) -+qd_pkglib_DATA = $(QDMOD) $(QDEXT) $(DDMOD) $(DDEXT) ++qdpkglibdir = $(pkglibdir) ++qdpkglib_DATA = $(QDMOD) $(QDEXT) $(DDMOD) $(DDEXT) DEMO=quaderq$(EXEEXT) quadgsq2d$(EXEEXT) quadgsq$(EXEEXT) \ quadtsq$(EXEEXT) quadtsq2d$(EXEEXT)
