Package: labplot
Tags: patch
Followup-For: Bug #430750
Dear Helen and Cyril,
Here is a patch which switches the package to quilt and integrates the
fix for two previous bugs into debian/patches.
However, after reading /usr/share/doc/autotools-dev/README.Debian.gz,
I am unsure that this patch fully adresses this current
bug. Nevertheless, I hope it can be a useful base to its resolution.
Have a nice day.
--
Charles Plessy,
Wako, Saitama, Japan
reverted:
--- labplot-1.5.1.6/src/LTable.cc
+++ labplot-1.5.1.6.orig/src/LTable.cc
@@ -1,6 +1,5 @@
// LabPlot : LTable.cc
-#include <cstdlib>
#include <qpainter.h>
#include <kdebug.h>
#include "LTable.h"
reverted:
--- labplot-1.5.1.6/admin/cvs.sh
+++ labplot-1.5.1.6.orig/admin/cvs.sh
@@ -30,7 +30,7 @@
required_autoconf_version="2.53 or newer"
AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
case $AUTOCONF_VERSION in
+ Autoconf*2.5* | autoconf*2.5* ) : ;;
- Autoconf*2.5* | autoconf*2.5* | Autoconf*2.6* | autoconf*2.6* ) : ;;
"" )
echo "*** AUTOCONF NOT FOUND!."
echo "*** KDE requires autoconf $required_autoconf_version"
@@ -45,7 +45,7 @@
AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
case $AUTOHEADER_VERSION in
+ Autoconf*2.5* | autoheader*2.5* ) : ;;
- Autoconf*2.5* | autoheader*2.5* | Autoconf*2.6* | autoheader*2.6* ) : ;;
"" )
echo "*** AUTOHEADER NOT FOUND!."
echo "*** KDE requires autoheader $required_autoconf_version"
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
@@ -39,9 +39,9 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-target_triplet = i686-pc-linux-gnu
+build_triplet = powerpc-unknown-linux-gnu
+host_triplet = powerpc-unknown-linux-gnu
+target_triplet = powerpc-unknown-linux-gnu
subdir = libundo
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -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/admin/missing --run aclocal-1.8
+ACLOCAL = ${SHELL} /home/charles/debian/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/admin/missing --run tar
+AMTAR = ${SHELL} /home/charles/debian/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/admin/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/helen/debian/my_packages/labplot/labplot-1.5.1.6/admin/missing --run automake-1.8
-AWK = gawk
+AUTOHEADER = ${SHELL} /home/charles/debian/labplot-1.5.1.6/admin/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/charles/debian/labplot-1.5.1.6/admin/missing --run automake-1.8
+AWK = mawk
CC = gcc
CCDEPMODE = depmode=gcc3
CDF_INCFLAGS =
@@ -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/admin/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/charles/debian/labplot-1.5.1.6/admin/missing --run makeinfo
MCOPIDL = /usr/bin/mcopidl
MEINPROC = /usr/bin/meinproc
MOC = /usr/share/qt3/bin/moc
@@ -271,7 +271,7 @@
X_LDFLAGS = -L/usr/lib
X_PRE_LIBS =
X_RPATH =
-YACC = bison -y
+YACC = yacc
YFLAGS =
ac_ct_CC = gcc
ac_ct_CXX = g++
@@ -286,27 +286,27 @@
am__leading_dot = .
am__quote =
bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
+build = powerpc-unknown-linux-gnu
build_alias =
-build_cpu = i686
+build_cpu = powerpc
build_os = linux-gnu
-build_vendor = pc
+build_vendor = unknown
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE}
dvidir = ${docdir}
exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
+host = powerpc-unknown-linux-gnu
host_alias =
-host_cpu = i686
+host_cpu = powerpc
host_os = linux-gnu
-host_vendor = pc
+host_vendor = unknown
htmldir = ${docdir}
include_ARTS_FALSE = #
include_ARTS_TRUE =
includedir = /usr/include/kde
infodir = /usr/share/info
-install_sh = /home/helen/debian/my_packages/labplot/labplot-1.5.1.6/admin/install-sh
+install_sh = /home/charles/debian/labplot-1.5.1.6/admin/install-sh
kde_appsdir = ${datadir}/applnk
kde_bindir = ${exec_prefix}/bin
kde_confdir = /etc/kde3
@@ -346,11 +346,11 @@
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
sysconfdir = /etc
-target = i686-pc-linux-gnu
+target = powerpc-unknown-linux-gnu
target_alias =
-target_cpu = i686
+target_cpu = powerpc
target_os = linux-gnu
-target_vendor = pc
+target_vendor = unknown
x_includes = .
x_libraries = /usr/lib
xdg_appsdir = ${datadir}/applications/kde
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,17 @@
+labplot (1.5.1.6-1.1) unstable; urgency=low
+
+ * Non-Maintainer Upload
+ * Modifications to src/LTable.cc and admin/cvs.sh are now
+ performed by quilt.
+ * Copying admin/libtool.m4.in, admin/ltmain.sh, admin/config.guess,
+ admin/config.sub, config.guess and config.sub from
+ /usr/share/libtool/ and /usr/share/misc/.
+ * These modifications should fi the following bug:
+ labplot_1.5.1.6-1: FTBFS: autoconf: command not found
+ (Closes: #430750)
+
+ -- Charles Plessy <[EMAIL PROTECTED]> Sat, 25 Aug 2007 18:20:54 +0900
+
labplot (1.5.1.6-1) unstable; urgency=low
* Altered src/LTable.cc and configure.in so labplot will compile with GCC 4.3
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
@@ -32,17 +32,30 @@
-include debian/debiandirs
+# Using quilt to patch the sources.
+include /usr/share/quilt/quilt.make
+
# To be used with kde-style admin subdirectories if desired.
debian/debiandirs: admin/debianrules
perl -w admin/debianrules echodirs > debian/debiandirs
-config.status: configure
+config.status: patch configure
dh_testdir
# Commands to configure the package.
- VTK_DIR=/usr ./configure --disable-cdf $(configkde)
+ # Copying more recent autoconf files (see
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=415656 )
+ cp -f /usr/share/libtool/libtool.m4 admin/libtool.m4.in
+ 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
+
+ VTK_DIR=/usr ./configure --disable-cdf $(configkde)
-build: build-stamp
+build: patch build-stamp
build-stamp: config.status
dh_testdir
@@ -55,7 +68,8 @@
touch build-stamp
-clean:
+clean: config.status clean-patched unpatch
+clean-patched:
dh_testdir
dh_testroot
rm -f build-stamp
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,7 +2,7 @@
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
+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-Conflicts: labplot
Standards-Version: 3.7.2
only in patch2:
unchanged:
--- labplot-1.5.1.6.orig/debian/patches/build-with-gcc4.3.patch
+++ labplot-1.5.1.6/debian/patches/build-with-gcc4.3.patch
@@ -0,0 +1,12 @@
+Fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=416689
+Index: labplot-1.5.1.6/src/LTable.cc
+===================================================================
+--- labplot-1.5.1.6.orig/src/LTable.cc
++++ labplot-1.5.1.6/src/LTable.cc
+@@ -1,5 +1,6 @@
+ // LabPlot : LTable.cc
+
++#include <cstdlib>
+ #include <qpainter.h>
+ #include <kdebug.h>
+ #include "LTable.h"
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
only in patch2:
unchanged:
--- labplot-1.5.1.6.orig/debian/patches/fix-autoconf-2.6-compatibility.patch
+++ labplot-1.5.1.6/debian/patches/fix-autoconf-2.6-compatibility.patch
@@ -0,0 +1,24 @@
+Fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=415656
+(please refer also to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=379827 )
+Index: labplot-1.5.1.6/admin/cvs.sh
+===================================================================
+--- labplot-1.5.1.6.orig/admin/cvs.sh
++++ labplot-1.5.1.6/admin/cvs.sh
+@@ -30,7 +30,7 @@
+ required_autoconf_version="2.53 or newer"
+ AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
+ case $AUTOCONF_VERSION in
+- Autoconf*2.5* | autoconf*2.5* ) : ;;
++ Autoconf*2.5* | autoconf*2.5* | Autoconf*2.6* | autoconf*2.6* ) : ;;
+ "" )
+ echo "*** AUTOCONF NOT FOUND!."
+ echo "*** KDE requires autoconf $required_autoconf_version"
+@@ -45,7 +45,7 @@
+
+ AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
+ case $AUTOHEADER_VERSION in
+- Autoconf*2.5* | autoheader*2.5* ) : ;;
++ Autoconf*2.5* | autoheader*2.5* | Autoconf*2.6* | autoheader*2.6* ) : ;;
+ "" )
+ echo "*** AUTOHEADER NOT FOUND!."
+ echo "*** KDE requires autoheader $required_autoconf_version"
