Hi Helen, On Sunday 23 December 2007 10:15:56 Frank S. Thomas wrote: > On Wednesday 27 June 2007 05:38:33 Steve Langasek wrote: > > labplot is failing to build on some architectures with the following > > error: > > > > [...] > > cd . && /usr/bin/make -f admin/Makefile.common configure > > make[2]: Entering directory `/build/buildd/labplot-1.5.1.6' > > ./admin/cvs.sh: line 11: autoconf: command not found > > make[2]: *** [configure] Error 1 > > [...] > > As it can be seen in build logs for 1.5.1.6-2 [1] and 1.5.1.6-2.1 [2], this > bug hasn't been fixed in 1.5.1.6-2, therefore I'm reopening it and removing > the record that it has been fixed in 1.5.1.6-2. I'm currently working on > another non-maintainer upload which will address this issue.
My second NMU of labplot is now ready. To fix this bug I've changed some things which results in a very large diff to the previous revision (my first NMU, 1.5.1.6-2.1) but has the advantage of a clean .diff.gz which only contains the debian/ directory. The large diff to the previous revision is because I've removed all the remade GNU Build System files from the .diff.gz. The required autoreconfing now happens at build time in the config.status target by running "$(MAKE) -f admin/Makefile.common", this seems to be much less error prone than adding the remade build system files directly to the .diff.gz. To avoid that changes of the remade build system files end up in the .diff.gz, I've also removed the config.status target as prerequisite from the clean target. My NMU packages are available at: http://people.debian.org/~fst/NMUs/labplot/ Here is the complete diff to the previous version: http://people.debian.org/~fst/NMUs/labplot_1.5.1.6-2.1_1.5.1.6-2.2.diff This is the same as above but only including the relevant changes in the debian/ directory (this patch also attached to this mail): http://people.debian.org/~fst/NMUs/labplot_1.5.1.6-2.1_1.5.1.6-2.2_debian.diff Merry Christmas! Frank
--- labplot-1.5.1.6/debian/changelog +++ labplot-1.5.1.6/debian/changelog @@ -1,3 +1,25 @@ +labplot (1.5.1.6-2.2) unstable; urgency=low + + * Non-maintainer upload (encouraged by maintainer). + * Modified build system to fix a bug caused by patches and autogenerated + files (Closes: #430750). The following has been changed in debian/rules: + - Run "$(MAKE) -f admin/Makefile.common" in the config.status target to + remake the GNU Build System files at build time as suggested in #415656 + instead of adding the remade files directly in the .diff.gz. This + requires build dependencies on "autoconf (>= 2.53)" and "automake1.9". + - Removed config.status as prerequisite from the clean target, so that + changes to the build system files do not end up in the .diff.gz. + - Do not copy config.guess and config.sub into LabPlot's top-level source + directory, it is unnecessary. These are also not in the .orig.tar.gz. + * src/x-lpl.desktop: Reverted the change made in 1.5.1.6-2 because the keys + Patterns and DefaultApp are required for KDE 3's MIME type handling, see + http://techbase.kde.org/Development/Architecture/KDE3/MIME_Types. And also + newer Lintian versions do not warn about these keys as unknown anymore. + * Added debian/watch file using http://sf.net/labplot/ as alias for the + qa.debian.org redirector as documented in uscan's manual page. + + -- Frank S. Thomas <[EMAIL PROTECTED]> Mon, 24 Dec 2007 13:55:05 +0100 + labplot (1.5.1.6-2.1) unstable; urgency=low * Non-maintainer upload (encouraged by maintainer). --- labplot-1.5.1.6/debian/control +++ labplot-1.5.1.6/debian/control @@ -2,7 +2,7 @@ Section: kde Priority: optional Maintainer: Helen Faulkner <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5.0.51), kdelibs4-dev, libfftw3-dev, libgsl0-dev, libtiff4-dev, libmagick9-dev, libmagick++9-dev, libbz2-dev, pstoedit, libpstoedit-dev, netcdfg-dev, libaudiofile-dev, pkg-config, quilt, autotools-dev, libtool +Build-Depends: debhelper (>= 5.0.51), kdelibs4-dev, libfftw3-dev, libgsl0-dev, libtiff4-dev, libmagick9-dev, libmagick++9-dev, libbz2-dev, pstoedit, libpstoedit-dev, netcdfg-dev, libaudiofile-dev, pkg-config, quilt, autotools-dev, libtool, autoconf (>= 2.53), automake1.9 Build-Conflicts: labplot Standards-Version: 3.7.3 Homepage: http://labplot.sourceforge.net/ --- labplot-1.5.1.6/debian/rules +++ labplot-1.5.1.6/debian/rules @@ -48,9 +48,8 @@ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh cp -f /usr/share/misc/config.guess admin/config.guess cp -f /usr/share/misc/config.sub admin/config.sub - # I am not 100 % sure if adding those two lines is really necessary. --Charles - cp -f /usr/share/misc/config.guess config.guess - cp -f /usr/share/misc/config.sub config.sub + + $(MAKE) -f admin/Makefile.common VTK_DIR=/usr ./configure --disable-cdf $(configkde) @@ -68,7 +67,7 @@ touch build-stamp -clean: config.status clean-patched unpatch +clean: clean-patched unpatch clean-patched: dh_testdir dh_testroot @@ -81,13 +80,6 @@ # Commands to clean up after the build process. [ ! -f Makefile ] || $(MAKE) distclean -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - # remove po/*.gmo files to prevent dpkg-source error in next build rm -rf po/*.gmo --- labplot-1.5.1.6.orig/debian/watch +++ labplot-1.5.1.6/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/labplot/ LabPlot-([\d\.]+)\.tar\.gz
signature.asc
Description: This is a digitally signed message part.
