Hi Helen, hi all, On Friday 14 December 2007 03:14, Helen Faulkner wrote: > http://bugs.debian.org/cgi-bin/pkgreport.cgi?which=pkg&data=labplot
> So if anyone would like to take a look at it and see if you can help me out > with any of the bugs, make an NMU, etc, that would be wonderful. I would like to make an NMU to primary address the FTBFS with GCC 4.3 (which actually happens because the patches do not get applied as I already pointed out in #455414). The fix for #455414 will probably also fix the current FTBFS of 1.5.1.6-2 on amd64 so that labplot can migrate to testing again. Besides this and since you are encouraging NMUs, I would also like to change some things that are normally not done in an NMU (such as updating the Standards-Version, adding the Homepage field, etc.). My proposed NMU-diff is attached. I am currently testing the NMU and when I am finished with it, I will send the final diff to #455414. HTH, Frank -- bureaucracy, n: A method for transforming energy into solid waste.
diff --git a/debian/changelog b/debian/changelog index e176002..862969b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +labplot (1.5.1.6-2.1) unstable; urgency=low + + * Non-maintainer upload (encouraged by maintainer). + * Added quilt series file (debian/patches/series) which lists the current + patch files in debian/patches/ and which is required for quilt to actually + apply them (Closes: #455414). This will probably also fix the build error + on amd64 which was reported in #430750, because the patch that makes + admin/cvs.sh compatible with autoconf-2.6 will now be applied. + * debian/control: + - Bumped Standards-Version from 3.7.2 to 3.7.3, no changes were required. + - Added new Homepage field to the source stanza. + - fftw3-dev was renamed to libfftw3-dev, adjusted Build-Depends + accordingly. + * Added dh_icons to debian/rules (Closes: #447962). It was added to + debhelper in version 5.0.51 therefore raised its build dependency and + bumped the compatibility level to V5, which is the current recommended + level. + + -- Frank S. Thomas <[EMAIL PROTECTED]> Wed, 19 Dec 2007 23:06:19 +0100 + labplot (1.5.1.6-2) unstable; urgency=low * Patch provided by Charles Plessy (thanks!). diff --git a/debian/compat b/debian/compat index b8626c4..7ed6ff8 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +5 diff --git a/debian/control b/debian/control index 2b1c508..9c9d961 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,10 @@ Source: labplot Section: kde Priority: optional Maintainer: Helen Faulkner <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 4.0.0), kdelibs4-dev, fftw3-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 Build-Conflicts: labplot -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 +Homepage: http://labplot.sourceforge.net/ Package: labplot Architecture: any diff --git a/debian/patches/build-with-gcc4.3.patch b/debian/patches/build-with-gcc4.3.patch index 32392e0..50b37f3 100644 --- a/debian/patches/build-with-gcc4.3.patch +++ b/debian/patches/build-with-gcc4.3.patch @@ -9,4 +9,4 @@ Index: labplot-1.5.1.6/src/LTable.cc +#include <cstdlib> #include <qpainter.h> #include <kdebug.h> - #include "LTable.h" \ No newline at end of file + #include "LTable.h" diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..7707b87 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +build-with-gcc4.3.patch +fix-autoconf-2.6-compatibility.patch diff --git a/debian/rules b/debian/rules index f46f78e..b26bb3e 100755 --- a/debian/rules +++ b/debian/rules @@ -131,6 +131,7 @@ binary-arch: build install dh_installdocs dh_installexamples dh_installmenu + dh_icons dh_installman dh_link dh_strip
signature.asc
Description: This is a digitally signed message part.