Hi, I have prepared a (quite trivial) patch which makes the package build with autoconf 2.60 (attached below).
Greetings Arjan Oosting
diff -u kxmleditor-1.1.4/debian/changelog kxmleditor-1.1.4/debian/changelog
--- kxmleditor-1.1.4/debian/changelog
+++ kxmleditor-1.1.4/debian/changelog
@@ -1,3 +1,12 @@
+kxmleditor (1.1.4-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Set urgency to medium because this upload fixes an RC bug.
+ * Update patches/01_admin_update.diff to add support for autoconf
+ 2.60. (Closes: #379813)
+
+ -- Arjan Oosting <[EMAIL PROTECTED]> Wed, 2 Aug 2006 11:05:43 +0200
+
kxmleditor (1.1.4-3) unstable; urgency=low
* Acknowledge NMU (Closes: #334997), but revert it's changes, because the
diff -u kxmleditor-1.1.4/debian/patches/01_admin_update.diff kxmleditor-1.1.4/debian/patches/01_admin_update.diff
--- kxmleditor-1.1.4/debian/patches/01_admin_update.diff
+++ kxmleditor-1.1.4/debian/patches/01_admin_update.diff
@@ -1,6 +1,6 @@
-diff -Nrua kxmleditor-1.1.4.orig/admin/acinclude.m4.in kxmleditor-1.1.4/admin/acinclude.m4.in
---- kxmleditor-1.1.4.orig/admin/acinclude.m4.in 2005-12-21 12:25:52.271040810 +0100
-+++ kxmleditor-1.1.4/admin/acinclude.m4.in 2005-12-21 12:26:54.151822893 +0100
+diff -Naur kxmleditor-1.1.4.orig/admin/acinclude.m4.in kxmleditor-1.1.4/admin/acinclude.m4.in
+--- kxmleditor-1.1.4.orig/admin/acinclude.m4.in 2004-12-06 11:03:40.000000000 +0100
++++ kxmleditor-1.1.4/admin/acinclude.m4.in 2006-08-02 11:14:00.000000000 +0200
@@ -16,8 +16,8 @@
dnl You should have received a copy of the GNU Library General Public License
@@ -606,9 +606,9 @@
+ PKG_CHECK_MODULES($1,$2,$3,$4)
+])
+
-diff -Nrua kxmleditor-1.1.4.orig/admin/am_edit kxmleditor-1.1.4/admin/am_edit
---- kxmleditor-1.1.4.orig/admin/am_edit 2005-12-21 12:25:52.275040343 +0100
-+++ kxmleditor-1.1.4/admin/am_edit 2005-12-21 12:26:54.176819981 +0100
+diff -Naur kxmleditor-1.1.4.orig/admin/am_edit kxmleditor-1.1.4/admin/am_edit
+--- kxmleditor-1.1.4.orig/admin/am_edit 2004-03-24 23:26:00.000000000 +0100
++++ kxmleditor-1.1.4/admin/am_edit 2006-08-02 11:14:00.000000000 +0200
@@ -483,6 +483,7 @@
$MakefileData =~ s/$lookup/$replacement/;
$lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
@@ -678,8 +678,8 @@
if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
warn "automake line not found in $makefile\n";
# Fallback: first line
-diff -Nrua kxmleditor-1.1.4.orig/admin/ChangeLog kxmleditor-1.1.4/admin/ChangeLog
---- kxmleditor-1.1.4.orig/admin/ChangeLog 2005-12-21 12:25:52.279039876 +0100
+diff -Naur kxmleditor-1.1.4.orig/admin/ChangeLog kxmleditor-1.1.4/admin/ChangeLog
+--- kxmleditor-1.1.4.orig/admin/ChangeLog 2003-07-10 21:38:45.000000000 +0200
+++ kxmleditor-1.1.4/admin/ChangeLog 1970-01-01 01:00:00.000000000 +0100
@@ -1,761 +0,0 @@
-2002-10-03 Stephan Kulow <[EMAIL PROTECTED]>
@@ -1443,9 +1443,9 @@
- updated kfind to 0.3.2
- added some patches for SGI
-... lost the time to maintain a Changelog ;)
-diff -Nrua kxmleditor-1.1.4.orig/admin/configure.in.bot.end kxmleditor-1.1.4/admin/configure.in.bot.end
---- kxmleditor-1.1.4.orig/admin/configure.in.bot.end 2005-12-21 12:25:52.280039759 +0100
-+++ kxmleditor-1.1.4/admin/configure.in.bot.end 2005-12-21 12:26:54.158822078 +0100
+diff -Naur kxmleditor-1.1.4.orig/admin/configure.in.bot.end kxmleditor-1.1.4/admin/configure.in.bot.end
+--- kxmleditor-1.1.4.orig/admin/configure.in.bot.end 2004-03-15 20:10:12.000000000 +0100
++++ kxmleditor-1.1.4/admin/configure.in.bot.end 2006-08-02 11:14:00.000000000 +0200
@@ -16,6 +16,21 @@
fi
fi
@@ -1468,9 +1468,9 @@
if test "$all_tests" = "bad"; then
if test ! "$cache_file" = "/dev/null"; then
echo ""
-diff -Nrua kxmleditor-1.1.4.orig/admin/cvs.sh kxmleditor-1.1.4/admin/cvs.sh
---- kxmleditor-1.1.4.orig/admin/cvs.sh 2005-12-21 12:25:52.273040576 +0100
-+++ kxmleditor-1.1.4/admin/cvs.sh 2005-12-21 12:26:54.137824524 +0100
+diff -Naur kxmleditor-1.1.4.orig/admin/cvs.sh kxmleditor-1.1.4/admin/cvs.sh
+--- kxmleditor-1.1.4.orig/admin/cvs.sh 2004-12-07 06:49:08.000000000 +0100
++++ kxmleditor-1.1.4/admin/cvs.sh 2006-08-02 11:14:41.000000000 +0200
@@ -6,6 +6,8 @@
# It defines a shell function for each known target
# and then does a case to call the correct function.
@@ -1480,7 +1480,16 @@
call_and_fix_autoconf()
{
$AUTOCONF || exit 1
-@@ -42,7 +44,7 @@
+@@ -30,7 +32,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* ) : ;;
+ "" )
+ echo "*** AUTOCONF NOT FOUND!."
+ echo "*** KDE requires autoconf $required_autoconf_version"
+@@ -42,10 +44,10 @@
exit 1
;;
esac
@@ -1488,7 +1497,11 @@
+
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.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
+ "" )
+ echo "*** AUTOHEADER NOT FOUND!."
+ echo "*** KDE requires autoheader $required_autoconf_version"
@@ -58,8 +60,6 @@
;;
esac
@@ -1555,9 +1568,9 @@
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
-diff -Nrua kxmleditor-1.1.4.orig/admin/Doxyfile.global kxmleditor-1.1.4/admin/Doxyfile.global
---- kxmleditor-1.1.4.orig/admin/Doxyfile.global 2005-12-21 12:25:52.265041510 +0100
-+++ kxmleditor-1.1.4/admin/Doxyfile.global 2005-12-21 12:26:54.086830466 +0100
+diff -Naur kxmleditor-1.1.4.orig/admin/Doxyfile.global kxmleditor-1.1.4/admin/Doxyfile.global
+--- kxmleditor-1.1.4.orig/admin/Doxyfile.global 2004-03-26 14:38:44.000000000 +0100
++++ kxmleditor-1.1.4/admin/Doxyfile.global 2006-08-02 11:14:00.000000000 +0200
@@ -436,7 +436,8 @@
*.all_cpp.* \
*unload.* \
@@ -1568,9 +1581,9 @@
# The EXAMPLE_PATH tag can be used to specify one or more files or
# directories that contain example code fragments that are included (see
-diff -Nrua kxmleditor-1.1.4.orig/admin/libtool.m4.in kxmleditor-1.1.4/admin/libtool.m4.in
---- kxmleditor-1.1.4.orig/admin/libtool.m4.in 2005-12-21 12:25:52.277040109 +0100
-+++ kxmleditor-1.1.4/admin/libtool.m4.in 2005-12-21 12:26:54.096829301 +0100
+diff -Naur kxmleditor-1.1.4.orig/admin/libtool.m4.in kxmleditor-1.1.4/admin/libtool.m4.in
+--- kxmleditor-1.1.4.orig/admin/libtool.m4.in 2004-11-05 23:54:14.000000000 +0100
++++ kxmleditor-1.1.4/admin/libtool.m4.in 2006-08-02 11:14:00.000000000 +0200
@@ -2560,10 +2560,21 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
@@ -1643,9 +1656,9 @@
;;
esac
lt_int_apple_cc_single_mod=no
-diff -Nrua kxmleditor-1.1.4.orig/admin/ltmain.sh kxmleditor-1.1.4/admin/ltmain.sh
---- kxmleditor-1.1.4.orig/admin/ltmain.sh 2005-12-21 12:25:52.268041160 +0100
-+++ kxmleditor-1.1.4/admin/ltmain.sh 2005-12-21 12:26:54.136824641 +0100
+diff -Naur kxmleditor-1.1.4.orig/admin/ltmain.sh kxmleditor-1.1.4/admin/ltmain.sh
+--- kxmleditor-1.1.4.orig/admin/ltmain.sh 2004-12-06 11:03:40.000000000 +0100
++++ kxmleditor-1.1.4/admin/ltmain.sh 2006-08-02 11:14:00.000000000 +0200
@@ -1149,6 +1149,19 @@
finalize_command="$finalize_command $qarg"
continue
@@ -1795,0 +1809,133 @@
+diff -Naur kxmleditor-1.1.4.orig/debian/patches/01_admin_update.diff kxmleditor-1.1.4/debian/patches/01_admin_update.diff
+--- kxmleditor-1.1.4.orig/debian/patches/01_admin_update.diff 2006-08-02 11:15:24.000000000 +0200
++++ kxmleditor-1.1.4/debian/patches/01_admin_update.diff 2006-08-02 11:03:47.000000000 +0200
+@@ -1,6 +1,6 @@
+-diff -Naur kxmleditor-1.1.4.orig/admin/acinclude.m4.in kxmleditor-1.1.4/admin/acinclude.m4.in
+---- kxmleditor-1.1.4.orig/admin/acinclude.m4.in 2004-12-06 11:03:40.000000000 +0100
+-+++ kxmleditor-1.1.4/admin/acinclude.m4.in 2006-08-02 11:14:00.000000000 +0200
++diff -Nrua kxmleditor-1.1.4.orig/admin/acinclude.m4.in kxmleditor-1.1.4/admin/acinclude.m4.in
++--- kxmleditor-1.1.4.orig/admin/acinclude.m4.in 2005-12-21 12:25:52.271040810 +0100
+++++ kxmleditor-1.1.4/admin/acinclude.m4.in 2005-12-21 12:26:54.151822893 +0100
+ @@ -16,8 +16,8 @@
+
+ dnl You should have received a copy of the GNU Library General Public License
+@@ -606,9 +606,9 @@
+ + PKG_CHECK_MODULES($1,$2,$3,$4)
+ +])
+ +
+-diff -Naur kxmleditor-1.1.4.orig/admin/am_edit kxmleditor-1.1.4/admin/am_edit
+---- kxmleditor-1.1.4.orig/admin/am_edit 2004-03-24 23:26:00.000000000 +0100
+-+++ kxmleditor-1.1.4/admin/am_edit 2006-08-02 11:14:00.000000000 +0200
++diff -Nrua kxmleditor-1.1.4.orig/admin/am_edit kxmleditor-1.1.4/admin/am_edit
++--- kxmleditor-1.1.4.orig/admin/am_edit 2005-12-21 12:25:52.275040343 +0100
+++++ kxmleditor-1.1.4/admin/am_edit 2005-12-21 12:26:54.176819981 +0100
+ @@ -483,6 +483,7 @@
+ $MakefileData =~ s/$lookup/$replacement/;
+ $lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
+@@ -678,8 +678,8 @@
+ if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
+ warn "automake line not found in $makefile\n";
+ # Fallback: first line
+-diff -Naur kxmleditor-1.1.4.orig/admin/ChangeLog kxmleditor-1.1.4/admin/ChangeLog
+---- kxmleditor-1.1.4.orig/admin/ChangeLog 2003-07-10 21:38:45.000000000 +0200
++diff -Nrua kxmleditor-1.1.4.orig/admin/ChangeLog kxmleditor-1.1.4/admin/ChangeLog
++--- kxmleditor-1.1.4.orig/admin/ChangeLog 2005-12-21 12:25:52.279039876 +0100
+ +++ kxmleditor-1.1.4/admin/ChangeLog 1970-01-01 01:00:00.000000000 +0100
+ @@ -1,761 +0,0 @@
+ -2002-10-03 Stephan Kulow <[EMAIL PROTECTED]>
+@@ -1443,9 +1443,9 @@
+ - updated kfind to 0.3.2
+ - added some patches for SGI
+ -... lost the time to maintain a Changelog ;)
+-diff -Naur kxmleditor-1.1.4.orig/admin/configure.in.bot.end kxmleditor-1.1.4/admin/configure.in.bot.end
+---- kxmleditor-1.1.4.orig/admin/configure.in.bot.end 2004-03-15 20:10:12.000000000 +0100
+-+++ kxmleditor-1.1.4/admin/configure.in.bot.end 2006-08-02 11:14:00.000000000 +0200
++diff -Nrua kxmleditor-1.1.4.orig/admin/configure.in.bot.end kxmleditor-1.1.4/admin/configure.in.bot.end
++--- kxmleditor-1.1.4.orig/admin/configure.in.bot.end 2005-12-21 12:25:52.280039759 +0100
+++++ kxmleditor-1.1.4/admin/configure.in.bot.end 2005-12-21 12:26:54.158822078 +0100
+ @@ -16,6 +16,21 @@
+ fi
+ fi
+@@ -1468,9 +1468,9 @@
+ if test "$all_tests" = "bad"; then
+ if test ! "$cache_file" = "/dev/null"; then
+ echo ""
+-diff -Naur kxmleditor-1.1.4.orig/admin/cvs.sh kxmleditor-1.1.4/admin/cvs.sh
+---- kxmleditor-1.1.4.orig/admin/cvs.sh 2004-12-07 06:49:08.000000000 +0100
+-+++ kxmleditor-1.1.4/admin/cvs.sh 2006-08-02 11:14:41.000000000 +0200
++diff -Nrua kxmleditor-1.1.4.orig/admin/cvs.sh kxmleditor-1.1.4/admin/cvs.sh
++--- kxmleditor-1.1.4.orig/admin/cvs.sh 2005-12-21 12:25:52.273040576 +0100
+++++ kxmleditor-1.1.4/admin/cvs.sh 2005-12-21 12:26:54.137824524 +0100
+ @@ -6,6 +6,8 @@
+ # It defines a shell function for each known target
+ # and then does a case to call the correct function.
+@@ -1480,16 +1480,7 @@
+ call_and_fix_autoconf()
+ {
+ $AUTOCONF || exit 1
+-@@ -30,7 +32,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* ) : ;;
+- "" )
+- echo "*** AUTOCONF NOT FOUND!."
+- echo "*** KDE requires autoconf $required_autoconf_version"
+-@@ -42,10 +44,10 @@
++@@ -42,7 +44,7 @@
+ exit 1
+ ;;
+ esac
+@@ -1497,11 +1488,7 @@
+ +
+ AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
+ case $AUTOHEADER_VERSION in
+-- Autoconf*2.5* | autoheader*2.5* ) : ;;
+-+ Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
+- "" )
+- echo "*** AUTOHEADER NOT FOUND!."
+- echo "*** KDE requires autoheader $required_autoconf_version"
++ Autoconf*2.5* | autoheader*2.5* ) : ;;
+ @@ -58,8 +60,6 @@
+ ;;
+ esac
+@@ -1568,9 +1555,9 @@
+
+ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
+ XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
+-diff -Naur kxmleditor-1.1.4.orig/admin/Doxyfile.global kxmleditor-1.1.4/admin/Doxyfile.global
+---- kxmleditor-1.1.4.orig/admin/Doxyfile.global 2004-03-26 14:38:44.000000000 +0100
+-+++ kxmleditor-1.1.4/admin/Doxyfile.global 2006-08-02 11:14:00.000000000 +0200
++diff -Nrua kxmleditor-1.1.4.orig/admin/Doxyfile.global kxmleditor-1.1.4/admin/Doxyfile.global
++--- kxmleditor-1.1.4.orig/admin/Doxyfile.global 2005-12-21 12:25:52.265041510 +0100
+++++ kxmleditor-1.1.4/admin/Doxyfile.global 2005-12-21 12:26:54.086830466 +0100
+ @@ -436,7 +436,8 @@
+ *.all_cpp.* \
+ *unload.* \
+@@ -1581,9 +1568,9 @@
+
+ # The EXAMPLE_PATH tag can be used to specify one or more files or
+ # directories that contain example code fragments that are included (see
+-diff -Naur kxmleditor-1.1.4.orig/admin/libtool.m4.in kxmleditor-1.1.4/admin/libtool.m4.in
+---- kxmleditor-1.1.4.orig/admin/libtool.m4.in 2004-11-05 23:54:14.000000000 +0100
+-+++ kxmleditor-1.1.4/admin/libtool.m4.in 2006-08-02 11:14:00.000000000 +0200
++diff -Nrua kxmleditor-1.1.4.orig/admin/libtool.m4.in kxmleditor-1.1.4/admin/libtool.m4.in
++--- kxmleditor-1.1.4.orig/admin/libtool.m4.in 2005-12-21 12:25:52.277040109 +0100
+++++ kxmleditor-1.1.4/admin/libtool.m4.in 2005-12-21 12:26:54.096829301 +0100
+ @@ -2560,10 +2560,21 @@
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ case "$host_os" in
+@@ -1656,9 +1643,9 @@
+ ;;
+ esac
+ lt_int_apple_cc_single_mod=no
+-diff -Naur kxmleditor-1.1.4.orig/admin/ltmain.sh kxmleditor-1.1.4/admin/ltmain.sh
+---- kxmleditor-1.1.4.orig/admin/ltmain.sh 2004-12-06 11:03:40.000000000 +0100
+-+++ kxmleditor-1.1.4/admin/ltmain.sh 2006-08-02 11:14:00.000000000 +0200
++diff -Nrua kxmleditor-1.1.4.orig/admin/ltmain.sh kxmleditor-1.1.4/admin/ltmain.sh
++--- kxmleditor-1.1.4.orig/admin/ltmain.sh 2005-12-21 12:25:52.268041160 +0100
+++++ kxmleditor-1.1.4/admin/ltmain.sh 2005-12-21 12:26:54.136824641 +0100
+ @@ -1149,6 +1149,19 @@
+ finalize_command="$finalize_command $qarg"
+ continue
signature.asc
Description: Dit berichtdeel is digitaal ondertekend
