r19790 - in /desktop/unstable/file-roller/debian: changelog control control.in patches/70_autotools.patch

lethalman-guest at users.alioth.debian.org lethalman-guest at users.alioth.debian.org
Sun Apr 26 08:47:24 UTC 2009


Author: lethalman-guest
Date: Sun Apr 26 08:47:24 2009
New Revision: 19790

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19790
Log:
  * New upstream release.
  * debian/control.in:
    - Remove libglade, libgnome2 and libgnomeui Build-Depends.
  * debian/patches/70_autotools.patch:
    - Update to apply cleanly.


Modified:
    desktop/unstable/file-roller/debian/changelog
    desktop/unstable/file-roller/debian/control
    desktop/unstable/file-roller/debian/control.in
    desktop/unstable/file-roller/debian/patches/70_autotools.patch

Modified: desktop/unstable/file-roller/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/changelog?rev=19790&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/changelog (original)
+++ desktop/unstable/file-roller/debian/changelog Sun Apr 26 08:47:24 2009
@@ -1,3 +1,13 @@
+file-roller (2.26.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/control.in:
+    - Remove libglade, libgnome2 and libgnomeui Build-Depends.
+  * debian/patches/70_autotools.patch:
+    - Update to apply cleanly.
+
+ -- Luca Bruno <lethalman88 at gmail.com>  Sat, 25 Apr 2009 23:26:24 +0200
+
 file-roller (2.24.3-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/unstable/file-roller/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/control?rev=19790&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/control (original)
+++ desktop/unstable/file-roller/debian/control Sun Apr 26 08:47:24 2009
@@ -2,16 +2,13 @@
 Section: gnome
 Priority: optional
 Maintainer: Clément Stenac <zorglub at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Romain Francoise <rfrancoise at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: cdbs (>= 0.4.41),
                quilt,
                debhelper (>= 5),
                gnome-pkg-tools (>= 0.12),
                libglib2.0-dev (>= 2.16.0),
                libgtk2.0-dev (>= 2.13.0),
-               libgnome2-dev (>= 2.6.0),
-               libgnomeui-dev (>= 2.16.0-2),
-               libglade2-dev (>= 1:2.4.0),
                libnautilus-extension-dev (>= 2.22.2),
                gettext,
                intltool (>= 0.35.0),

Modified: desktop/unstable/file-roller/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/control.in?rev=19790&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/control.in (original)
+++ desktop/unstable/file-roller/debian/control.in Sun Apr 26 08:47:24 2009
@@ -9,9 +9,6 @@
                gnome-pkg-tools (>= 0.12),
                libglib2.0-dev (>= 2.16.0),
                libgtk2.0-dev (>= 2.13.0),
-               libgnome2-dev (>= 2.6.0),
-               libgnomeui-dev (>= 2.16.0-2),
-               libglade2-dev (>= 1:2.4.0),
                libnautilus-extension-dev (>= 2.22.2),
                gettext,
                intltool (>= 0.35.0),

Modified: desktop/unstable/file-roller/debian/patches/70_autotools.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/patches/70_autotools.patch?rev=19790&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/patches/70_autotools.patch (original)
+++ desktop/unstable/file-roller/debian/patches/70_autotools.patch Sun Apr 26 08:47:24 2009
@@ -1,261 +1,127 @@
-Index: file-roller-2.24.1/Makefile.in
-===================================================================
---- file-roller-2.24.1.orig/Makefile.in	2008-10-21 01:07:06.000000000 +0200
-+++ file-roller-2.24.1/Makefile.in	2008-11-25 22:32:40.399598971 +0100
-@@ -158,6 +158,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -279,7 +280,7 @@ all: config.h
- .SUFFIXES:
- am--refresh:
- 	@:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -306,9 +307,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	$(SHELL) ./config.status --recheck
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(srcdir) && $(AUTOCONF)
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
- 
- config.h: stamp-h1
-@@ -320,7 +321,7 @@ config.h: stamp-h1
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- 	@rm -f stamp-h1
- 	cd $(top_builddir) && $(SHELL) ./config.status config.h
--$(srcdir)/config.h.in:  $(am__configure_deps) 
-+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
- 	cd $(top_srcdir) && $(AUTOHEADER)
- 	rm -f stamp-h1
- 	touch $@
-Index: file-roller-2.24.1/aclocal.m4
-===================================================================
---- file-roller-2.24.1.orig/aclocal.m4	2008-10-21 01:06:59.000000000 +0200
-+++ file-roller-2.24.1/aclocal.m4	2008-11-25 22:32:36.239103642 +0100
-@@ -34,8 +34,10 @@ AC_DEFUN([AM_GCONF_SOURCE_2],
-     GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-   fi
- 
--  AC_ARG_WITH(gconf-source, 
--  [  --with-gconf-source=sourceaddress      Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
-+  AC_ARG_WITH([gconf-source],
-+	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
-+			     [Config database for installing schema files.]),
-+	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
- 
-   AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-   AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-@@ -44,8 +46,10 @@ AC_DEFUN([AM_GCONF_SOURCE_2],
-     GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-   fi
- 
--  AC_ARG_WITH(gconf-schema-file-dir, 
--  [  --with-gconf-schema-file-dir=dir        Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
-+  AC_ARG_WITH([gconf-schema-file-dir],
-+	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-+			     [Directory for installing schema files.]),
-+	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
- 
-   AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-   AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-@@ -595,9 +599,10 @@ GNOME_DOC_DEFINES
- 
- 
- dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
--# serial 36 IT_PROG_INTLTOOL
--AC_DEFUN([IT_PROG_INTLTOOL],
--[AC_PREREQ([2.50])dnl
-+# serial 40 IT_PROG_INTLTOOL
-+AC_DEFUN([IT_PROG_INTLTOOL], [
-+AC_PREREQ([2.50])dnl
-+AC_REQUIRE([AM_NLS])dnl
- 
- case "$am__api_version" in
-     1.[01234])
-@@ -611,14 +616,21 @@ if test -n "$1"; then
-     AC_MSG_CHECKING([for intltool >= $1])
- 
-     INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
--    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
--    [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
-+    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-+    [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-     ]
-     AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
- 	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
- fi
- 
-+AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-+AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
-+AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
-+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-+    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
-+fi
-+
-   INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
- INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-@@ -663,6 +675,7 @@ AC_SUBST(INTLTOOL_POLICY_RULE)
- AC_PATH_PROG(XGETTEXT, xgettext)
- AC_PATH_PROG(MSGMERGE, msgmerge)
- AC_PATH_PROG(MSGFMT, msgfmt)
-+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
- if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-     AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
- fi
-@@ -673,12 +686,7 @@ if test -z "$xgversion" -o -z "$mmversio
-     AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
- fi
- 
--# Use the tools built into the package, not the ones that are installed.
--AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
--AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
--AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
--
--AC_PATH_PROG(INTLTOOL_PERL, perl)
-+AC_PATH_PROG(INTLTOOL_PERL, [perl])
- if test -z "$INTLTOOL_PERL"; then
-    AC_MSG_ERROR([perl not found; required for intltool])
- fi
-@@ -724,42 +732,6 @@ AC_SUBST(DATADIRNAME)
- 
- IT_PO_SUBDIR([po])
- 
--dnl The following is very similar to
--dnl
--dnl	AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
--dnl
--dnl with the following slight differences:
--dnl  - the *.in files are in ac_aux_dir,
--dnl  - if the file haven't changed upon reconfigure, it's not touched,
--dnl  - the evaluation of the third parameter enables a hack which computes
--dnl    the actual value of $libdir,
--dnl  - the user sees "executing intltool commands", instead of
--dnl    "creating intltool-extract" and such.
--dnl
--dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
--dnl a reason for it.
--
--AC_CONFIG_COMMANDS([intltool], [
--
--for file in intltool-extract intltool-merge intltool-update; do
--  sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
--      -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
--      -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
--	< ${ac_aux_dir}/${file}.in > ${file}.out
--  if cmp -s ${file} ${file}.out 2>/dev/null; then
--    rm -f ${file}.out
--  else
--    mv -f ${file}.out ${file}
--  fi
--  chmod ugo+x ${file}
--  chmod u+w ${file}
--done
--
--],
--[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
--prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" 
--INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'])
--
- ])
- 
- 
-@@ -775,6 +747,9 @@ dnl The following CONFIG_COMMANDS should
- dnl of config.status.
- AC_CONFIG_COMMANDS_PRE([
-   AC_CONFIG_COMMANDS([$1/stamp-it], [
-+    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then
-+       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-+    fi
-     rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-     >"$1/stamp-it.tmp"
-     [sed '/^#/d
-@@ -783,22 +758,17 @@ AC_CONFIG_COMMANDS_PRE([
- 	'"s|^|	$ac_top_srcdir/|" \
-       "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-     ]
--    if test ! -f "$1/Makefile"; then
--      AC_MSG_ERROR([$1/Makefile is not ready.])
+diff -urN file-roller-2.26.1.orig/aclocal.m4 file-roller-2.26.1/aclocal.m4
+--- file-roller-2.26.1.orig/aclocal.m4	2009-04-14 01:03:14.000000000 +0200
++++ file-roller-2.26.1/aclocal.m4	2009-04-26 09:54:27.000000000 +0200
+@@ -5049,6 +5049,9 @@
+   openbsd*)
+     with_gnu_ld=no
+     ;;
++  linux* | k*bsd*-gnu)
++    _LT_TAGVAR(link_all_deplibs, $1)=no
++    ;;
+   esac
+ 
+   _LT_TAGVAR(ld_shlibs, $1)=yes
+@@ -9235,61 +9238,59 @@
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-#serial 5
++#serial 4
+ 
+ # _AM_OUTPUT_DEPENDENCY_COMMANDS
+ # ------------------------------
+ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[{
+-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+-  # are listed without --file.  Let's play safe and only enable the eval
+-  # if we detect the quoting.
+-  case $CONFIG_FILES in
+-  *\'*) eval set x "$CONFIG_FILES" ;;
+-  *)   set x $CONFIG_FILES ;;
+-  esac
+-  shift
+-  for mf
+-  do
+-    # Strip MF so we end up with the name of the file.
+-    mf=`echo "$mf" | sed -e 's/:.*$//'`
+-    # Check whether this is an Automake generated Makefile or not.
+-    # We used to match only the files named `Makefile.in', but
+-    # some people rename them; so instead we look at the file content.
+-    # Grep'ing the first line is not enough: some people post-process
+-    # each Makefile.in and add a new line on top of each file to say so.
+-    # Grep'ing the whole file is not good either: AIX grep has a line
+-    # limit of 2048, but all sed's we know have understand at least 4000.
+-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+-      dirpart=`AS_DIRNAME("$mf")`
+-    else
+-      continue
 -    fi
--    mv "$1/Makefile" "$1/Makefile.tmp"
-     [sed '/^POTFILES =/,/[^\\]$/ {
- 		/^POTFILES =/!d
- 		r $1/POTFILES
- 	  }
--	 ' "$1/Makefile.tmp" >"$1/Makefile"]
-+	 ' "$1/Makefile.in" >"$1/Makefile"]
-     rm -f "$1/Makefile.tmp"
-     mv "$1/stamp-it.tmp" "$1/stamp-it"
-   ])
- ])dnl
- ])
- 
--
- # deprecated macros
- AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
- # A hint is needed for aclocal from Automake <= 1.9.4:
-@@ -807,7 +777,7 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_IN
- 
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- 
--# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
-+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
- 
- 
- # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -7457,6 +7427,38 @@ AC_SUBST([SED])
- AC_MSG_RESULT([$SED])
- ])
- 
-+# nls.m4 serial 3 (gettext-0.15)
-+dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl functionality.
-+dnl Please note that the actual code of the GNU gettext library is covered
-+dnl by the GNU Library General Public License, and the rest of the GNU
-+dnl gettext package package is covered by the GNU General Public License.
-+dnl They are *not* in the public domain.
-+
-+dnl Authors:
-+dnl   Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
-+dnl   Bruno Haible <haible at clisp.cons.org>, 2000-2003.
-+
-+AC_PREREQ(2.50)
-+
-+AC_DEFUN([AM_NLS],
-+[
-+  AC_MSG_CHECKING([whether NLS is requested])
-+  dnl Default is enabled NLS
-+  AC_ARG_ENABLE(nls,
-+    [  --disable-nls           do not use Native Language Support],
-+    USE_NLS=$enableval, USE_NLS=yes)
-+  AC_MSG_RESULT($USE_NLS)
-+  AC_SUBST(USE_NLS)
-+])
-+
- # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
- # 
- # Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
-@@ -8127,6 +8129,35 @@ fi
+-    # Extract the definition of DEPDIR, am__include, and am__quote
+-    # from the Makefile without running `make'.
+-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+-    test -z "$DEPDIR" && continue
+-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+-    test -z "am__include" && continue
+-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+-    # When using ansi2knr, U may be empty or an underscore; expand it
+-    U=`sed -n 's/^U = //p' < "$mf"`
+-    # Find all dependency output files, they are included files with
+-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+-    # simplest approach to changing $(DEPDIR) to its actual value in the
+-    # expansion.
+-    for file in `sed -n "
+-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+-      # Make sure the directory exists.
+-      test -f "$dirpart/$file" && continue
+-      fdir=`AS_DIRNAME(["$file"])`
+-      AS_MKDIR_P([$dirpart/$fdir])
+-      # echo "creating $dirpart/$file"
+-      echo '# dummy' > "$dirpart/$file"
+-    done
++[# Autoconf 2.62 quotes --file arguments for eval, but not when files
++# are listed without --file.  Let's play safe and only enable the eval
++# if we detect the quoting.
++case $CONFIG_FILES in
++*\'*) eval set x "$CONFIG_FILES" ;;
++*)   set x $CONFIG_FILES ;;
++esac
++shift
++for mf
++do
++  # Strip MF so we end up with the name of the file.
++  mf=`echo "$mf" | sed -e 's/:.*$//'`
++  # Check whether this is an Automake generated Makefile or not.
++  # We used to match only the files named `Makefile.in', but
++  # some people rename them; so instead we look at the file content.
++  # Grep'ing the first line is not enough: some people post-process
++  # each Makefile.in and add a new line on top of each file to say so.
++  # Grep'ing the whole file is not good either: AIX grep has a line
++  # limit of 2048, but all sed's we know have understand at least 4000.
++  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++    dirpart=`AS_DIRNAME("$mf")`
++  else
++    continue
++  fi
++  # Extract the definition of DEPDIR, am__include, and am__quote
++  # from the Makefile without running `make'.
++  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++  test -z "$DEPDIR" && continue
++  am__include=`sed -n 's/^am__include = //p' < "$mf"`
++  test -z "am__include" && continue
++  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++  # When using ansi2knr, U may be empty or an underscore; expand it
++  U=`sed -n 's/^U = //p' < "$mf"`
++  # Find all dependency output files, they are included files with
++  # $(DEPDIR) in their names.  We invoke sed twice because it is the
++  # simplest approach to changing $(DEPDIR) to its actual value in the
++  # expansion.
++  for file in `sed -n "
++    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++    # Make sure the directory exists.
++    test -f "$dirpart/$file" && continue
++    fdir=`AS_DIRNAME(["$file"])`
++    AS_MKDIR_P([$dirpart/$fdir])
++    # echo "creating $dirpart/$file"
++    echo '# dummy' > "$dirpart/$file"
+   done
+-}
++done
+ ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+ 
+ 
+@@ -9467,6 +9468,35 @@
  rmdir .tst 2>/dev/null
  AC_SUBST([am__leading_dot])])
  
@@ -291,76 +157,42 @@
  # Check to see how 'make' treats includes.	            -*- Autoconf -*-
  
  # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-Index: file-roller-2.24.1/configure
-===================================================================
---- file-roller-2.24.1.orig/configure	2008-10-21 01:07:02.000000000 +0200
-+++ file-roller-2.24.1/configure	2008-11-25 22:32:41.359599404 +0100
-@@ -828,6 +828,9 @@ am__leading_dot
+diff -urN file-roller-2.26.1.orig/configure file-roller-2.26.1/configure
+--- file-roller-2.26.1.orig/configure	2009-04-14 01:03:19.000000000 +0200
++++ file-roller-2.26.1/configure	2009-04-26 09:54:30.000000000 +0200
+@@ -910,6 +910,9 @@
+ CFLAGS
+ CC
+ ACLOCAL_AMFLAGS
++MAINT
++MAINTAINER_MODE_FALSE
++MAINTAINER_MODE_TRUE
+ am__untar
+ am__tar
  AMTAR
- am__tar
- am__untar
-+MAINTAINER_MODE_TRUE
-+MAINTAINER_MODE_FALSE
-+MAINT
- ACLOCAL_AMFLAGS
- CC
- CFLAGS
-@@ -909,6 +912,9 @@ PO_IN_DATADIR_FALSE
- POFILES
- POSUB
- MKINSTALLDIRS
-+INTLTOOL_UPDATE
-+INTLTOOL_MERGE
-+INTLTOOL_EXTRACT
- INTLTOOL_DESKTOP_RULE
- INTLTOOL_DIRECTORY_RULE
- INTLTOOL_KEYS_RULE
-@@ -929,9 +935,6 @@ INTLTOOL_THEME_RULE
- INTLTOOL_SERVICE_RULE
- INTLTOOL_POLICY_RULE
- MSGMERGE
--INTLTOOL_EXTRACT
--INTLTOOL_MERGE
--INTLTOOL_UPDATE
- INTLTOOL_PERL
- ALL_LINGUAS
- HELP_DIR
-@@ -1550,6 +1553,8 @@ if test -n "$ac_init_help"; then
- Optional Features:
+@@ -973,6 +976,7 @@
+ ac_subst_files=''
+ ac_user_opts='
+ enable_option_checking
++enable_maintainer_mode
+ enable_dependency_tracking
+ enable_static
+ enable_shared
+@@ -1636,6 +1640,8 @@
+   --disable-option-checking  ignore unrecognized --enable/--with options
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
 +  --enable-maintainer-mode  enable make rules and dependencies not useful
 +			  (and sometimes confusing) to the casual installer
    --disable-dependency-tracking  speeds up one-time build
    --enable-dependency-tracking   do not reject slow dependency extractors
-   --enable-shared[=PKGS]  build shared libraries [default=yes]
-@@ -1559,6 +1564,7 @@ Optional Features:
-   --disable-libtool-lock  avoid locking (might break parallel builds)
-   --disable-nautilus-actions
-                           don't build the nautilus context menu actions
-+  --disable-nls           do not use Native Language Support
-   --disable-scrollkeeper  do not make updates to the scrollkeeper database
-   --enable-deprecations   warn about deprecated usages
-   --disable-schemas-install	Disable the schemas installation
-@@ -1574,8 +1580,10 @@ Optional Packages:
-   --with-omf-dir=DIR      path to OMF files
-   --with-help-formats=FORMATS
-                           list of formats
--  --with-gconf-source=sourceaddress      Config database for installing schema files.
--  --with-gconf-schema-file-dir=dir        Directory for installing schema files.
-+  --with-gconf-source=sourceaddress
-+                          Config database for installing schema files.
-+  --with-gconf-schema-file-dir=dir
-+                          Directory for installing schema files.
- 
- Some influential environment variables:
-   CC          C compiler command
-@@ -2514,6 +2522,29 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+   --enable-static[=PKGS]  build static libraries [default=no]
+@@ -2624,6 +2630,29 @@
  ac_config_headers="$ac_config_headers config.h"
  
  
-+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
++$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
 +    # Check whether --enable-maintainer-mode was given.
 +if test "${enable_maintainer_mode+set}" = set; then
 +  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
@@ -368,8 +200,8 @@
 +  USE_MAINTAINER_MODE=no
 +fi
 +
-+  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
++  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++$as_echo "$USE_MAINTAINER_MODE" >&6; }
 +   if test $USE_MAINTAINER_MODE = yes; then
 +  MAINTAINER_MODE_TRUE=
 +  MAINTAINER_MODE_FALSE='#'
@@ -385,566 +217,363 @@
  
  
  
-@@ -4422,7 +4453,7 @@ ia64-*-hpux*)
+@@ -4471,13 +4500,13 @@
+ else
+   lt_cv_nm_interface="BSD nm"
+   echo "int some_variable = 0;" > conftest.$ac_ext
+-  (eval echo "\"\$as_me:4474: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:4503: $ac_compile\"" >&5)
+   (eval "$ac_compile" 2>conftest.err)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:4477: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:4506: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:4480: output\"" >&5)
++  (eval echo "\"\$as_me:4509: output\"" >&5)
+   cat conftest.out >&5
+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+     lt_cv_nm_interface="MS dumpbin"
+@@ -5683,7 +5712,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 4425 "configure"' > conftest.$ac_ext
-+  echo '#line 4456 "configure"' > conftest.$ac_ext
+-  echo '#line 5686 "configure"' > conftest.$ac_ext
++  echo '#line 5715 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7479,11 +7510,11 @@ else
+@@ -7506,11 +7535,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7482: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7513: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:7509: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7538: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:7486: \$? = $ac_status" >&5
-+   echo "$as_me:7517: \$? = $ac_status" >&5
+-   echo "$as_me:7513: \$? = $ac_status" >&5
++   echo "$as_me:7542: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -7769,11 +7800,11 @@ else
+@@ -7845,11 +7874,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7772: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7803: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:7848: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7877: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:7776: \$? = $ac_status" >&5
-+   echo "$as_me:7807: \$? = $ac_status" >&5
+-   echo "$as_me:7852: \$? = $ac_status" >&5
++   echo "$as_me:7881: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -7873,11 +7904,11 @@ else
+@@ -7950,11 +7979,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7876: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7907: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:7953: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7982: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:7880: \$? = $ac_status" >&5
-+   echo "$as_me:7911: \$? = $ac_status" >&5
+-   echo "$as_me:7957: \$? = $ac_status" >&5
++   echo "$as_me:7986: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -10250,7 +10281,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 10253 "configure"
-+#line 10284 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -10350,7 +10381,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 10353 "configure"
-+#line 10384 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -12751,11 +12782,11 @@ else
+@@ -8005,11 +8034,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12754: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12785: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:12758: \$? = $ac_status" >&5
-+   echo "$as_me:12789: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -12855,11 +12886,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12858: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12889: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:8008: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8037: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:12862: \$? = $ac_status" >&5
-+   echo "$as_me:12893: \$? = $ac_status" >&5
+-   echo "$as_me:8012: \$? = $ac_status" >&5
++   echo "$as_me:8041: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -14453,11 +14484,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14456: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14487: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:14460: \$? = $ac_status" >&5
-+   echo "$as_me:14491: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -14557,11 +14588,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14560: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14591: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:14564: \$? = $ac_status" >&5
-+   echo "$as_me:14595: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -16777,11 +16808,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16780: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16811: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:16784: \$? = $ac_status" >&5
-+   echo "$as_me:16815: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -17067,11 +17098,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:17070: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17101: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:17074: \$? = $ac_status" >&5
-+   echo "$as_me:17105: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -17171,11 +17202,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:17174: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17205: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:17178: \$? = $ac_status" >&5
-+   echo "$as_me:17209: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -21944,6 +21975,21 @@ echo "${ECHO_T}$LINGUAS" >&6; }
- 	< $srcdir/po/POTFILES.in > po/POTFILES
- 
- 
-+  { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-+echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
-+    # Check whether --enable-nls was given.
-+if test "${enable_nls+set}" = set; then
-+  enableval=$enable_nls; USE_NLS=$enableval
-+else
-+  USE_NLS=yes
-+fi
-+
-+  { echo "$as_me:$LINENO: result: $USE_NLS" >&5
-+echo "${ECHO_T}$USE_NLS" >&6; }
-+
-+
-+
-+
- case "$am__api_version" in
-     1.01234)
- 	{ { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
-@@ -21959,8 +22005,8 @@ if test -n "0.35.0"; then
- echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6; }
- 
-     INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
--    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
--    INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
-+    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-+    INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- 
-     { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
- echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
-@@ -21970,6 +22016,132 @@ echo "$as_me: error: Your intltool is to
-    { (exit 1); exit 1; }; }
- fi
- 
-+# Extract the first word of "intltool-update", so it can be a program name with args.
-+set dummy intltool-update; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $INTLTOOL_UPDATE in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
-+if test -n "$INTLTOOL_UPDATE"; then
-+  { echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
-+echo "${ECHO_T}$INTLTOOL_UPDATE" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+# Extract the first word of "intltool-merge", so it can be a program name with args.
-+set dummy intltool-merge; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $INTLTOOL_MERGE in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
-+if test -n "$INTLTOOL_MERGE"; then
-+  { echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
-+echo "${ECHO_T}$INTLTOOL_MERGE" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+# Extract the first word of "intltool-extract", so it can be a program name with args.
-+set dummy intltool-extract; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $INTLTOOL_EXTRACT in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
-+if test -n "$INTLTOOL_EXTRACT"; then
-+  { echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
-+echo "${ECHO_T}$INTLTOOL_EXTRACT" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-+    { { echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
-+echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-   INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -22131,6 +22303,47 @@ echo "${ECHO_T}no" >&6; }
- fi
- 
- 
-+# Extract the first word of "gmsgfmt", so it can be a program name with args.
-+set dummy gmsgfmt; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GMSGFMT+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $GMSGFMT in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-+  ;;
-+esac
-+fi
-+GMSGFMT=$ac_cv_path_GMSGFMT
-+if test -n "$GMSGFMT"; then
-+  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+echo "${ECHO_T}$GMSGFMT" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
- if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-     { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
- echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-@@ -22145,14 +22358,6 @@ echo "$as_me: error: GNU gettext tools n
-    { (exit 1); exit 1; }; }
- fi
- 
--# Use the tools built into the package, not the ones that are installed.
--INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
--
--INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
--
--INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
--
--
- # Extract the first word of "perl", so it can be a program name with args.
- set dummy perl; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -22365,10 +22570,6 @@ fi
- 
- 
- 
--ac_config_commands="$ac_config_commands intltool"
--
--
--
- 
- if test "x${prefix}" = "xNONE"; then
- 
-@@ -22809,6 +23010,13 @@ LIBOBJS=$ac_libobjs
+@@ -8124,6 +8153,9 @@
+   openbsd*)
+     with_gnu_ld=no
+     ;;
++  linux* | k*bsd*-gnu)
++    link_all_deplibs=no
++    ;;
+   esac
+ 
+   ld_shlibs=yes
+@@ -10818,7 +10850,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 10821 "configure"
++#line 10853 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -10914,7 +10946,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 10917 "configure"
++#line 10949 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -14533,6 +14565,13 @@
  LTLIBOBJS=$ac_ltlibobjs
  
  
 +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
++  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
 +Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
++$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
 +Usually this means the macro was only invoked conditionally." >&2;}
 +   { (exit 1); exit 1; }; }
 +fi
  if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+   { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -23335,9 +23543,6 @@ cat >>$CONFIG_STATUS <<_ACEOF
- #
- AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
- 
--INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
--prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
--INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'
- 
- _ACEOF
- 
-@@ -23350,7 +23555,6 @@ do
-     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-     "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
--    "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
-     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-     "file-roller.spec") CONFIG_FILES="$CONFIG_FILES file-roller.spec" ;;
-     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
-@@ -23496,6 +23700,9 @@ am__leading_dot!$am__leading_dot$ac_deli
- AMTAR!$AMTAR$ac_delim
- am__tar!$am__tar$ac_delim
- am__untar!$am__untar$ac_delim
-+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
-+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
-+MAINT!$MAINT$ac_delim
- ACLOCAL_AMFLAGS!$ACLOCAL_AMFLAGS$ac_delim
- CC!$CC$ac_delim
- CFLAGS!$CFLAGS$ac_delim
-@@ -23531,9 +23738,6 @@ RANLIB!$RANLIB$ac_delim
- DSYMUTIL!$DSYMUTIL$ac_delim
- NMEDIT!$NMEDIT$ac_delim
- CPP!$CPP$ac_delim
--CXX!$CXX$ac_delim
--CXXFLAGS!$CXXFLAGS$ac_delim
--ac_ct_CXX!$ac_ct_CXX$ac_delim
- _ACEOF
- 
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -23575,6 +23779,9 @@ _ACEOF
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   cat >conf$$subs.sed <<_ACEOF
-+CXX!$CXX$ac_delim
-+CXXFLAGS!$CXXFLAGS$ac_delim
-+ac_ct_CXX!$ac_ct_CXX$ac_delim
- CXXDEPMODE!$CXXDEPMODE$ac_delim
- am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
- am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-@@ -23618,6 +23825,9 @@ PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE
- POFILES!$POFILES$ac_delim
- POSUB!$POSUB$ac_delim
- MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
-+INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
-+INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
-+INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
- INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
- INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
- INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
-@@ -23638,9 +23848,6 @@ INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE
- INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
- INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
- MSGMERGE!$MSGMERGE$ac_delim
--INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
--INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
--INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
- INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
- ALL_LINGUAS!$ALL_LINGUAS$ac_delim
- HELP_DIR!$HELP_DIR$ac_delim
-@@ -23663,7 +23870,7 @@ LIBOBJS!$LIBOBJS$ac_delim
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -24233,24 +24440,12 @@ done
-     "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
-         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-       esac ;;
--    "intltool":C)
--
--for file in intltool-extract intltool-merge intltool-update; do
--  sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
--      -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
--      -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
--	< ${ac_aux_dir}/${file}.in > ${file}.out
--  if cmp -s ${file} ${file}.out 2>/dev/null; then
--    rm -f ${file}.out
--  else
--    mv -f ${file}.out ${file}
--  fi
--  chmod ugo+x ${file}
--  chmod u+w ${file}
--done
--
-- ;;
-     "po/stamp-it":C)
-+    if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then
-+       { { echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
-+echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
-+   { (exit 1); exit 1; }; }
-+    fi
-     rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
-     >"po/stamp-it.tmp"
-     sed '/^#/d
-@@ -24259,17 +24454,11 @@ done
- 	'"s|^|	$ac_top_srcdir/|" \
-       "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
- 
--    if test ! -f "po/Makefile"; then
--      { { echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5
--echo "$as_me: error: po/Makefile is not ready." >&2;}
--   { (exit 1); exit 1; }; }
+@@ -16047,28 +16086,27 @@
+ 
+ 
+   case $ac_file$ac_mode in
+-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+-  # are listed without --file.  Let's play safe and only enable the eval
+-  # if we detect the quoting.
+-  case $CONFIG_FILES in
+-  *\'*) eval set x "$CONFIG_FILES" ;;
+-  *)   set x $CONFIG_FILES ;;
+-  esac
+-  shift
+-  for mf
+-  do
+-    # Strip MF so we end up with the name of the file.
+-    mf=`echo "$mf" | sed -e 's/:.*$//'`
+-    # Check whether this is an Automake generated Makefile or not.
+-    # We used to match only the files named `Makefile.in', but
+-    # some people rename them; so instead we look at the file content.
+-    # Grep'ing the first line is not enough: some people post-process
+-    # each Makefile.in and add a new line on top of each file to say so.
+-    # Grep'ing the whole file is not good either: AIX grep has a line
+-    # limit of 2048, but all sed's we know have understand at least 4000.
+-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+-      dirpart=`$as_dirname -- "$mf" ||
++    "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
++# are listed without --file.  Let's play safe and only enable the eval
++# if we detect the quoting.
++case $CONFIG_FILES in
++*\'*) eval set x "$CONFIG_FILES" ;;
++*)   set x $CONFIG_FILES ;;
++esac
++shift
++for mf
++do
++  # Strip MF so we end up with the name of the file.
++  mf=`echo "$mf" | sed -e 's/:.*$//'`
++  # Check whether this is an Automake generated Makefile or not.
++  # We used to match only the files named `Makefile.in', but
++  # some people rename them; so instead we look at the file content.
++  # Grep'ing the first line is not enough: some people post-process
++  # each Makefile.in and add a new line on top of each file to say so.
++  # Grep'ing the whole file is not good either: AIX grep has a line
++  # limit of 2048, but all sed's we know have understand at least 4000.
++  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++    dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$mf" : 'X\(//\)[^/]' \| \
+ 	 X"$mf" : 'X\(//\)$' \| \
+@@ -16091,28 +16129,28 @@
+ 	    q
+ 	  }
+ 	  s/.*/./; q'`
+-    else
+-      continue
 -    fi
--    mv "po/Makefile" "po/Makefile.tmp"
-     sed '/^POTFILES =/,/[^\\]$/ {
- 		/^POTFILES =/!d
- 		r po/POTFILES
+-    # Extract the definition of DEPDIR, am__include, and am__quote
+-    # from the Makefile without running `make'.
+-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+-    test -z "$DEPDIR" && continue
+-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+-    test -z "am__include" && continue
+-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+-    # When using ansi2knr, U may be empty or an underscore; expand it
+-    U=`sed -n 's/^U = //p' < "$mf"`
+-    # Find all dependency output files, they are included files with
+-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+-    # simplest approach to changing $(DEPDIR) to its actual value in the
+-    # expansion.
+-    for file in `sed -n "
+-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+-      # Make sure the directory exists.
+-      test -f "$dirpart/$file" && continue
+-      fdir=`$as_dirname -- "$file" ||
++  else
++    continue
++  fi
++  # Extract the definition of DEPDIR, am__include, and am__quote
++  # from the Makefile without running `make'.
++  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++  test -z "$DEPDIR" && continue
++  am__include=`sed -n 's/^am__include = //p' < "$mf"`
++  test -z "am__include" && continue
++  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++  # When using ansi2knr, U may be empty or an underscore; expand it
++  U=`sed -n 's/^U = //p' < "$mf"`
++  # Find all dependency output files, they are included files with
++  # $(DEPDIR) in their names.  We invoke sed twice because it is the
++  # simplest approach to changing $(DEPDIR) to its actual value in the
++  # expansion.
++  for file in `sed -n "
++    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++    # Make sure the directory exists.
++    test -f "$dirpart/$file" && continue
++    fdir=`$as_dirname -- "$file" ||
+ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$file" : 'X\(//\)[^/]' \| \
+ 	 X"$file" : 'X\(//\)$' \| \
+@@ -16135,7 +16173,7 @@
+ 	    q
  	  }
--	 ' "po/Makefile.tmp" >"po/Makefile"
-+	 ' "po/Makefile.in" >"po/Makefile"
-     rm -f "po/Makefile.tmp"
-     mv "po/stamp-it.tmp" "po/stamp-it"
-    ;;
-Index: file-roller-2.24.1/data/Makefile.in
-===================================================================
---- file-roller-2.24.1.orig/data/Makefile.in	2008-10-21 01:07:04.000000000 +0200
-+++ file-roller-2.24.1/data/Makefile.in	2008-11-25 22:32:38.619599279 +0100
-@@ -156,6 +156,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -261,7 +262,7 @@ DISTCLEANFILES = \
+ 	  s/.*/./; q'`
+-      { as_dir=$dirpart/$fdir
++    { as_dir=$dirpart/$fdir
+   case $as_dir in #(
+   -*) as_dir=./$as_dir;;
+   esac
+@@ -16176,11 +16214,10 @@
+   } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+    { (exit 1); exit 1; }; }; }
+-      # echo "creating $dirpart/$file"
+-      echo '# dummy' > "$dirpart/$file"
+-    done
++    # echo "creating $dirpart/$file"
++    echo '# dummy' > "$dirpart/$file"
+   done
+-}
++done
+  ;;
+     "libtool":C)
+ 
+diff -urN file-roller-2.26.1.orig/copy-n-paste/Makefile.in file-roller-2.26.1/copy-n-paste/Makefile.in
+--- file-roller-2.26.1.orig/copy-n-paste/Makefile.in	2009-04-14 01:03:23.000000000 +0200
++++ file-roller-2.26.1/copy-n-paste/Makefile.in	2009-04-26 09:54:35.000000000 +0200
+@@ -135,6 +135,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -243,7 +244,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+@@ -268,9 +269,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ clean-noinstLTLIBRARIES:
+diff -urN file-roller-2.26.1.orig/data/icons/16x16/actions/Makefile.in file-roller-2.26.1/data/icons/16x16/actions/Makefile.in
+--- file-roller-2.26.1.orig/data/icons/16x16/actions/Makefile.in	2009-04-14 01:03:23.000000000 +0200
++++ file-roller-2.26.1/data/icons/16x16/actions/Makefile.in	2009-04-26 09:54:36.000000000 +0200
+@@ -119,6 +119,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -225,7 +226,7 @@
+ all: all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+@@ -250,9 +251,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+diff -urN file-roller-2.26.1.orig/data/icons/16x16/apps/Makefile.in file-roller-2.26.1/data/icons/16x16/apps/Makefile.in
+--- file-roller-2.26.1.orig/data/icons/16x16/apps/Makefile.in	2009-04-14 01:03:24.000000000 +0200
++++ file-roller-2.26.1/data/icons/16x16/apps/Makefile.in	2009-04-26 09:54:36.000000000 +0200
+@@ -119,6 +119,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -224,7 +225,7 @@
+ all: all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+@@ -249,9 +250,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+diff -urN file-roller-2.26.1.orig/data/icons/16x16/Makefile.in file-roller-2.26.1/data/icons/16x16/Makefile.in
+--- file-roller-2.26.1.orig/data/icons/16x16/Makefile.in	2009-04-14 01:03:23.000000000 +0200
++++ file-roller-2.26.1/data/icons/16x16/Makefile.in	2009-04-26 09:54:36.000000000 +0200
+@@ -121,6 +121,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -214,7 +215,7 @@
  all: all-recursive
  
  .SUFFIXES:
@@ -953,7 +582,359 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
-@@ -286,9 +287,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -239,9 +240,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+diff -urN file-roller-2.26.1.orig/data/icons/22x22/apps/Makefile.in file-roller-2.26.1/data/icons/22x22/apps/Makefile.in
+--- file-roller-2.26.1.orig/data/icons/22x22/apps/Makefile.in	2009-04-14 01:03:24.000000000 +0200
++++ file-roller-2.26.1/data/icons/22x22/apps/Makefile.in	2009-04-26 09:54:36.000000000 +0200
+@@ -119,6 +119,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -224,7 +225,7 @@
+ all: all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+@@ -249,9 +250,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+diff -urN file-roller-2.26.1.orig/data/icons/22x22/Makefile.in file-roller-2.26.1/data/icons/22x22/Makefile.in
+--- file-roller-2.26.1.orig/data/icons/22x22/Makefile.in	2009-04-14 01:03:24.000000000 +0200
++++ file-roller-2.26.1/data/icons/22x22/Makefile.in	2009-04-26 09:54:36.000000000 +0200
+@@ -121,6 +121,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -214,7 +215,7 @@
+ all: all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+@@ -239,9 +240,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+diff -urN file-roller-2.26.1.orig/data/icons/24x24/actions/Makefile.in file-roller-2.26.1/data/icons/24x24/actions/Makefile.in
+--- file-roller-2.26.1.orig/data/icons/24x24/actions/Makefile.in	2009-04-14 01:03:25.000000000 +0200
++++ file-roller-2.26.1/data/icons/24x24/actions/Makefile.in	2009-04-26 09:54:36.000000000 +0200
+@@ -119,6 +119,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -225,7 +226,7 @@
+ all: all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+@@ -250,9 +251,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+diff -urN file-roller-2.26.1.orig/data/icons/24x24/apps/Makefile.in file-roller-2.26.1/data/icons/24x24/apps/Makefile.in
+--- file-roller-2.26.1.orig/data/icons/24x24/apps/Makefile.in	2009-04-14 01:03:25.000000000 +0200
++++ file-roller-2.26.1/data/icons/24x24/apps/Makefile.in	2009-04-26 09:54:36.000000000 +0200
+@@ -119,6 +119,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -224,7 +225,7 @@
+ all: all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+@@ -249,9 +250,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+diff -urN file-roller-2.26.1.orig/data/icons/24x24/Makefile.in file-roller-2.26.1/data/icons/24x24/Makefile.in
+--- file-roller-2.26.1.orig/data/icons/24x24/Makefile.in	2009-04-14 01:03:24.000000000 +0200
++++ file-roller-2.26.1/data/icons/24x24/Makefile.in	2009-04-26 09:54:36.000000000 +0200
+@@ -121,6 +121,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -214,7 +215,7 @@
+ all: all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+@@ -239,9 +240,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+diff -urN file-roller-2.26.1.orig/data/icons/32x32/apps/Makefile.in file-roller-2.26.1/data/icons/32x32/apps/Makefile.in
+--- file-roller-2.26.1.orig/data/icons/32x32/apps/Makefile.in	2009-04-14 01:03:25.000000000 +0200
++++ file-roller-2.26.1/data/icons/32x32/apps/Makefile.in	2009-04-26 09:54:36.000000000 +0200
+@@ -119,6 +119,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -224,7 +225,7 @@
+ all: all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+@@ -249,9 +250,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+diff -urN file-roller-2.26.1.orig/data/icons/32x32/Makefile.in file-roller-2.26.1/data/icons/32x32/Makefile.in
+--- file-roller-2.26.1.orig/data/icons/32x32/Makefile.in	2009-04-14 01:03:25.000000000 +0200
++++ file-roller-2.26.1/data/icons/32x32/Makefile.in	2009-04-26 09:54:36.000000000 +0200
+@@ -121,6 +121,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -214,7 +215,7 @@
+ all: all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+@@ -239,9 +240,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+diff -urN file-roller-2.26.1.orig/data/icons/Makefile.in file-roller-2.26.1/data/icons/Makefile.in
+--- file-roller-2.26.1.orig/data/icons/Makefile.in	2009-04-14 01:03:26.000000000 +0200
++++ file-roller-2.26.1/data/icons/Makefile.in	2009-04-26 09:54:36.000000000 +0200
+@@ -121,6 +121,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -214,7 +215,7 @@
+ all: all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+@@ -239,9 +240,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+diff -urN file-roller-2.26.1.orig/data/icons/scalable/apps/Makefile.in file-roller-2.26.1/data/icons/scalable/apps/Makefile.in
+--- file-roller-2.26.1.orig/data/icons/scalable/apps/Makefile.in	2009-04-14 01:03:26.000000000 +0200
++++ file-roller-2.26.1/data/icons/scalable/apps/Makefile.in	2009-04-26 09:54:37.000000000 +0200
+@@ -119,6 +119,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -224,7 +225,7 @@
+ all: all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+@@ -249,9 +250,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+diff -urN file-roller-2.26.1.orig/data/icons/scalable/Makefile.in file-roller-2.26.1/data/icons/scalable/Makefile.in
+--- file-roller-2.26.1.orig/data/icons/scalable/Makefile.in	2009-04-14 01:03:26.000000000 +0200
++++ file-roller-2.26.1/data/icons/scalable/Makefile.in	2009-04-26 09:54:36.000000000 +0200
+@@ -121,6 +121,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -214,7 +215,7 @@
+ all: all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+@@ -239,9 +240,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+diff -urN file-roller-2.26.1.orig/data/Makefile.in file-roller-2.26.1/data/Makefile.in
+--- file-roller-2.26.1.orig/data/Makefile.in	2009-04-14 01:03:23.000000000 +0200
++++ file-roller-2.26.1/data/Makefile.in	2009-04-26 09:54:35.000000000 +0200
+@@ -133,6 +133,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -243,7 +244,7 @@
+ all: all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+@@ -268,9 +269,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -965,19 +946,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  file-roller.desktop.in: $(top_builddir)/config.status $(srcdir)/file-roller.desktop.in.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-Index: file-roller-2.24.1/data/glade/Makefile.in
-===================================================================
---- file-roller-2.24.1.orig/data/glade/Makefile.in	2008-10-21 01:07:04.000000000 +0200
-+++ file-roller-2.24.1/data/glade/Makefile.in	2008-11-25 22:32:38.695599511 +0100
-@@ -142,6 +142,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -242,7 +243,7 @@ EXTRA_DIST = $(glade_DATA)
+diff -urN file-roller-2.26.1.orig/data/ui/Makefile.in file-roller-2.26.1/data/ui/Makefile.in
+--- file-roller-2.26.1.orig/data/ui/Makefile.in	2009-04-14 01:03:26.000000000 +0200
++++ file-roller-2.26.1/data/ui/Makefile.in	2009-04-26 09:54:37.000000000 +0200
+@@ -119,6 +119,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -224,7 +225,7 @@
  all: all-am
  
  .SUFFIXES:
@@ -986,460 +966,30 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
-@@ -267,9 +268,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-Index: file-roller-2.24.1/data/icons/16x16/Makefile.in
-===================================================================
---- file-roller-2.24.1.orig/data/icons/16x16/Makefile.in	2008-10-21 01:07:04.000000000 +0200
-+++ file-roller-2.24.1/data/icons/16x16/Makefile.in	2008-11-25 22:32:38.775599342 +0100
-@@ -144,6 +144,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -232,7 +233,7 @@ SUBDIRS = actions apps	
- all: all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -257,9 +258,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-Index: file-roller-2.24.1/data/icons/16x16/actions/Makefile.in
-===================================================================
---- file-roller-2.24.1.orig/data/icons/16x16/actions/Makefile.in	2008-10-21 01:07:04.000000000 +0200
-+++ file-roller-2.24.1/data/icons/16x16/actions/Makefile.in	2008-11-25 22:32:38.859599264 +0100
-@@ -142,6 +142,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -243,7 +244,7 @@ EXTRA_DIST = \
- all: all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -268,9 +269,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-Index: file-roller-2.24.1/data/icons/16x16/apps/Makefile.in
-===================================================================
---- file-roller-2.24.1.orig/data/icons/16x16/apps/Makefile.in	2008-10-21 01:07:04.000000000 +0200
-+++ file-roller-2.24.1/data/icons/16x16/apps/Makefile.in	2008-11-25 22:32:38.943599186 +0100
-@@ -142,6 +142,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -242,7 +243,7 @@ gtk_update_icon_cache = gtk-update-icon-
- all: all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -267,9 +268,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-Index: file-roller-2.24.1/data/icons/22x22/Makefile.in
-===================================================================
---- file-roller-2.24.1.orig/data/icons/22x22/Makefile.in	2008-10-21 01:07:05.000000000 +0200
-+++ file-roller-2.24.1/data/icons/22x22/Makefile.in	2008-11-25 22:32:39.023599018 +0100
-@@ -144,6 +144,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -232,7 +233,7 @@ SUBDIRS = apps	
- all: all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -257,9 +258,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-Index: file-roller-2.24.1/data/icons/22x22/apps/Makefile.in
-===================================================================
---- file-roller-2.24.1.orig/data/icons/22x22/apps/Makefile.in	2008-10-21 01:07:05.000000000 +0200
-+++ file-roller-2.24.1/data/icons/22x22/apps/Makefile.in	2008-11-25 22:32:39.107600406 +0100
-@@ -142,6 +142,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -242,7 +243,7 @@ gtk_update_icon_cache = gtk-update-icon-
- all: all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -267,9 +268,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-Index: file-roller-2.24.1/data/icons/24x24/Makefile.in
-===================================================================
---- file-roller-2.24.1.orig/data/icons/24x24/Makefile.in	2008-10-21 01:07:05.000000000 +0200
-+++ file-roller-2.24.1/data/icons/24x24/Makefile.in	2008-11-25 22:32:39.191599350 +0100
-@@ -144,6 +144,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -232,7 +233,7 @@ SUBDIRS = actions apps
- all: all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -257,9 +258,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-Index: file-roller-2.24.1/data/icons/24x24/actions/Makefile.in
-===================================================================
---- file-roller-2.24.1.orig/data/icons/24x24/actions/Makefile.in	2008-10-21 01:07:05.000000000 +0200
-+++ file-roller-2.24.1/data/icons/24x24/actions/Makefile.in	2008-11-25 22:32:39.271599671 +0100
-@@ -142,6 +142,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -243,7 +244,7 @@ EXTRA_DIST = \
- all: all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -268,9 +269,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-Index: file-roller-2.24.1/data/icons/24x24/apps/Makefile.in
-===================================================================
---- file-roller-2.24.1.orig/data/icons/24x24/apps/Makefile.in	2008-10-21 01:07:05.000000000 +0200
-+++ file-roller-2.24.1/data/icons/24x24/apps/Makefile.in	2008-11-25 22:32:39.355600082 +0100
-@@ -142,6 +142,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -242,7 +243,7 @@ gtk_update_icon_cache = gtk-update-icon-
- all: all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -267,9 +268,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-Index: file-roller-2.24.1/data/icons/32x32/Makefile.in
-===================================================================
---- file-roller-2.24.1.orig/data/icons/32x32/Makefile.in	2008-10-21 01:07:05.000000000 +0200
-+++ file-roller-2.24.1/data/icons/32x32/Makefile.in	2008-11-25 22:32:39.439599026 +0100
-@@ -144,6 +144,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -232,7 +233,7 @@ SUBDIRS = apps	
- all: all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -257,9 +258,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-Index: file-roller-2.24.1/data/icons/32x32/apps/Makefile.in
-===================================================================
---- file-roller-2.24.1.orig/data/icons/32x32/apps/Makefile.in	2008-10-21 01:07:05.000000000 +0200
-+++ file-roller-2.24.1/data/icons/32x32/apps/Makefile.in	2008-11-25 22:32:39.523599437 +0100
-@@ -142,6 +142,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -242,7 +243,7 @@ gtk_update_icon_cache = gtk-update-icon-
- all: all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -267,9 +268,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-Index: file-roller-2.24.1/data/icons/Makefile.in
-===================================================================
---- file-roller-2.24.1.orig/data/icons/Makefile.in	2008-10-21 01:07:05.000000000 +0200
-+++ file-roller-2.24.1/data/icons/Makefile.in	2008-11-25 22:32:39.599598691 +0100
-@@ -144,6 +144,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -232,7 +233,7 @@ SUBDIRS = 16x16 22x22 24x24 32x32 scalab
- all: all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -257,9 +258,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-Index: file-roller-2.24.1/data/icons/scalable/Makefile.in
-===================================================================
---- file-roller-2.24.1.orig/data/icons/scalable/Makefile.in	2008-10-21 01:07:06.000000000 +0200
-+++ file-roller-2.24.1/data/icons/scalable/Makefile.in	2008-11-25 22:32:39.679599013 +0100
-@@ -144,6 +144,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -232,7 +233,7 @@ SUBDIRS = apps	
- all: all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -257,9 +258,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-Index: file-roller-2.24.1/data/icons/scalable/apps/Makefile.in
-===================================================================
---- file-roller-2.24.1.orig/data/icons/scalable/apps/Makefile.in	2008-10-21 01:07:06.000000000 +0200
-+++ file-roller-2.24.1/data/icons/scalable/apps/Makefile.in	2008-11-25 22:32:39.763598935 +0100
-@@ -142,6 +142,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -242,7 +243,7 @@ gtk_update_icon_cache = gtk-update-icon-
- all: all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -267,9 +268,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-Index: file-roller-2.24.1/help/Makefile.in
-===================================================================
---- file-roller-2.24.1.orig/help/Makefile.in	2008-10-21 01:07:06.000000000 +0200
-+++ file-roller-2.24.1/help/Makefile.in	2008-11-25 22:32:39.903598642 +0100
-@@ -157,6 +157,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -356,7 +357,7 @@ DOC_LINGUAS = bg ca de es fi fr it oc nl
+@@ -249,9 +250,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+diff -urN file-roller-2.26.1.orig/help/Makefile.in file-roller-2.26.1/help/Makefile.in
+--- file-roller-2.26.1.orig/help/Makefile.in	2009-04-14 01:03:27.000000000 +0200
++++ file-roller-2.26.1/help/Makefile.in	2009-04-26 09:54:37.000000000 +0200
+@@ -134,6 +134,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -338,7 +339,7 @@
  all: all-am
  
  .SUFFIXES:
@@ -1448,31 +998,71 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
-@@ -381,9 +382,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-Index: file-roller-2.24.1/nautilus/Makefile.in
-===================================================================
---- file-roller-2.24.1.orig/nautilus/Makefile.in	2008-10-21 01:07:06.000000000 +0200
-+++ file-roller-2.24.1/nautilus/Makefile.in	2008-11-25 22:32:40.047600393 +0100
-@@ -166,6 +166,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -274,7 +275,7 @@ all: all-am
+@@ -363,9 +364,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+diff -urN file-roller-2.26.1.orig/Makefile.in file-roller-2.26.1/Makefile.in
+--- file-roller-2.26.1.orig/Makefile.in	2009-04-14 01:03:28.000000000 +0200
++++ file-roller-2.26.1/Makefile.in	2009-04-26 09:54:37.000000000 +0200
+@@ -135,6 +135,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -262,7 +263,7 @@
+ .SUFFIXES:
+ am--refresh:
+ 	@:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+@@ -289,9 +290,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	$(SHELL) ./config.status --recheck
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(srcdir) && $(AUTOCONF)
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ 
+ config.h: stamp-h1
+@@ -303,7 +304,7 @@
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ 	@rm -f stamp-h1
+ 	cd $(top_builddir) && $(SHELL) ./config.status config.h
+-$(srcdir)/config.h.in:  $(am__configure_deps) 
++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+ 	cd $(top_srcdir) && $(AUTOHEADER)
+ 	rm -f stamp-h1
+ 	touch $@
+diff -urN file-roller-2.26.1.orig/nautilus/Makefile.in file-roller-2.26.1/nautilus/Makefile.in
+--- file-roller-2.26.1.orig/nautilus/Makefile.in	2009-04-14 01:03:27.000000000 +0200
++++ file-roller-2.26.1/nautilus/Makefile.in	2009-04-26 09:54:37.000000000 +0200
+@@ -143,6 +143,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -256,7 +257,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -1481,7 +1071,7 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
-@@ -299,9 +300,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -281,9 +282,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1493,19 +1083,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-nautilus_extensionLTLIBRARIES: $(nautilus_extension_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-Index: file-roller-2.24.1/src/Makefile.in
-===================================================================
---- file-roller-2.24.1.orig/src/Makefile.in	2008-10-21 01:07:06.000000000 +0200
-+++ file-roller-2.24.1/src/Makefile.in	2008-11-25 22:32:40.183601966 +0100
-@@ -216,6 +216,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -434,7 +435,7 @@ all: $(BUILT_SOURCES)
+diff -urN file-roller-2.26.1.orig/src/Makefile.in file-roller-2.26.1/src/Makefile.in
+--- file-roller-2.26.1.orig/src/Makefile.in	2009-04-14 01:03:28.000000000 +0200
++++ file-roller-2.26.1/src/Makefile.in	2009-04-26 09:54:37.000000000 +0200
+@@ -195,6 +195,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -424,7 +425,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -1514,7 +1103,7 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
-@@ -459,9 +460,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -449,9 +450,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1526,19 +1115,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-Index: file-roller-2.24.1/src/sh/Makefile.in
-===================================================================
---- file-roller-2.24.1.orig/src/sh/Makefile.in	2008-10-21 01:07:06.000000000 +0200
-+++ file-roller-2.24.1/src/sh/Makefile.in	2008-11-25 22:32:40.263598865 +0100
-@@ -142,6 +142,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -232,7 +233,7 @@ EXTRA_DIST = $(sh_DATA)
+diff -urN file-roller-2.26.1.orig/src/sh/Makefile.in file-roller-2.26.1/src/sh/Makefile.in
+--- file-roller-2.26.1.orig/src/sh/Makefile.in	2009-04-14 01:03:28.000000000 +0200
++++ file-roller-2.26.1/src/sh/Makefile.in	2009-04-26 09:54:37.000000000 +0200
+@@ -119,6 +119,7 @@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -214,7 +215,7 @@
  all: all-am
  
  .SUFFIXES:
@@ -1547,15 +1135,15 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
-@@ -257,9 +258,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
+@@ -239,9 +240,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:




More information about the pkg-gnome-commits mailing list