Hi, I have prepared a (quite trivial) patch which makes the package build with autoconf 2.60 (attached below).
Greetings Arjan Oosting
diff -u konserve-0.10.3/debian/changelog konserve-0.10.3/debian/changelog
--- konserve-0.10.3/debian/changelog
+++ konserve-0.10.3/debian/changelog
@@ -1,3 +1,10 @@
+konserve (0.10.3-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches/01_admin_update.diff: update to support autoconf 2.60 (Closes: #379818)
+
+ -- Arjan Oosting <[EMAIL PROTECTED]> Tue, 1 Aug 2006 02:56:01 +0200
+
konserve (0.10.3-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -u konserve-0.10.3/debian/patches/01_admin_update.diff konserve-0.10.3/debian/patches/01_admin_update.diff
--- konserve-0.10.3/debian/patches/01_admin_update.diff
+++ konserve-0.10.3/debian/patches/01_admin_update.diff
@@ -1,6 +1,6 @@
-diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/acinclude.m4.in ./acinclude.m4.in
+diff -Naur konserve-0.10.3.orig/admin/acinclude.m4.in konserve-0.10.3/admin/acinclude.m4.in
--- konserve-0.10.3.orig/admin/acinclude.m4.in 2004-02-06 16:04:24.000000000 +0100
-+++ konserve-0.10.3/admin/acinclude.m4.in 2005-08-17 16:44:36.945570440 +0200
++++ konserve-0.10.3/admin/acinclude.m4.in 2006-08-01 03:02:30.000000000 +0200
@@ -16,8 +16,8 @@
dnl You should have received a copy of the GNU Library General Public License
@@ -1204,9 +1204,9 @@
+ PKG_CHECK_MODULES($1,$2,$3,$4)
+])
+
-diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/am_edit ./am_edit
+diff -Naur konserve-0.10.3.orig/admin/am_edit konserve-0.10.3/admin/am_edit
--- konserve-0.10.3.orig/admin/am_edit 2004-01-29 15:58:27.000000000 +0100
-+++ konserve-0.10.3/admin/am_edit 2005-08-17 16:44:36.908576064 +0200
++++ konserve-0.10.3/admin/am_edit 2006-08-01 03:02:30.000000000 +0200
@@ -483,6 +483,7 @@
$MakefileData =~ s/$lookup/$replacement/;
$lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
@@ -1283,9 +1283,9 @@
if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
warn "automake line not found in $makefile\n";
# Fallback: first line
-diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/conf.change.pl ./conf.change.pl
+diff -Naur konserve-0.10.3.orig/admin/conf.change.pl konserve-0.10.3/admin/conf.change.pl
--- konserve-0.10.3.orig/admin/conf.change.pl 2003-11-19 11:21:14.000000000 +0100
-+++ konserve-0.10.3/admin/conf.change.pl 2005-08-17 16:44:36.823588984 +0200
++++ konserve-0.10.3/admin/conf.change.pl 2006-08-01 03:02:30.000000000 +0200
@@ -81,7 +81,7 @@
# on autoconf 250, it ends with '# CONFIG_HEADER section'
#
@@ -1295,9 +1295,9 @@
# (pattern: /^\s+#\sRun the commands associated with the file./)
if (/^\s*for\s+ac_file\s+in\s+.*CONFIG_FILES/ ) {
-diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/config.guess ./config.guess
+diff -Naur konserve-0.10.3.orig/admin/config.guess konserve-0.10.3/admin/config.guess
--- konserve-0.10.3.orig/admin/config.guess 2002-10-26 18:44:28.000000000 +0200
-+++ konserve-0.10.3/admin/config.guess 2005-08-17 16:44:36.871581688 +0200
++++ konserve-0.10.3/admin/config.guess 2006-08-01 03:02:30.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -1907,9 +1907,9 @@
# Apollos put the system type in the environment.
-diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/config.sub ./config.sub
+diff -Naur konserve-0.10.3.orig/admin/config.sub konserve-0.10.3/admin/config.sub
--- konserve-0.10.3.orig/admin/config.sub 2002-10-26 18:44:28.000000000 +0200
-+++ konserve-0.10.3/admin/config.sub 2005-08-17 16:44:36.875581080 +0200
++++ konserve-0.10.3/admin/config.sub 2006-08-01 03:02:30.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -2377,9 +2377,9 @@
-vxsim* | -vxworks* | -windiss*)
vendor=wrs
;;
-diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/configure.in.bot.end ./configure.in.bot.end
+diff -Naur konserve-0.10.3.orig/admin/configure.in.bot.end konserve-0.10.3/admin/configure.in.bot.end
--- konserve-0.10.3.orig/admin/configure.in.bot.end 2002-09-21 23:13:34.000000000 +0200
-+++ konserve-0.10.3/admin/configure.in.bot.end 2005-08-01 12:35:31.699056064 +0200
++++ konserve-0.10.3/admin/configure.in.bot.end 2006-08-01 03:02:30.000000000 +0200
@@ -1,6 +1,39 @@
+# Check if KDE_SET_PREFIX was called, and --prefix was passed to configure
+if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
@@ -2421,9 +2421,9 @@
echo "Please remove the file $cache_file after changing your setup"
echo "so that configure will find the changes next time."
echo ""
-diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/cvs.sh ./cvs.sh
---- konserve-0.10.3.orig/admin/cvs.sh 2004-01-30 10:11:51.000000000 +0100
-+++ konserve-0.10.3/admin/cvs.sh 2005-08-17 16:44:36.916574848 +0200
+diff -Naur konserve-0.10.3.orig/admin/cvs.sh konserve-0.10.3/admin/cvs.sh
+--- konserve-0.10.3.orig/admin/cvs.sh 2006-08-01 03:01:07.000000000 +0200
++++ konserve-0.10.3/admin/cvs.sh 2006-08-01 03:03:38.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.
@@ -2433,7 +2433,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
@@ -2441,7 +2450,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"
@@ -66,15 +68,19 @@
echo "*** KDE requires automake $required_automake_version"
exit 1
@@ -2731,9 +2744,9 @@
configure ) call_and_fix_autoconf ;;
* ) echo "Usage: cvs.sh <target>"
echo "Target can be one of:"
-diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/debianrules ./debianrules
+diff -Naur konserve-0.10.3.orig/admin/debianrules konserve-0.10.3/admin/debianrules
--- konserve-0.10.3.orig/admin/debianrules 2004-01-07 18:08:43.000000000 +0100
-+++ konserve-0.10.3/admin/debianrules 2005-08-01 12:35:31.653063056 +0200
++++ konserve-0.10.3/admin/debianrules 2006-08-01 03:02:30.000000000 +0200
@@ -7,113 +7,37 @@
$origPwd = `pwd`;
chomp $origPwd;
@@ -2869,18 +2882,18 @@
- print STDOUT "TerminalApplication=x-terminal-emulator\n";
- exit
-}
-diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/deps.am ./deps.am
+diff -Naur konserve-0.10.3.orig/admin/deps.am konserve-0.10.3/admin/deps.am
--- konserve-0.10.3.orig/admin/deps.am 2003-09-17 20:29:45.000000000 +0200
-+++ konserve-0.10.3/admin/deps.am 2005-08-01 12:35:31.614068984 +0200
++++ konserve-0.10.3/admin/deps.am 2006-08-01 03:02:30.000000000 +0200
@@ -1,4 +1,4 @@
-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh
+$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh $(top_srcdir)/admin/pkg.m4.in
@cd $(top_srcdir) && $(SHELL) admin/cvs.sh acinclude_m4
$(top_srcdir)/configure.in: $(top_srcdir)/subdirs $(top_srcdir)/configure.files $(top_srcdir)/admin/cvs.sh
-diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/detect-autoconf.sh ./detect-autoconf.sh
+diff -Naur konserve-0.10.3.orig/admin/detect-autoconf.sh konserve-0.10.3/admin/detect-autoconf.sh
--- konserve-0.10.3.orig/admin/detect-autoconf.sh 2003-09-07 10:06:48.000000000 +0200
-+++ konserve-0.10.3/admin/detect-autoconf.sh 2005-08-17 16:44:36.880580320 +0200
++++ konserve-0.10.3/admin/detect-autoconf.sh 2006-08-01 03:02:30.000000000 +0200
@@ -7,74 +7,39 @@
AUTOMAKE="automake"
ACLOCAL="aclocal"
@@ -2992,9 +3005,9 @@
+checkAutomake
export WHICH AUTOHEADER AUTOCONF AUTOM4TE AUTOMAKE ACLOCAL
-diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/Doxyfile.global ./Doxyfile.global
+diff -Naur konserve-0.10.3.orig/admin/Doxyfile.global konserve-0.10.3/admin/Doxyfile.global
--- konserve-0.10.3.orig/admin/Doxyfile.global 2003-11-28 01:32:38.000000000 +0100
-+++ konserve-0.10.3/admin/Doxyfile.global 2005-08-17 16:44:36.819589592 +0200
++++ konserve-0.10.3/admin/Doxyfile.global 2006-08-01 03:02:30.000000000 +0200
@@ -1,4 +1,4 @@
-# Doxyfile 1.3.5
+# Doxyfile 1.3.6
@@ -3092,9 +3105,9 @@
#---------------------------------------------------------------------------
# The SEARCHENGINE tag specifies whether or not a search engine should be
-diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/libtool.m4.in ./libtool.m4.in
+diff -Naur konserve-0.10.3.orig/admin/libtool.m4.in konserve-0.10.3/admin/libtool.m4.in
--- konserve-0.10.3.orig/admin/libtool.m4.in 2003-10-30 12:13:16.000000000 +0100
-+++ konserve-0.10.3/admin/libtool.m4.in 2005-08-17 16:44:36.863582904 +0200
++++ konserve-0.10.3/admin/libtool.m4.in 2006-08-01 03:02:30.000000000 +0200
@@ -2094,7 +2094,11 @@
lt_cv_file_magic_test_file=/shlib/libc.so
;;
@@ -3731,9 +3744,9 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/ltmain.sh ./ltmain.sh
+diff -Naur konserve-0.10.3.orig/admin/ltmain.sh konserve-0.10.3/admin/ltmain.sh
--- konserve-0.10.3.orig/admin/ltmain.sh 2003-09-24 10:44:01.000000000 +0200
-+++ konserve-0.10.3/admin/ltmain.sh 2005-08-17 16:44:36.900577280 +0200
++++ konserve-0.10.3/admin/ltmain.sh 2006-08-01 03:02:30.000000000 +0200
@@ -1149,6 +1149,19 @@
finalize_command="$finalize_command $qarg"
continue
@@ -3902,9 +3915,9 @@
else
$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
continue
-diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/Makefile.common ./Makefile.common
+diff -Naur konserve-0.10.3.orig/admin/Makefile.common konserve-0.10.3/admin/Makefile.common
--- konserve-0.10.3.orig/admin/Makefile.common 2003-08-27 14:21:25.000000000 +0200
-+++ konserve-0.10.3/admin/Makefile.common 2005-08-17 16:44:36.919574392 +0200
++++ konserve-0.10.3/admin/Makefile.common 2006-08-01 03:02:30.000000000 +0200
@@ -6,7 +6,7 @@
SHELL=/bin/sh
@@ -3914,9 +3927,9 @@
@admindir=$(admindir); \
if test "x$$admindir" = x; then \
admindir=.; until test -f $$admindir/admin/cvs.sh; do \
-diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/pkg.m4.in ./pkg.m4.in
+diff -Naur konserve-0.10.3.orig/admin/pkg.m4.in konserve-0.10.3/admin/pkg.m4.in
--- konserve-0.10.3.orig/admin/pkg.m4.in 1970-01-01 01:00:00.000000000 +0100
-+++ konserve-0.10.3/admin/pkg.m4.in 2005-08-01 12:35:31.679059104 +0200
++++ konserve-0.10.3/admin/pkg.m4.in 2006-08-01 03:02:30.000000000 +0200
@@ -0,0 +1,57 @@
+
+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
@@ -3978 +3991,216 @@
-Subdirectorios comunes: /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/.svn y ./.svn
+diff -Naur konserve-0.10.3.orig/debian/patches/01_admin_update.diff konserve-0.10.3/debian/patches/01_admin_update.diff
+--- konserve-0.10.3.orig/debian/patches/01_admin_update.diff 2006-08-01 03:04:25.000000000 +0200
++++ konserve-0.10.3/debian/patches/01_admin_update.diff 2006-08-01 02:55:29.000000000 +0200
+@@ -1,6 +1,6 @@
+-diff -Naur konserve-0.10.3.orig/admin/acinclude.m4.in konserve-0.10.3/admin/acinclude.m4.in
++diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/acinclude.m4.in ./acinclude.m4.in
+ --- konserve-0.10.3.orig/admin/acinclude.m4.in 2004-02-06 16:04:24.000000000 +0100
+-+++ konserve-0.10.3/admin/acinclude.m4.in 2006-08-01 03:02:30.000000000 +0200
+++++ konserve-0.10.3/admin/acinclude.m4.in 2005-08-17 16:44:36.945570440 +0200
+ @@ -16,8 +16,8 @@
+
+ dnl You should have received a copy of the GNU Library General Public License
+@@ -1204,9 +1204,9 @@
+ + PKG_CHECK_MODULES($1,$2,$3,$4)
+ +])
+ +
+-diff -Naur konserve-0.10.3.orig/admin/am_edit konserve-0.10.3/admin/am_edit
++diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/am_edit ./am_edit
+ --- konserve-0.10.3.orig/admin/am_edit 2004-01-29 15:58:27.000000000 +0100
+-+++ konserve-0.10.3/admin/am_edit 2006-08-01 03:02:30.000000000 +0200
+++++ konserve-0.10.3/admin/am_edit 2005-08-17 16:44:36.908576064 +0200
+ @@ -483,6 +483,7 @@
+ $MakefileData =~ s/$lookup/$replacement/;
+ $lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
+@@ -1283,9 +1283,9 @@
+ if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
+ warn "automake line not found in $makefile\n";
+ # Fallback: first line
+-diff -Naur konserve-0.10.3.orig/admin/conf.change.pl konserve-0.10.3/admin/conf.change.pl
++diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/conf.change.pl ./conf.change.pl
+ --- konserve-0.10.3.orig/admin/conf.change.pl 2003-11-19 11:21:14.000000000 +0100
+-+++ konserve-0.10.3/admin/conf.change.pl 2006-08-01 03:02:30.000000000 +0200
+++++ konserve-0.10.3/admin/conf.change.pl 2005-08-17 16:44:36.823588984 +0200
+ @@ -81,7 +81,7 @@
+ # on autoconf 250, it ends with '# CONFIG_HEADER section'
+ #
+@@ -1295,9 +1295,9 @@
+ # (pattern: /^\s+#\sRun the commands associated with the file./)
+
+ if (/^\s*for\s+ac_file\s+in\s+.*CONFIG_FILES/ ) {
+-diff -Naur konserve-0.10.3.orig/admin/config.guess konserve-0.10.3/admin/config.guess
++diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/config.guess ./config.guess
+ --- konserve-0.10.3.orig/admin/config.guess 2002-10-26 18:44:28.000000000 +0200
+-+++ konserve-0.10.3/admin/config.guess 2006-08-01 03:02:30.000000000 +0200
+++++ konserve-0.10.3/admin/config.guess 2005-08-17 16:44:36.871581688 +0200
+ @@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+@@ -1907,9 +1907,9 @@
+
+ # Apollos put the system type in the environment.
+
+-diff -Naur konserve-0.10.3.orig/admin/config.sub konserve-0.10.3/admin/config.sub
++diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/config.sub ./config.sub
+ --- konserve-0.10.3.orig/admin/config.sub 2002-10-26 18:44:28.000000000 +0200
+-+++ konserve-0.10.3/admin/config.sub 2006-08-01 03:02:30.000000000 +0200
+++++ konserve-0.10.3/admin/config.sub 2005-08-17 16:44:36.875581080 +0200
+ @@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+@@ -2377,9 +2377,9 @@
+ -vxsim* | -vxworks* | -windiss*)
+ vendor=wrs
+ ;;
+-diff -Naur konserve-0.10.3.orig/admin/configure.in.bot.end konserve-0.10.3/admin/configure.in.bot.end
++diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/configure.in.bot.end ./configure.in.bot.end
+ --- konserve-0.10.3.orig/admin/configure.in.bot.end 2002-09-21 23:13:34.000000000 +0200
+-+++ konserve-0.10.3/admin/configure.in.bot.end 2006-08-01 03:02:30.000000000 +0200
+++++ konserve-0.10.3/admin/configure.in.bot.end 2005-08-01 12:35:31.699056064 +0200
+ @@ -1,6 +1,39 @@
+ +# Check if KDE_SET_PREFIX was called, and --prefix was passed to configure
+ +if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
+@@ -2421,9 +2421,9 @@
+ echo "Please remove the file $cache_file after changing your setup"
+ echo "so that configure will find the changes next time."
+ echo ""
+-diff -Naur konserve-0.10.3.orig/admin/cvs.sh konserve-0.10.3/admin/cvs.sh
+---- konserve-0.10.3.orig/admin/cvs.sh 2006-08-01 03:01:07.000000000 +0200
+-+++ konserve-0.10.3/admin/cvs.sh 2006-08-01 03:03:38.000000000 +0200
++diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/cvs.sh ./cvs.sh
++--- konserve-0.10.3.orig/admin/cvs.sh 2004-01-30 10:11:51.000000000 +0100
+++++ konserve-0.10.3/admin/cvs.sh 2005-08-17 16:44:36.916574848 +0200
+ @@ -6,6 +6,8 @@
+ # It defines a shell function for each known target
+ # and then does a case to call the correct function.
+@@ -2433,16 +2433,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
+@@ -2450,11 +2441,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* ) : ;;
+ @@ -66,15 +68,19 @@
+ echo "*** KDE requires automake $required_automake_version"
+ exit 1
+@@ -2744,9 +2731,9 @@
+ configure ) call_and_fix_autoconf ;;
+ * ) echo "Usage: cvs.sh <target>"
+ echo "Target can be one of:"
+-diff -Naur konserve-0.10.3.orig/admin/debianrules konserve-0.10.3/admin/debianrules
++diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/debianrules ./debianrules
+ --- konserve-0.10.3.orig/admin/debianrules 2004-01-07 18:08:43.000000000 +0100
+-+++ konserve-0.10.3/admin/debianrules 2006-08-01 03:02:30.000000000 +0200
+++++ konserve-0.10.3/admin/debianrules 2005-08-01 12:35:31.653063056 +0200
+ @@ -7,113 +7,37 @@
+ $origPwd = `pwd`;
+ chomp $origPwd;
+@@ -2882,18 +2869,18 @@
+ - print STDOUT "TerminalApplication=x-terminal-emulator\n";
+ - exit
+ -}
+-diff -Naur konserve-0.10.3.orig/admin/deps.am konserve-0.10.3/admin/deps.am
++diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/deps.am ./deps.am
+ --- konserve-0.10.3.orig/admin/deps.am 2003-09-17 20:29:45.000000000 +0200
+-+++ konserve-0.10.3/admin/deps.am 2006-08-01 03:02:30.000000000 +0200
+++++ konserve-0.10.3/admin/deps.am 2005-08-01 12:35:31.614068984 +0200
+ @@ -1,4 +1,4 @@
+ -$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh
+ +$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh $(top_srcdir)/admin/pkg.m4.in
+ @cd $(top_srcdir) && $(SHELL) admin/cvs.sh acinclude_m4
+
+ $(top_srcdir)/configure.in: $(top_srcdir)/subdirs $(top_srcdir)/configure.files $(top_srcdir)/admin/cvs.sh
+-diff -Naur konserve-0.10.3.orig/admin/detect-autoconf.sh konserve-0.10.3/admin/detect-autoconf.sh
++diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/detect-autoconf.sh ./detect-autoconf.sh
+ --- konserve-0.10.3.orig/admin/detect-autoconf.sh 2003-09-07 10:06:48.000000000 +0200
+-+++ konserve-0.10.3/admin/detect-autoconf.sh 2006-08-01 03:02:30.000000000 +0200
+++++ konserve-0.10.3/admin/detect-autoconf.sh 2005-08-17 16:44:36.880580320 +0200
+ @@ -7,74 +7,39 @@
+ AUTOMAKE="automake"
+ ACLOCAL="aclocal"
+@@ -3005,9 +2992,9 @@
+ +checkAutomake
+
+ export WHICH AUTOHEADER AUTOCONF AUTOM4TE AUTOMAKE ACLOCAL
+-diff -Naur konserve-0.10.3.orig/admin/Doxyfile.global konserve-0.10.3/admin/Doxyfile.global
++diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/Doxyfile.global ./Doxyfile.global
+ --- konserve-0.10.3.orig/admin/Doxyfile.global 2003-11-28 01:32:38.000000000 +0100
+-+++ konserve-0.10.3/admin/Doxyfile.global 2006-08-01 03:02:30.000000000 +0200
+++++ konserve-0.10.3/admin/Doxyfile.global 2005-08-17 16:44:36.819589592 +0200
+ @@ -1,4 +1,4 @@
+ -# Doxyfile 1.3.5
+ +# Doxyfile 1.3.6
+@@ -3105,9 +3092,9 @@
+ #---------------------------------------------------------------------------
+
+ # The SEARCHENGINE tag specifies whether or not a search engine should be
+-diff -Naur konserve-0.10.3.orig/admin/libtool.m4.in konserve-0.10.3/admin/libtool.m4.in
++diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/libtool.m4.in ./libtool.m4.in
+ --- konserve-0.10.3.orig/admin/libtool.m4.in 2003-10-30 12:13:16.000000000 +0100
+-+++ konserve-0.10.3/admin/libtool.m4.in 2006-08-01 03:02:30.000000000 +0200
+++++ konserve-0.10.3/admin/libtool.m4.in 2005-08-17 16:44:36.863582904 +0200
+ @@ -2094,7 +2094,11 @@
+ lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
+@@ -3744,9 +3731,9 @@
+ fi
+ runpath_var='LD_RUN_PATH'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-diff -Naur konserve-0.10.3.orig/admin/ltmain.sh konserve-0.10.3/admin/ltmain.sh
++diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/ltmain.sh ./ltmain.sh
+ --- konserve-0.10.3.orig/admin/ltmain.sh 2003-09-24 10:44:01.000000000 +0200
+-+++ konserve-0.10.3/admin/ltmain.sh 2006-08-01 03:02:30.000000000 +0200
+++++ konserve-0.10.3/admin/ltmain.sh 2005-08-17 16:44:36.900577280 +0200
+ @@ -1149,6 +1149,19 @@
+ finalize_command="$finalize_command $qarg"
+ continue
+@@ -3915,9 +3902,9 @@
+ else
+ $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+ continue
+-diff -Naur konserve-0.10.3.orig/admin/Makefile.common konserve-0.10.3/admin/Makefile.common
++diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/Makefile.common ./Makefile.common
+ --- konserve-0.10.3.orig/admin/Makefile.common 2003-08-27 14:21:25.000000000 +0200
+-+++ konserve-0.10.3/admin/Makefile.common 2006-08-01 03:02:30.000000000 +0200
+++++ konserve-0.10.3/admin/Makefile.common 2005-08-17 16:44:36.919574392 +0200
+ @@ -6,7 +6,7 @@
+
+ SHELL=/bin/sh
+@@ -3927,9 +3914,9 @@
+ @admindir=$(admindir); \
+ if test "x$$admindir" = x; then \
+ admindir=.; until test -f $$admindir/admin/cvs.sh; do \
+-diff -Naur konserve-0.10.3.orig/admin/pkg.m4.in konserve-0.10.3/admin/pkg.m4.in
++diff -Nua /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/pkg.m4.in ./pkg.m4.in
+ --- konserve-0.10.3.orig/admin/pkg.m4.in 1970-01-01 01:00:00.000000000 +0100
+-+++ konserve-0.10.3/admin/pkg.m4.in 2006-08-01 03:02:30.000000000 +0200
+++++ konserve-0.10.3/admin/pkg.m4.in 2005-08-01 12:35:31.679059104 +0200
+ @@ -0,0 +1,57 @@
+ +
+ +dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
+@@ -3988,3 +3975,4 @@
+ +])
+ +
+ +
++Subdirectorios comunes: /home/alex/debian/konserve/upstream/konserve-0.10.3/admin/.svn y ./.svn
signature.asc
Description: Dit berichtdeel is digitaal ondertekend
