Hi Helen, I'm now ready to upload labplot/1.5.1.6-2.1, the debdiff between 1.5.1.6-2 and my NMU is attached and the complete package I'm going to upload is available at: http://people.debian.org/~fst/NMUs/labplot/ http://people.debian.org/~fst/NMUs/labplot_1.5.1.6-2_1.5.1.6-2.1.diff
I'm curious to see if this upload really fixes the build failure on amd64. This would allow labplot to migrate to testing again. Let's see how this goes... Greetings and Happy Holidays, Frank
diff -u labplot-1.5.1.6/admin/ltmain.sh labplot-1.5.1.6/admin/ltmain.sh
--- labplot-1.5.1.6/admin/ltmain.sh
+++ labplot-1.5.1.6/admin/ltmain.sh
@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="1.5.24 Debian 1.5.24-1"
+VERSION="1.5.24 Debian 1.5.24-2"
TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
diff -u labplot-1.5.1.6/admin/libtool.m4.in labplot-1.5.1.6/admin/libtool.m4.in
--- labplot-1.5.1.6/admin/libtool.m4.in
+++ labplot-1.5.1.6/admin/libtool.m4.in
@@ -7,7 +7,7 @@
## unlimited permission to copy and/or distribute it, with or without
## modifications, as long as this notice is preserved.
-# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL
+# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
diff -u labplot-1.5.1.6/libundo/Makefile labplot-1.5.1.6/libundo/Makefile
--- labplot-1.5.1.6/libundo/Makefile
+++ labplot-1.5.1.6/libundo/Makefile
@@ -97,10 +97,10 @@
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 1
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-ACLOCAL = ${SHELL} /home/helen/debian/my_packages/labplot/labplot-1.5.1.6/labplot-1.5.1.6-new/labplot-1.5.1.6/admin/missing --run aclocal-1.8
+ACLOCAL = ${SHELL} /tmp/buildd/labplot-1.5.1.6/admin/missing --run aclocal-1.8
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /home/helen/debian/my_packages/labplot/labplot-1.5.1.6/labplot-1.5.1.6-new/labplot-1.5.1.6/admin/missing --run tar
+AMTAR = ${SHELL} /tmp/buildd/labplot-1.5.1.6/admin/missing --run tar
AR = ar
ARTSCCONFIG = /usr/bin/artsc-config
AUDIOFILE_DIR =
@@ -108,9 +108,9 @@
AUDIOFILE_LDFLAGS = -laudiofile
AUTOCONF = $(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure
AUTODIRS =
-AUTOHEADER = ${SHELL} /home/helen/debian/my_packages/labplot/labplot-1.5.1.6/labplot-1.5.1.6-new/labplot-1.5.1.6/admin/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/helen/debian/my_packages/labplot/labplot-1.5.1.6/labplot-1.5.1.6-new/labplot-1.5.1.6/admin/missing --run automake-1.8
-AWK = gawk
+AUTOHEADER = ${SHELL} /tmp/buildd/labplot-1.5.1.6/admin/missing --run autoheader
+AUTOMAKE = ${SHELL} /tmp/buildd/labplot-1.5.1.6/admin/missing --run automake-1.8
+AWK = mawk
CC = gcc
CCDEPMODE = depmode=gcc3
CDF_INCFLAGS =
@@ -137,8 +137,8 @@
EGREP = /bin/grep -E
ENABLE_PERMISSIVE_FLAG = -fpermissive
EXEEXT =
-F77 = gfortran
-FFLAGS = -g -O2
+F77 =
+FFLAGS =
FFTW3_LDFLAGS = -lfftw3 -lfftw3_threads -lpthread
FFTW_LDFLAGS =
FRAMEWORK_COREAUDIO =
@@ -216,7 +216,7 @@
MAGICK = yes
MAGICK_INCFLAGS = `Magick++-config --cppflags`
MAGICK_LDFLAGS = `Magick++-config --ldflags --libs`
-MAKEINFO = ${SHELL} /home/helen/debian/my_packages/labplot/labplot-1.5.1.6/labplot-1.5.1.6-new/labplot-1.5.1.6/admin/missing --run makeinfo
+MAKEINFO = ${SHELL} /tmp/buildd/labplot-1.5.1.6/admin/missing --run makeinfo
MCOPIDL = /usr/bin/mcopidl
MEINPROC = /usr/bin/meinproc
MOC = /usr/share/qt3/bin/moc
@@ -271,11 +271,11 @@
X_LDFLAGS = -L/usr/lib
X_PRE_LIBS =
X_RPATH = -R $(x_libraries)
-YACC = bison -y
+YACC = yacc
YFLAGS =
ac_ct_CC = gcc
ac_ct_CXX = g++
-ac_ct_F77 = gfortran
+ac_ct_F77 =
all_includes = -I/usr/include/kde -I/usr/share/qt3/include -I.
all_libraries = -L/usr/lib -L/usr/share/qt3/lib
am__fastdepCC_FALSE = #
@@ -306,7 +306,7 @@
include_ARTS_TRUE =
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = /home/helen/debian/my_packages/labplot/labplot-1.5.1.6/labplot-1.5.1.6-new/labplot-1.5.1.6/admin/install-sh
+install_sh = /tmp/buildd/labplot-1.5.1.6/admin/install-sh
kde_appsdir = ${datadir}/applnk
kde_bindir = ${exec_prefix}/bin
kde_confdir = ${datadir}/config
diff -u labplot-1.5.1.6/debian/changelog labplot-1.5.1.6/debian/changelog
--- labplot-1.5.1.6/debian/changelog
+++ labplot-1.5.1.6/debian/changelog
@@ -1,3 +1,27 @@
+labplot (1.5.1.6-2.1) unstable; urgency=low
+
+ * Non-maintainer upload (encouraged by maintainer).
+ * debian/patches/:
+ - series: Added quilt series file which lists the current patch files in
+ debian/patches/ and which is required for quilt to actually apply them.
+ This fixes the FTBFS with GCC 4.3, because the patch that contains the
+ bug fix will now be applied (Closes: #455414).
+ - build-with-gcc4.3.patch: Added newline at end of file so that it applies
+ without fuzz.
+ * 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. This is a proper control
+ field since dpkg 1.14.6.
+ - Changed fftw3-dev to libfftw3-dev in Build-Depends, because it has
+ been renamed.
+ * Added dh_icons call to debian/rules (Closes: #447962). It was added to
+ debhelper in version 5.0.51, therefore raised its build dependency to
+ ">= 5.0.51" and bumped the debhelper compatibility level from V4 to V5,
+ which is the current recommended level.
+ * debian/override: Added newline at end of file to make dpkg-source happy.
+
+ -- Frank S. Thomas <[EMAIL PROTECTED]> Sun, 23 Dec 2007 00:19:34 +0100
+
labplot (1.5.1.6-2) unstable; urgency=low
* Patch provided by Charles Plessy (thanks!).
diff -u labplot-1.5.1.6/debian/patches/build-with-gcc4.3.patch labplot-1.5.1.6/debian/patches/build-with-gcc4.3.patch
--- labplot-1.5.1.6/debian/patches/build-with-gcc4.3.patch
+++ labplot-1.5.1.6/debian/patches/build-with-gcc4.3.patch
@@ -12 +12 @@
- #include "LTable.h"
\ No newline at end of file
+ #include "LTable.h"
diff -u labplot-1.5.1.6/debian/compat labplot-1.5.1.6/debian/compat
--- labplot-1.5.1.6/debian/compat
+++ labplot-1.5.1.6/debian/compat
@@ -1 +1 @@
-4
+5
diff -u labplot-1.5.1.6/debian/rules labplot-1.5.1.6/debian/rules
--- labplot-1.5.1.6/debian/rules
+++ labplot-1.5.1.6/debian/rules
@@ -131,6 +131,7 @@
dh_installdocs
dh_installexamples
dh_installmenu
+ dh_icons
dh_installman
dh_link
dh_strip
diff -u labplot-1.5.1.6/debian/control labplot-1.5.1.6/debian/control
--- labplot-1.5.1.6/debian/control
+++ labplot-1.5.1.6/debian/control
@@ -2,9 +2,10 @@
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 -u labplot-1.5.1.6/debian/override labplot-1.5.1.6/debian/override
--- labplot-1.5.1.6/debian/override
+++ labplot-1.5.1.6/debian/override
@@ -5 +5 @@
-labplot: package-name-doesnt-match-sonames libLabPlot1 libLabPlotcephes1 libLabPlotorigin0 libLabPlotqwtplot3d0
\ No newline at end of file
+labplot: package-name-doesnt-match-sonames libLabPlot1 libLabPlotcephes1 libLabPlotorigin0 libLabPlotqwtplot3d0
only in patch2:
unchanged:
--- labplot-1.5.1.6.orig/debian/patches/series
+++ labplot-1.5.1.6/debian/patches/series
@@ -0,0 +1,2 @@
+build-with-gcc4.3.patch
+fix-autoconf-2.6-compatibility.patch
signature.asc
Description: This is a digitally signed message part.
