r17722 - in /desktop/experimental/file-roller/debian: changelog control control.in file-roller.mime patches/02_nautilus_2.20.patch patches/20_am-maintainer-mode.patch patches/70_autotools.patch patches/series rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue Nov 25 22:35:19 UTC 2008
Author: joss
Date: Tue Nov 25 22:35:19 2008
New Revision: 17722
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17722
Log:
* New upstream release.
+ Can add empty directories to archives. Closes: #420961.
* Update build-dependencies.
* Suggest rzip and unalz.
* Depend on p7zip-full, since 7z can now be used for zip, rar and iso
archives now.
* Let zip, unzip and unrar in Suggests for jar and cbr archives, as
well as arj for arj write support.
* Drop genisoimage Recommends.
* Move sharutils, ncompress, lzop, unace and cpio to Suggests.
Closes: #501083.
* Add binutils (for ar), rzip, unalz and zoo to Suggests.
Closes: #455672.
* 02_nautilus_2.20.patch: dropped, we build against nautilus 2.22 now.
* 20_am-maintainer-mode.patch: updated.
* 70_autotools.patch: regenerated for the new version.
* Recommend gvfs for gtk_show_uri.
* file-roller.mime: update for the new list of MIME types.
Removed:
desktop/experimental/file-roller/debian/patches/02_nautilus_2.20.patch
Modified:
desktop/experimental/file-roller/debian/changelog
desktop/experimental/file-roller/debian/control
desktop/experimental/file-roller/debian/control.in
desktop/experimental/file-roller/debian/file-roller.mime
desktop/experimental/file-roller/debian/patches/20_am-maintainer-mode.patch
desktop/experimental/file-roller/debian/patches/70_autotools.patch
desktop/experimental/file-roller/debian/patches/series
desktop/experimental/file-roller/debian/rules
Modified: desktop/experimental/file-roller/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/changelog?rev=17722&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/changelog (original)
+++ desktop/experimental/file-roller/debian/changelog Tue Nov 25 22:35:19 2008
@@ -1,3 +1,26 @@
+file-roller (2.24.1-1) experimental; urgency=low
+
+ * New upstream release.
+ + Can add empty directories to archives. Closes: #420961.
+ * Update build-dependencies.
+ * Suggest rzip and unalz.
+ * Depend on p7zip-full, since 7z can now be used for zip, rar and iso
+ archives now.
+ * Let zip, unzip and unrar in Suggests for jar and cbr archives, as
+ well as arj for arj write support.
+ * Drop genisoimage Recommends.
+ * Move sharutils, ncompress, lzop, unace and cpio to Suggests.
+ Closes: #501083.
+ * Add binutils (for ar), rzip, unalz and zoo to Suggests.
+ Closes: #455672.
+ * 02_nautilus_2.20.patch: dropped, we build against nautilus 2.22 now.
+ * 20_am-maintainer-mode.patch: updated.
+ * 70_autotools.patch: regenerated for the new version.
+ * Recommend gvfs for gtk_show_uri.
+ * file-roller.mime: update for the new list of MIME types.
+
+ -- Josselin Mouette <joss at debian.org> Mon, 24 Nov 2008 00:32:32 +0100
+
file-roller (2.22.4-2) unstable; urgency=low
* Add "maintainer mode" support; closes: #494237.
Modified: desktop/experimental/file-roller/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/control?rev=17722&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/control (original)
+++ desktop/experimental/file-roller/debian/control Tue Nov 25 22:35:19 2008
@@ -2,24 +2,22 @@
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>, 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>, Romain Francoise <rfrancoise at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: cdbs (>= 0.4.41),
quilt,
debhelper (>= 5),
- libglib2.0-dev (>= 2.12.0),
- libgtk2.0-dev (>= 2.10.0),
+ 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),
- libnautilus-extension-dev (>= 2.10.0),
+ libglade2-dev (>= 1:2.4.0),
+ libnautilus-extension-dev (>= 2.22.2),
gettext,
+ intltool (>= 0.35.0),
scrollkeeper,
- libxml-parser-perl,
- gnome-pkg-tools (>= 0.12),
gnome-doc-utils (>= 0.3.2),
- libgnomevfs2-dev (>= 2.10.0),
- libglade2-dev (>= 2.4.0),
- libgnome2-dev (>= 2.6.0),
- libgconf2-dev,
- intltool (>= 0.35.0)
+ libgconf2-dev
Standards-Version: 3.8.0
Homepage: http://fileroller.sourceforge.net
@@ -30,23 +28,27 @@
tar (>= 1.13.25),
bzip2 (>= 1.0.1),
gzip (>= 1.3.2),
- unzip,
- zip
+ p7zip-full
Conflicts: file-roller2
Replaces: gnome-icon-theme (<< 2.14)
-Recommends: sharutils,
- lzop,
- rpm,
- p7zip | p7zip-full ,
- genisoimage,
- ncompress,
- unace,
- cpio,
+Recommends: rpm,
gnome-icon-theme (>= 2.18),
- arj,
- lzma
+ lzma,
+ gvfs
Suggests: lha,
- unrar
+ unrar,
+ sharutils,
+ ncompress,
+ binutils,
+ cpio,
+ unace,
+ lzop,
+ rzip,
+ unalz,
+ unzip,
+ zip,
+ zoo,
+ arj
Description: an archive manager for GNOME
File-roller is an archive manager for the GNOME environment. It allows you to:
.
Modified: desktop/experimental/file-roller/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/control.in?rev=17722&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/control.in (original)
+++ desktop/experimental/file-roller/debian/control.in Tue Nov 25 22:35:19 2008
@@ -6,20 +6,18 @@
Build-Depends: cdbs (>= 0.4.41),
quilt,
debhelper (>= 5),
- libglib2.0-dev (>= 2.12.0),
- libgtk2.0-dev (>= 2.10.0),
+ 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),
- libnautilus-extension-dev (>= 2.10.0),
+ libglade2-dev (>= 1:2.4.0),
+ libnautilus-extension-dev (>= 2.22.2),
gettext,
+ intltool (>= 0.35.0),
scrollkeeper,
- libxml-parser-perl,
- gnome-pkg-tools (>= 0.12),
gnome-doc-utils (>= 0.3.2),
- libgnomevfs2-dev (>= 2.10.0),
- libglade2-dev (>= 2.4.0),
- libgnome2-dev (>= 2.6.0),
- libgconf2-dev,
- intltool (>= 0.35.0)
+ libgconf2-dev
Standards-Version: 3.8.0
Homepage: http://fileroller.sourceforge.net
@@ -30,23 +28,27 @@
tar (>= 1.13.25),
bzip2 (>= 1.0.1),
gzip (>= 1.3.2),
- unzip,
- zip
+ p7zip-full
Conflicts: file-roller2
Replaces: gnome-icon-theme (<< 2.14)
-Recommends: sharutils,
- lzop,
- rpm,
- p7zip | p7zip-full ,
- genisoimage,
- ncompress,
- unace,
- cpio,
+Recommends: rpm,
gnome-icon-theme (>= 2.18),
- arj,
- lzma
+ lzma,
+ gvfs
Suggests: lha,
- unrar
+ unrar,
+ sharutils,
+ ncompress,
+ binutils,
+ cpio,
+ unace,
+ lzop,
+ rzip,
+ unalz,
+ unzip,
+ zip,
+ zoo,
+ arj
Description: an archive manager for GNOME
File-roller is an archive manager for the GNOME environment. It allows you to:
.
Modified: desktop/experimental/file-roller/debian/file-roller.mime
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/file-roller.mime?rev=17722&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/file-roller.mime (original)
+++ desktop/experimental/file-roller/debian/file-roller.mime Tue Nov 25 22:35:19 2008
@@ -1,35 +1,45 @@
-application/x-arj; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -e /usr/bin/arj ; priority=5
+application/x-7z-compressed; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
+application/x-7z-compressed-tar; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" ; priority=5
+application/x-ace; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -x /usr/bin/unace ; priority=5
+application/x-alz; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -x /usr/bin/unalz ; priority=5
+application/x-ar; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -x /usr/bin/ar ; priority=5
+application/x-arj; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" ; priority=5
application/x-bzip; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" ; priority=5
-application/x-bzip-compressed-tar; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -e /usr/bin/bzip2 ; priority=5
+application/x-bzip1; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" ; priority=5
+application/x-bzip-compressed-tar; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" ; priority=5
+application/x-bzip1-compressed-tar; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" ; priority=5
+application/x-cabinet; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" ; priority=5
+application/x-cbr; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -x /usr/bin/unrar -o -x /usr/bin/rar ; priority=5
+application/x-cbz; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" ; priority=5
+application/x-cd-image; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
application/x-compress; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" ; priority=5
application/x-compressed-tar; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" ; priority=5
+application/x-cpio; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -x /bin/cpio ; priority=5
+application/x-deb; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
+application/x-ear; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
+application/x-gtar; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
application/x-gzip; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" ; priority=5
-application/x-java-archive; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" ; priority=5
-application/x-lha; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -e /usr/bin/lha ; priority=5
-application/x-lzop; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -e /bin/lzop ; priority=5
-application/x-lzop-compressed-tar; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -e /bin/lzop ; priority=5
-application/x-rar; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -e /usr/bin/unrar -o -e /usr/bin/rar ; priority=5
-application/x-rar-compressed; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -e /usr/bin/unrar -o -e /usr/bin/rar ; priority=5
+application/x-gzpostscript; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
+application/x-jar; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -x /usr/bin/zip -o -x /usr/bin/zip ; priority=5
+application/x-java-archive; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -x /usr/bin/zip -o -x /usr/bin/zip ; priority=5
+application/x-lha; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -x /usr/bin/lha ; priority=5
+application/x-lhz; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -x /usr/bin/lhz ; priority=5
+application/x-lzma; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" ; priority=5
+application/x-lzma-compressed-tar; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
+application/x-lzop; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -x /bin/lzop ; priority=5
+application/x-lzop-compressed-tar; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -x /bin/lzop ; priority=5
+application/x-ms-dos-executable; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" ; priority=5
+application/x-rar; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" ; priority=5
+application/x-rar-compressed; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" ; priority=5
+application/x-rpm; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -x /usr/bin/rpm ; priority=5
+application/x-rzip; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -x /usr/bin/rzip ; priority=5
application/x-stuffit; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" ; priority=5
application/x-tar; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" ; priority=5
-application/zip; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -e /usr/bin/unzip ; priority=5
-application/x-zoo; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -e /usr/bin/zoo ; priority=5
-# TODO: check for each supporting binary for these MIME types
-application/x-ace; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
-application/x-ar; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
-application/x-cpio; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
-application/x-deb; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
-application/x-gtar; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
-application/x-lhz; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
+application/x-tarz; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" ; priority=5
+application/x-war; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
application/x-zip; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
application/x-zip-compressed; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
+application/x-zoo; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" -a -x /usr/bin/zoo ; priority=5
+application/zip; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY" ; priority=5
multipart/x-zip; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
-application/x-rpm; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
-application/x-jar; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
-application/x-war; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
-application/x-ear; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
-application/x-cd-image; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
-application/x-7z-compressed; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
-application/x-gzpostscript; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
-application/x-lzma; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
-application/x-lzma-compressed-tar; /usr/bin/file-roller '%s'; test=test -n "$DISPLAY"; priority=5
+
Modified: desktop/experimental/file-roller/debian/patches/20_am-maintainer-mode.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/patches/20_am-maintainer-mode.patch?rev=17722&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/patches/20_am-maintainer-mode.patch (original)
+++ desktop/experimental/file-roller/debian/patches/20_am-maintainer-mode.patch Tue Nov 25 22:35:19 2008
@@ -1,11 +1,13 @@
---- a/configure.in 2008-08-08 01:37:10.000000000 +0200
-+++ b/configure.in 2008-08-08 01:37:22.000000000 +0200
-@@ -7,6 +7,8 @@
- AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
- AM_CONFIG_HEADER(config.h)
+Index: file-roller-2.24.1/configure.ac
+===================================================================
+--- file-roller-2.24.1.orig/configure.ac 2008-10-21 01:06:38.000000000 +0200
++++ file-roller-2.24.1/configure.ac 2008-11-25 22:31:21.681221774 +0100
+@@ -8,6 +8,8 @@ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PAC
+ AC_CONFIG_SRCDIR([config.h.in])
+ AC_CONFIG_HEADER([config.h])
+AM_MAINTAINER_MODE
+
- AM_PROG_LIBTOOL
+ GNOME_COMMON_INIT
- GNOME_DOC_INIT
+ AC_PROG_CC
Modified: desktop/experimental/file-roller/debian/patches/70_autotools.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/patches/70_autotools.patch?rev=17722&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/patches/70_autotools.patch (original)
+++ desktop/experimental/file-roller/debian/patches/70_autotools.patch Tue Nov 25 22:35:19 2008
@@ -1,16 +1,16 @@
-diff --git a/Makefile.in b/Makefile.in
-index e357588..9a7a8b3 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -156,6 +156,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -277,7 +278,7 @@ all: config.h
+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:
@:
@@ -19,7 +19,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -304,9 +305,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -306,9 +307,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -31,7 +31,7 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
-@@ -318,7 +319,7 @@ 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
@@ -40,11 +40,222 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
-diff --git a/aclocal.m4 b/aclocal.m4
-index 60969f8..7dc6166 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -8091,6 +8091,35 @@ fi
+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.])
+- 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
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
@@ -80,30 +291,71 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-diff --git a/configure b/configure
-index 7cb8481..d101b12 100755
---- a/configure
-+++ b/configure
-@@ -826,6 +826,9 @@ am__leading_dot
+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
AMTAR
am__tar
am__untar
+MAINTAINER_MODE_TRUE
+MAINTAINER_MODE_FALSE
+MAINT
- build
- build_cpu
- build_vendor
-@@ -1546,6 +1549,8 @@ if test -n "$ac_init_help"; then
+ 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:
--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]
- --enable-static[=PKGS] build static libraries [default=yes]
- --enable-fast-install[=PKGS]
-@@ -2508,6 +2513,29 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+@@ -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
ac_config_headers="$ac_config_headers config.h"
@@ -130,284 +382,417 @@
+
+
+
- # Check whether --enable-shared was given.
- if test "${enable_shared+set}" = set; then
- enableval=$enable_shared; p=${PACKAGE-default}
-@@ -4405,7 +4433,7 @@ ia64-*-hpux*)
+
+
+
+@@ -4422,7 +4453,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 4408 "configure"' > conftest.$ac_ext
-+ echo '#line 4436 "configure"' > conftest.$ac_ext
+- echo '#line 4425 "configure"' > conftest.$ac_ext
++ echo '#line 4456 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7457,11 +7485,11 @@ else
+@@ -7479,11 +7510,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:7460: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7488: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:7482: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7513: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:7464: \$? = $ac_status" >&5
-+ echo "$as_me:7492: \$? = $ac_status" >&5
+- echo "$as_me:7486: \$? = $ac_status" >&5
++ echo "$as_me:7517: \$? = $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.
-@@ -7747,11 +7775,11 @@ else
+@@ -7769,11 +7800,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:7750: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7778: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:7772: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7803: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:7754: \$? = $ac_status" >&5
-+ echo "$as_me:7782: \$? = $ac_status" >&5
+- echo "$as_me:7776: \$? = $ac_status" >&5
++ echo "$as_me:7807: \$? = $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.
-@@ -7851,11 +7879,11 @@ else
+@@ -7873,11 +7904,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:7854: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7882: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:7876: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7907: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:7858: \$? = $ac_status" >&5
-+ echo "$as_me:7886: \$? = $ac_status" >&5
+- echo "$as_me:7880: \$? = $ac_status" >&5
++ echo "$as_me:7911: \$? = $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
-@@ -10228,7 +10256,7 @@ else
+@@ -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 10231 "configure"
-+#line 10259 "configure"
+-#line 10253 "configure"
++#line 10284 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10328,7 +10356,7 @@ else
+@@ -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 10331 "configure"
-+#line 10359 "configure"
+-#line 10353 "configure"
++#line 10384 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12729,11 +12757,11 @@ else
+@@ -12751,11 +12782,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:12732: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12760: $lt_compile\"" >&5)
+- (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:12736: \$? = $ac_status" >&5
-+ echo "$as_me:12764: \$? = $ac_status" >&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.
-@@ -12833,11 +12861,11 @@ else
+@@ -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:12836: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12864: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:12858: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12889: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:12840: \$? = $ac_status" >&5
-+ echo "$as_me:12868: \$? = $ac_status" >&5
+- echo "$as_me:12862: \$? = $ac_status" >&5
++ echo "$as_me:12893: \$? = $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
-@@ -14431,11 +14459,11 @@ else
+@@ -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:14434: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14462: $lt_compile\"" >&5)
+- (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:14438: \$? = $ac_status" >&5
-+ echo "$as_me:14466: \$? = $ac_status" >&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.
-@@ -14535,11 +14563,11 @@ else
+@@ -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:14538: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14566: $lt_compile\"" >&5)
+- (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:14542: \$? = $ac_status" >&5
-+ echo "$as_me:14570: \$? = $ac_status" >&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
-@@ -16755,11 +16783,11 @@ else
+@@ -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:16758: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16786: $lt_compile\"" >&5)
+- (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:16762: \$? = $ac_status" >&5
-+ echo "$as_me:16790: \$? = $ac_status" >&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.
-@@ -17045,11 +17073,11 @@ else
+@@ -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:17048: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17076: $lt_compile\"" >&5)
+- (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:17052: \$? = $ac_status" >&5
-+ echo "$as_me:17080: \$? = $ac_status" >&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.
-@@ -17149,11 +17177,11 @@ else
+@@ -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:17152: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17180: $lt_compile\"" >&5)
+- (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:17156: \$? = $ac_status" >&5
-+ echo "$as_me:17184: \$? = $ac_status" >&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
-@@ -20047,13 +20075,13 @@ fi
-
-
-
--GLIB_REQUIRED=2.15.0
-+GLIB_REQUIRED=2.12.0
- GTK_REQUIRED=2.10.0
- LIBGNOME_REQUIRED=2.6.0
- LIBGNOMEUI_REQUIRED=2.6.0
- GNOME_VFS_REQUIRED=2.10.0
- LIBGLADE_REQUIRED=2.4.0
--NAUTILUS_REQUIRED=2.22.2
-+NAUTILUS_REQUIRED=2.10.0
-
-
-
-@@ -20076,7 +20104,6 @@ if test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
- glib-2.0 >= \$GLIB_REQUIRED \\
-- gio-2.0 >= \$GLIB_REQUIRED \\
- gthread-2.0 \\
- gtk+-2.0 >= \$GTK_REQUIRED \\
- libgnome-2.0 >= \$LIBGNOME_REQUIRED \\
-@@ -20086,7 +20113,6 @@ if test -n "$PKG_CONFIG"; then
- libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
- ($PKG_CONFIG --exists --print-errors "\
- glib-2.0 >= $GLIB_REQUIRED \
-- gio-2.0 >= $GLIB_REQUIRED \
- gthread-2.0 \
- gtk+-2.0 >= $GTK_REQUIRED \
- libgnome-2.0 >= $LIBGNOME_REQUIRED \
-@@ -20099,7 +20125,6 @@ if test -n "$PKG_CONFIG"; then
- (exit $ac_status); }; then
- pkg_cv_FR_CFLAGS=`$PKG_CONFIG --cflags "\
- glib-2.0 >= $GLIB_REQUIRED \
-- gio-2.0 >= $GLIB_REQUIRED \
- gthread-2.0 \
- gtk+-2.0 >= $GTK_REQUIRED \
- libgnome-2.0 >= $LIBGNOME_REQUIRED \
-@@ -20121,7 +20146,6 @@ if test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
- glib-2.0 >= \$GLIB_REQUIRED \\
-- gio-2.0 >= \$GLIB_REQUIRED \\
- gthread-2.0 \\
- gtk+-2.0 >= \$GTK_REQUIRED \\
- libgnome-2.0 >= \$LIBGNOME_REQUIRED \\
-@@ -20131,7 +20155,6 @@ if test -n "$PKG_CONFIG"; then
- libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
- ($PKG_CONFIG --exists --print-errors "\
- glib-2.0 >= $GLIB_REQUIRED \
-- gio-2.0 >= $GLIB_REQUIRED \
- gthread-2.0 \
- gtk+-2.0 >= $GTK_REQUIRED \
- libgnome-2.0 >= $LIBGNOME_REQUIRED \
-@@ -20144,7 +20167,6 @@ if test -n "$PKG_CONFIG"; then
- (exit $ac_status); }; then
- pkg_cv_FR_LIBS=`$PKG_CONFIG --libs "\
- glib-2.0 >= $GLIB_REQUIRED \
-- gio-2.0 >= $GLIB_REQUIRED \
- gthread-2.0 \
- gtk+-2.0 >= $GTK_REQUIRED \
- libgnome-2.0 >= $LIBGNOME_REQUIRED \
-@@ -20172,7 +20194,6 @@ fi
- if test $_pkg_short_errors_supported = yes; then
- FR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
- glib-2.0 >= $GLIB_REQUIRED \
-- gio-2.0 >= $GLIB_REQUIRED \
- gthread-2.0 \
- gtk+-2.0 >= $GTK_REQUIRED \
- libgnome-2.0 >= $LIBGNOME_REQUIRED \
-@@ -20183,7 +20204,6 @@ fi
- else
- FR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
- glib-2.0 >= $GLIB_REQUIRED \
-- gio-2.0 >= $GLIB_REQUIRED \
- gthread-2.0 \
- gtk+-2.0 >= $GTK_REQUIRED \
- libgnome-2.0 >= $LIBGNOME_REQUIRED \
-@@ -20197,7 +20217,6 @@ fi
-
- { { echo "$as_me:$LINENO: error: Package requirements (\
- glib-2.0 >= $GLIB_REQUIRED \
-- gio-2.0 >= $GLIB_REQUIRED \
- gthread-2.0 \
- gtk+-2.0 >= $GTK_REQUIRED \
- libgnome-2.0 >= $LIBGNOME_REQUIRED \
-@@ -20217,7 +20236,6 @@ See the pkg-config man page for more details.
- " >&5
- echo "$as_me: error: Package requirements (\
- glib-2.0 >= $GLIB_REQUIRED \
-- gio-2.0 >= $GLIB_REQUIRED \
- gthread-2.0 \
- gtk+-2.0 >= $GTK_REQUIRED \
- libgnome-2.0 >= $LIBGNOME_REQUIRED \
-@@ -20280,8 +20298,8 @@ fi
-
- if test x"$enable_nautilus_actions" != xno; then
- if pkg-config --atleast-version=$NAUTILUS_REQUIRED libnautilus-extension; then
-- NAUTILUS_CFLAGS=`pkg-config --cflags libnautilus-extension glib-2.0 gio-2.0`
-- NAUTILUS_LIBS=`pkg-config --libs libnautilus-extension glib-2.0 gio-2.0`
-+ NAUTILUS_CFLAGS=`pkg-config --cflags libnautilus-extension glib-2.0 gnome-vfs-2.0`
-+ NAUTILUS_LIBS=`pkg-config --libs libnautilus-extension glib-2.0 gnome-vfs-2.0`
- build_nautilus_actions=yes
- fi
+@@ -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
-@@ -22625,6 +22643,13 @@ LIBOBJS=$ac_libobjs
+
++# 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
LTLIBOBJS=$ac_ltlibobjs
@@ -421,58 +806,145 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -23312,6 +23337,9 @@ am__leading_dot!$am__leading_dot$ac_delim
+@@ -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
- build!$build$ac_delim
- build_cpu!$build_cpu$ac_delim
- build_vendor!$build_vendor$ac_delim
-@@ -23347,9 +23375,6 @@ DSYMUTIL!$DSYMUTIL$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
+-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
--CXXDEPMODE!$CXXDEPMODE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -23391,6 +23416,9 @@ _ACEOF
+@@ -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
+ CXXDEPMODE!$CXXDEPMODE$ac_delim
am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
- CXXCPP!$CXXCPP$ac_delim
-@@ -23477,7 +23505,7 @@ LIBOBJS!$LIBOBJS$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` = 84; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; then
+- 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
-diff --git a/data/Makefile.in b/data/Makefile.in
-index 79c12f6..235376e 100644
---- a/data/Makefile.in
-+++ b/data/Makefile.in
-@@ -154,6 +154,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -259,7 +260,7 @@ DISTCLEANFILES = \
+@@ -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; }; }
+- fi
+- mv "po/Makefile" "po/Makefile.tmp"
+ sed '/^POTFILES =/,/[^\\]$/ {
+ /^POTFILES =/!d
+ r po/POTFILES
+ }
+- ' "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 = \
all: all-recursive
.SUFFIXES:
@@ -481,7 +953,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -284,9 +285,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -286,9 +287,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
@@ -493,19 +965,19 @@
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)/$@
-diff --git a/data/glade/Makefile.in b/data/glade/Makefile.in
-index 8bb8bd9..bc96683 100644
---- a/data/glade/Makefile.in
-+++ b/data/glade/Makefile.in
-@@ -140,6 +140,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -239,7 +240,7 @@ EXTRA_DIST = $(glade_DATA)
+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)
all: all-am
.SUFFIXES:
@@ -514,7 +986,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -264,9 +265,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -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
@@ -526,10 +998,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff --git a/data/icons/16x16/Makefile.in b/data/icons/16x16/Makefile.in
-index 0803375..0c29fb9 100644
---- a/data/icons/16x16/Makefile.in
-+++ b/data/icons/16x16/Makefile.in
+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@
@@ -538,7 +1043,73 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -230,7 +231,7 @@ SUBDIRS = actions apps
+@@ -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:
@@ -547,7 +1118,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -255,9 +256,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -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
@@ -559,19 +1130,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff --git a/data/icons/16x16/actions/Makefile.in b/data/icons/16x16/actions/Makefile.in
-index 3339a0c..51297b1 100644
---- a/data/icons/16x16/actions/Makefile.in
-+++ b/data/icons/16x16/actions/Makefile.in
-@@ -140,6 +140,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -241,7 +242,7 @@ EXTRA_DIST = \
+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:
@@ -580,7 +1151,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -266,9 +267,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -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
@@ -592,19 +1163,52 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff --git a/data/icons/16x16/apps/Makefile.in b/data/icons/16x16/apps/Makefile.in
-index ab1082f..407d2f3 100644
---- a/data/icons/16x16/apps/Makefile.in
-+++ b/data/icons/16x16/apps/Makefile.in
-@@ -140,6 +140,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -240,7 +241,7 @@ gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+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:
@@ -613,7 +1217,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -265,9 +266,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -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
@@ -625,10 +1229,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff --git a/data/icons/22x22/Makefile.in b/data/icons/22x22/Makefile.in
-index fe2514e..be41ca3 100644
---- a/data/icons/22x22/Makefile.in
-+++ b/data/icons/22x22/Makefile.in
+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@
@@ -637,7 +1241,40 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -230,7 +231,7 @@ SUBDIRS = apps
+@@ -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:
@@ -646,7 +1283,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -255,9 +256,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -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
@@ -658,19 +1295,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff --git a/data/icons/22x22/apps/Makefile.in b/data/icons/22x22/apps/Makefile.in
-index cc9d160..34f8976 100644
---- a/data/icons/22x22/apps/Makefile.in
-+++ b/data/icons/22x22/apps/Makefile.in
-@@ -140,6 +140,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -240,7 +241,7 @@ gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+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:
@@ -679,7 +1316,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -265,9 +266,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -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
@@ -691,10 +1328,76 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff --git a/data/icons/24x24/Makefile.in b/data/icons/24x24/Makefile.in
-index e18647b..374a5ba 100644
---- a/data/icons/24x24/Makefile.in
-+++ b/data/icons/24x24/Makefile.in
+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@
@@ -703,16 +1406,16 @@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -230,7 +231,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*) \
-@@ -255,9 +256,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -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
@@ -724,250 +1427,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff --git a/data/icons/24x24/actions/Makefile.in b/data/icons/24x24/actions/Makefile.in
-index 2139d42..2d38264 100644
---- a/data/icons/24x24/actions/Makefile.in
-+++ b/data/icons/24x24/actions/Makefile.in
-@@ -140,6 +140,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 = \
- 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_builddir)/config.status
- $(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 --git a/data/icons/24x24/apps/Makefile.in b/data/icons/24x24/apps/Makefile.in
-index 554097c..559f70a 100644
---- a/data/icons/24x24/apps/Makefile.in
-+++ b/data/icons/24x24/apps/Makefile.in
-@@ -140,6 +140,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -240,7 +241,7 @@ gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
- 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*) \
-@@ -265,9 +266,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- $(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 --git a/data/icons/32x32/Makefile.in b/data/icons/32x32/Makefile.in
-index fc67aa3..798346f 100644
---- a/data/icons/32x32/Makefile.in
-+++ b/data/icons/32x32/Makefile.in
-@@ -142,6 +142,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -230,7 +231,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*) \
-@@ -255,9 +256,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- $(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 --git a/data/icons/32x32/apps/Makefile.in b/data/icons/32x32/apps/Makefile.in
-index 9a1e836..344cce5 100644
---- a/data/icons/32x32/apps/Makefile.in
-+++ b/data/icons/32x32/apps/Makefile.in
-@@ -140,6 +140,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -240,7 +241,7 @@ gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
- 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*) \
-@@ -265,9 +266,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- $(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 --git a/data/icons/Makefile.in b/data/icons/Makefile.in
-index 5313bf1..fa50921 100644
---- a/data/icons/Makefile.in
-+++ b/data/icons/Makefile.in
-@@ -142,6 +142,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -230,7 +231,7 @@ SUBDIRS = 16x16 22x22 24x24 32x32 scalable
- 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*) \
-@@ -255,9 +256,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- $(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 --git a/data/icons/scalable/Makefile.in b/data/icons/scalable/Makefile.in
-index aeaf185..d41e067 100644
---- a/data/icons/scalable/Makefile.in
-+++ b/data/icons/scalable/Makefile.in
-@@ -142,6 +142,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -230,7 +231,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*) \
-@@ -255,9 +256,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- $(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 --git a/data/icons/scalable/apps/Makefile.in b/data/icons/scalable/apps/Makefile.in
-index 34d075e..362f6b1 100644
---- a/data/icons/scalable/apps/Makefile.in
-+++ b/data/icons/scalable/apps/Makefile.in
-@@ -140,6 +140,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -240,7 +241,7 @@ gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
- 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*) \
-@@ -265,9 +266,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- $(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 --git a/help/Makefile.in b/help/Makefile.in
-index 0ffc64e..00392e9 100644
---- a/help/Makefile.in
-+++ b/help/Makefile.in
-@@ -155,6 +155,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -354,7 +355,7 @@ DOC_LINGUAS = bg de es fr it oc nl ru sv uk
+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
all: all-am
.SUFFIXES:
@@ -976,7 +1448,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -379,9 +380,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -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
@@ -988,19 +1460,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff --git a/nautilus/Makefile.in b/nautilus/Makefile.in
-index 2b8f9ac..fd2b214 100644
---- a/nautilus/Makefile.in
-+++ b/nautilus/Makefile.in
-@@ -164,6 +164,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -272,7 +273,7 @@ all: all-am
+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
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -1009,7 +1481,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -297,9 +298,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -299,9 +300,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
@@ -1021,19 +1493,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-nautilus_extensionLTLIBRARIES: $(nautilus_extension_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff --git a/src/Makefile.in b/src/Makefile.in
-index d14b599..704f5c3 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -215,6 +215,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -433,7 +434,7 @@ all: $(BUILT_SOURCES)
+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)
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -1042,7 +1514,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -458,9 +459,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -459,9 +460,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
@@ -1054,19 +1526,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff --git a/src/sh/Makefile.in b/src/sh/Makefile.in
-index 8b655d5..43c137b 100644
---- a/src/sh/Makefile.in
-+++ b/src/sh/Makefile.in
-@@ -140,6 +140,7 @@ LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -230,7 +231,7 @@ EXTRA_DIST = $(sh_DATA)
+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)
all: all-am
.SUFFIXES:
@@ -1075,7 +1547,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -255,9 +256,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -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
Modified: desktop/experimental/file-roller/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/patches/series?rev=17722&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/patches/series (original)
+++ desktop/experimental/file-roller/debian/patches/series Tue Nov 25 22:35:19 2008
@@ -1,4 +1,3 @@
-02_nautilus_2.20.patch
20_am-maintainer-mode.patch
70_autotools.patch
99_ltmain_as-needed.patch
Modified: desktop/experimental/file-roller/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/rules?rev=17722&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/rules (original)
+++ desktop/experimental/file-roller/debian/rules Tue Nov 25 22:35:19 2008
@@ -15,8 +15,8 @@
DEB_DH_MAKESHLIBS_ARGS += -n
binary-install/file-roller::
- rm -f debian/file-roller/usr/lib/nautilus/extensions-1.0/*.a
- rm -f debian/file-roller/usr/lib/nautilus/extensions-1.0/*.la
+ rm -f debian/file-roller/usr/lib/nautilus/extensions-*/*.a
+ rm -f debian/file-roller/usr/lib/nautilus/extensions-*/*.la
binary-post-install/file-roller::
# check for missing MIME types
More information about the pkg-gnome-commits
mailing list