r20333 - in /desktop/unstable/file-roller/debian: changelog patches/70_autotools.patch patches/99_ltmain_as-needed.patch rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Thu Jun 11 21:48:26 UTC 2009
Author: joss
Date: Thu Jun 11 21:48:26 2009
New Revision: 20333
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20333
Log:
* New upstream release.
* 70_autotools.patch: regenerated for the new version.
* Remove some autogenerated files in the clean target, the make the
build fail.
Modified:
desktop/unstable/file-roller/debian/changelog
desktop/unstable/file-roller/debian/patches/70_autotools.patch
desktop/unstable/file-roller/debian/patches/99_ltmain_as-needed.patch
desktop/unstable/file-roller/debian/rules
Modified: desktop/unstable/file-roller/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/changelog?rev=20333&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/changelog (original)
+++ desktop/unstable/file-roller/debian/changelog Thu Jun 11 21:48:26 2009
@@ -1,12 +1,19 @@
-file-roller (2.26.1-1) UNRELEASED; urgency=low
-
+file-roller (2.26.2-1) unstable; urgency=low
+
+ [ Luca Bruno ]
* New upstream release.
* debian/control.in:
- Remove libglade, libgnome2 and libgnomeui Build-Depends.
* debian/patches/70_autotools.patch:
- Update to apply cleanly.
- -- Luca Bruno <lethalman88 at gmail.com> Sat, 25 Apr 2009 23:26:24 +0200
+ [ Josselin Mouette ]
+ * New upstream release.
+ * 70_autotools.patch: regenerated for the new version.
+ * Remove some autogenerated files in the clean target, the make the
+ build fail.
+
+ -- Josselin Mouette <joss at debian.org> Thu, 11 Jun 2009 23:36:19 +0200
file-roller (2.24.3-1) unstable; urgency=low
Modified: desktop/unstable/file-roller/debian/patches/70_autotools.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/patches/70_autotools.patch?rev=20333&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/patches/70_autotools.patch (original)
+++ desktop/unstable/file-roller/debian/patches/70_autotools.patch Thu Jun 11 21:48:26 2009
@@ -1,7 +1,28 @@
-diff -urN file-roller-2.26.1.orig/aclocal.m4 file-roller-2.26.1/aclocal.m4
---- file-roller-2.26.1.orig/aclocal.m4 2009-04-14 01:03:14.000000000 +0200
-+++ file-roller-2.26.1/aclocal.m4 2009-04-26 09:54:27.000000000 +0200
-@@ -5049,6 +5049,9 @@
+libtoolize --force --copy
+aclocal
+automake -acf -Wno-portability
+autoconf
+rm -rf autom4te.cache/
+
+Index: file-roller-2.26.2/aclocal.m4
+===================================================================
+--- file-roller-2.26.2.orig/aclocal.m4 2009-05-18 21:33:17.000000000 +0200
++++ file-roller-2.26.2/aclocal.m4 2009-06-11 23:34:50.767994953 +0200
+@@ -55,10 +55,11 @@ AC_DEFUN([AM_GCONF_SOURCE_2],
+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
+
+ AC_ARG_ENABLE(schemas-install,
+- [ --disable-schemas-install Disable the schemas installation],
++ AC_HELP_STRING([--disable-schemas-install],
++ [Disable the schemas installation]),
+ [case ${enableval} in
+ yes|no) ;;
+- *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
+ esac])
+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
+ ])
+@@ -5049,6 +5050,9 @@ dnl Note also adjust exclude_expsyms for
openbsd*)
with_gnu_ld=no
;;
@@ -11,7 +32,7 @@
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -9235,61 +9238,59 @@
+@@ -9235,61 +9239,59 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -121,7 +142,7 @@
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-@@ -9467,6 +9468,35 @@
+@@ -9467,6 +9469,35 @@ fi
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
@@ -157,10 +178,11 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-diff -urN file-roller-2.26.1.orig/configure file-roller-2.26.1/configure
---- file-roller-2.26.1.orig/configure 2009-04-14 01:03:19.000000000 +0200
-+++ file-roller-2.26.1/configure 2009-04-26 09:54:30.000000000 +0200
-@@ -910,6 +910,9 @@
+Index: file-roller-2.26.2/configure
+===================================================================
+--- file-roller-2.26.2.orig/configure 2009-05-18 21:33:23.000000000 +0200
++++ file-roller-2.26.2/configure 2009-06-11 23:35:05.531489406 +0200
+@@ -910,6 +910,9 @@ LDFLAGS
CFLAGS
CC
ACLOCAL_AMFLAGS
@@ -170,7 +192,7 @@
am__untar
am__tar
AMTAR
-@@ -973,6 +976,7 @@
+@@ -973,6 +976,7 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -178,7 +200,7 @@
enable_dependency_tracking
enable_static
enable_shared
-@@ -1636,6 +1640,8 @@
+@@ -1636,6 +1640,8 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
@@ -187,7 +209,17 @@
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--enable-static[=PKGS] build static libraries [default=no]
-@@ -2624,6 +2630,29 @@
+@@ -1649,7 +1655,8 @@ Optional Features:
+ --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
++ --disable-schemas-install
++ Disable the schemas installation
+
+ Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+@@ -2624,6 +2631,29 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
ac_config_headers="$ac_config_headers config.h"
@@ -217,89 +249,89 @@
-@@ -4471,13 +4500,13 @@
+@@ -4471,13 +4501,13 @@ if test "${lt_cv_nm_interface+set}" = se
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4474: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:4503: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:4504: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4477: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:4506: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:4507: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4480: output\"" >&5)
-+ (eval echo "\"\$as_me:4509: output\"" >&5)
++ (eval echo "\"\$as_me:4510: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -5683,7 +5712,7 @@
+@@ -5683,7 +5713,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5686 "configure"' > conftest.$ac_ext
-+ echo '#line 5715 "configure"' > conftest.$ac_ext
++ echo '#line 5716 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7506,11 +7535,11 @@
+@@ -7506,11 +7536,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:7509: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7538: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7539: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7513: \$? = $ac_status" >&5
-+ echo "$as_me:7542: \$? = $ac_status" >&5
++ echo "$as_me:7543: \$? = $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.
-@@ -7845,11 +7874,11 @@
+@@ -7845,11 +7875,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:7848: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7877: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7878: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7852: \$? = $ac_status" >&5
-+ echo "$as_me:7881: \$? = $ac_status" >&5
++ echo "$as_me:7882: \$? = $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.
-@@ -7950,11 +7979,11 @@
+@@ -7950,11 +7980,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:7953: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7982: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7983: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7957: \$? = $ac_status" >&5
-+ echo "$as_me:7986: \$? = $ac_status" >&5
++ echo "$as_me:7987: \$? = $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
-@@ -8005,11 +8034,11 @@
+@@ -8005,11 +8035,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:8008: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8037: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8038: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8012: \$? = $ac_status" >&5
-+ echo "$as_me:8041: \$? = $ac_status" >&5
++ echo "$as_me:8042: \$? = $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
-@@ -8124,6 +8153,9 @@
+@@ -8124,6 +8154,9 @@ $as_echo_n "checking whether the $compil
openbsd*)
with_gnu_ld=no
;;
@@ -309,25 +341,25 @@
esac
ld_shlibs=yes
-@@ -10818,7 +10850,7 @@
+@@ -10818,7 +10851,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10821 "configure"
-+#line 10853 "configure"
++#line 10854 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10914,7 +10946,7 @@
+@@ -10914,7 +10947,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10917 "configure"
-+#line 10949 "configure"
++#line 10950 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -14533,6 +14565,13 @@
+@@ -14533,6 +14566,13 @@ LIBOBJS=$ac_libobjs
LTLIBOBJS=$ac_ltlibobjs
@@ -341,7 +373,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -16047,28 +16086,27 @@
+@@ -16047,28 +16087,27 @@ $as_echo "$as_me: executing $ac_file com
case $ac_file$ac_mode in
@@ -391,7 +423,7 @@
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
-@@ -16091,28 +16129,28 @@
+@@ -16091,28 +16130,28 @@ $as_echo X"$mf" |
q
}
s/.*/./; q'`
@@ -442,7 +474,7 @@
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
-@@ -16135,7 +16173,7 @@
+@@ -16135,7 +16174,7 @@ $as_echo X"$file" |
q
}
s/.*/./; q'`
@@ -451,7 +483,7 @@
case $as_dir in #(
-*) as_dir=./$as_dir;;
esac
-@@ -16176,11 +16214,10 @@
+@@ -16176,11 +16215,10 @@ $as_echo X"$as_dir" |
} || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
@@ -466,18 +498,19 @@
;;
"libtool":C)
-diff -urN file-roller-2.26.1.orig/copy-n-paste/Makefile.in file-roller-2.26.1/copy-n-paste/Makefile.in
---- file-roller-2.26.1.orig/copy-n-paste/Makefile.in 2009-04-14 01:03:23.000000000 +0200
-+++ file-roller-2.26.1/copy-n-paste/Makefile.in 2009-04-26 09:54:35.000000000 +0200
-@@ -135,6 +135,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -243,7 +244,7 @@
+Index: file-roller-2.26.2/copy-n-paste/Makefile.in
+===================================================================
+--- file-roller-2.26.2.orig/copy-n-paste/Makefile.in 2009-05-18 21:33:19.000000000 +0200
++++ file-roller-2.26.2/copy-n-paste/Makefile.in 2009-06-11 23:33:49.651491928 +0200
+@@ -135,6 +135,7 @@ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -243,7 +244,7 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -486,7 +519,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -268,9 +269,9 @@
+@@ -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
@@ -498,18 +531,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -urN file-roller-2.26.1.orig/data/icons/16x16/actions/Makefile.in file-roller-2.26.1/data/icons/16x16/actions/Makefile.in
---- file-roller-2.26.1.orig/data/icons/16x16/actions/Makefile.in 2009-04-14 01:03:23.000000000 +0200
-+++ file-roller-2.26.1/data/icons/16x16/actions/Makefile.in 2009-04-26 09:54:36.000000000 +0200
-@@ -119,6 +119,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -225,7 +226,7 @@
+Index: file-roller-2.26.2/data/icons/16x16/actions/Makefile.in
+===================================================================
+--- file-roller-2.26.2.orig/data/icons/16x16/actions/Makefile.in 2009-05-18 21:33:20.000000000 +0200
++++ file-roller-2.26.2/data/icons/16x16/actions/Makefile.in 2009-06-11 23:33:49.651491928 +0200
+@@ -119,6 +119,7 @@ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -225,7 +226,7 @@ EXTRA_DIST = \
all: all-am
.SUFFIXES:
@@ -518,7 +552,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -250,9 +251,9 @@
+@@ -250,9 +251,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
@@ -530,18 +564,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -urN file-roller-2.26.1.orig/data/icons/16x16/apps/Makefile.in file-roller-2.26.1/data/icons/16x16/apps/Makefile.in
---- file-roller-2.26.1.orig/data/icons/16x16/apps/Makefile.in 2009-04-14 01:03:24.000000000 +0200
-+++ file-roller-2.26.1/data/icons/16x16/apps/Makefile.in 2009-04-26 09:54:36.000000000 +0200
-@@ -119,6 +119,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -224,7 +225,7 @@
+Index: file-roller-2.26.2/data/icons/16x16/apps/Makefile.in
+===================================================================
+--- file-roller-2.26.2.orig/data/icons/16x16/apps/Makefile.in 2009-05-18 21:33:20.000000000 +0200
++++ file-roller-2.26.2/data/icons/16x16/apps/Makefile.in 2009-06-11 23:33:49.651491928 +0200
+@@ -119,6 +119,7 @@ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -224,7 +225,7 @@ gtk_update_icon_cache = gtk-update-icon-
all: all-am
.SUFFIXES:
@@ -550,7 +585,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -249,9 +250,9 @@
+@@ -249,9 +250,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
@@ -562,18 +597,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -urN file-roller-2.26.1.orig/data/icons/16x16/Makefile.in file-roller-2.26.1/data/icons/16x16/Makefile.in
---- file-roller-2.26.1.orig/data/icons/16x16/Makefile.in 2009-04-14 01:03:23.000000000 +0200
-+++ file-roller-2.26.1/data/icons/16x16/Makefile.in 2009-04-26 09:54:36.000000000 +0200
-@@ -121,6 +121,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -214,7 +215,7 @@
+Index: file-roller-2.26.2/data/icons/16x16/Makefile.in
+===================================================================
+--- file-roller-2.26.2.orig/data/icons/16x16/Makefile.in 2009-05-18 21:33:20.000000000 +0200
++++ file-roller-2.26.2/data/icons/16x16/Makefile.in 2009-06-11 23:33:49.651491928 +0200
+@@ -121,6 +121,7 @@ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -214,7 +215,7 @@ SUBDIRS = actions apps
all: all-recursive
.SUFFIXES:
@@ -582,7 +618,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -239,9 +240,9 @@
+@@ -239,9 +240,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
@@ -594,18 +630,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -urN file-roller-2.26.1.orig/data/icons/22x22/apps/Makefile.in file-roller-2.26.1/data/icons/22x22/apps/Makefile.in
---- file-roller-2.26.1.orig/data/icons/22x22/apps/Makefile.in 2009-04-14 01:03:24.000000000 +0200
-+++ file-roller-2.26.1/data/icons/22x22/apps/Makefile.in 2009-04-26 09:54:36.000000000 +0200
-@@ -119,6 +119,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -224,7 +225,7 @@
+Index: file-roller-2.26.2/data/icons/22x22/apps/Makefile.in
+===================================================================
+--- file-roller-2.26.2.orig/data/icons/22x22/apps/Makefile.in 2009-05-18 21:33:20.000000000 +0200
++++ file-roller-2.26.2/data/icons/22x22/apps/Makefile.in 2009-06-11 23:33:49.655492018 +0200
+@@ -119,6 +119,7 @@ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -224,7 +225,7 @@ gtk_update_icon_cache = gtk-update-icon-
all: all-am
.SUFFIXES:
@@ -614,7 +651,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -249,9 +250,9 @@
+@@ -249,9 +250,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
@@ -626,18 +663,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -urN file-roller-2.26.1.orig/data/icons/22x22/Makefile.in file-roller-2.26.1/data/icons/22x22/Makefile.in
---- file-roller-2.26.1.orig/data/icons/22x22/Makefile.in 2009-04-14 01:03:24.000000000 +0200
-+++ file-roller-2.26.1/data/icons/22x22/Makefile.in 2009-04-26 09:54:36.000000000 +0200
-@@ -121,6 +121,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -214,7 +215,7 @@
+Index: file-roller-2.26.2/data/icons/22x22/Makefile.in
+===================================================================
+--- file-roller-2.26.2.orig/data/icons/22x22/Makefile.in 2009-05-18 21:33:20.000000000 +0200
++++ file-roller-2.26.2/data/icons/22x22/Makefile.in 2009-06-11 23:33:49.655492018 +0200
+@@ -121,6 +121,7 @@ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -214,7 +215,7 @@ SUBDIRS = apps
all: all-recursive
.SUFFIXES:
@@ -646,7 +684,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -239,9 +240,9 @@
+@@ -239,9 +240,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,18 +696,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -urN file-roller-2.26.1.orig/data/icons/24x24/actions/Makefile.in file-roller-2.26.1/data/icons/24x24/actions/Makefile.in
---- file-roller-2.26.1.orig/data/icons/24x24/actions/Makefile.in 2009-04-14 01:03:25.000000000 +0200
-+++ file-roller-2.26.1/data/icons/24x24/actions/Makefile.in 2009-04-26 09:54:36.000000000 +0200
-@@ -119,6 +119,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -225,7 +226,7 @@
+Index: file-roller-2.26.2/data/icons/24x24/actions/Makefile.in
+===================================================================
+--- file-roller-2.26.2.orig/data/icons/24x24/actions/Makefile.in 2009-05-18 21:33:21.000000000 +0200
++++ file-roller-2.26.2/data/icons/24x24/actions/Makefile.in 2009-06-11 23:33:49.655492018 +0200
+@@ -119,6 +119,7 @@ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -225,7 +226,7 @@ EXTRA_DIST = \
all: all-am
.SUFFIXES:
@@ -678,7 +717,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -250,9 +251,9 @@
+@@ -250,9 +251,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
@@ -690,18 +729,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -urN file-roller-2.26.1.orig/data/icons/24x24/apps/Makefile.in file-roller-2.26.1/data/icons/24x24/apps/Makefile.in
---- file-roller-2.26.1.orig/data/icons/24x24/apps/Makefile.in 2009-04-14 01:03:25.000000000 +0200
-+++ file-roller-2.26.1/data/icons/24x24/apps/Makefile.in 2009-04-26 09:54:36.000000000 +0200
-@@ -119,6 +119,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -224,7 +225,7 @@
+Index: file-roller-2.26.2/data/icons/24x24/apps/Makefile.in
+===================================================================
+--- file-roller-2.26.2.orig/data/icons/24x24/apps/Makefile.in 2009-05-18 21:33:21.000000000 +0200
++++ file-roller-2.26.2/data/icons/24x24/apps/Makefile.in 2009-06-11 23:33:49.655492018 +0200
+@@ -119,6 +119,7 @@ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -224,7 +225,7 @@ gtk_update_icon_cache = gtk-update-icon-
all: all-am
.SUFFIXES:
@@ -710,7 +750,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -249,9 +250,9 @@
+@@ -249,9 +250,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
@@ -722,18 +762,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -urN file-roller-2.26.1.orig/data/icons/24x24/Makefile.in file-roller-2.26.1/data/icons/24x24/Makefile.in
---- file-roller-2.26.1.orig/data/icons/24x24/Makefile.in 2009-04-14 01:03:24.000000000 +0200
-+++ file-roller-2.26.1/data/icons/24x24/Makefile.in 2009-04-26 09:54:36.000000000 +0200
-@@ -121,6 +121,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -214,7 +215,7 @@
+Index: file-roller-2.26.2/data/icons/24x24/Makefile.in
+===================================================================
+--- file-roller-2.26.2.orig/data/icons/24x24/Makefile.in 2009-05-18 21:33:21.000000000 +0200
++++ file-roller-2.26.2/data/icons/24x24/Makefile.in 2009-06-11 23:33:49.655492018 +0200
+@@ -121,6 +121,7 @@ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -214,7 +215,7 @@ SUBDIRS = actions apps
all: all-recursive
.SUFFIXES:
@@ -742,7 +783,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -239,9 +240,9 @@
+@@ -239,9 +240,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
@@ -754,18 +795,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -urN file-roller-2.26.1.orig/data/icons/32x32/apps/Makefile.in file-roller-2.26.1/data/icons/32x32/apps/Makefile.in
---- file-roller-2.26.1.orig/data/icons/32x32/apps/Makefile.in 2009-04-14 01:03:25.000000000 +0200
-+++ file-roller-2.26.1/data/icons/32x32/apps/Makefile.in 2009-04-26 09:54:36.000000000 +0200
-@@ -119,6 +119,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -224,7 +225,7 @@
+Index: file-roller-2.26.2/data/icons/32x32/apps/Makefile.in
+===================================================================
+--- file-roller-2.26.2.orig/data/icons/32x32/apps/Makefile.in 2009-05-18 21:33:21.000000000 +0200
++++ file-roller-2.26.2/data/icons/32x32/apps/Makefile.in 2009-06-11 23:33:49.655492018 +0200
+@@ -119,6 +119,7 @@ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -224,7 +225,7 @@ gtk_update_icon_cache = gtk-update-icon-
all: all-am
.SUFFIXES:
@@ -774,7 +816,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -249,9 +250,9 @@
+@@ -249,9 +250,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
@@ -786,18 +828,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -urN file-roller-2.26.1.orig/data/icons/32x32/Makefile.in file-roller-2.26.1/data/icons/32x32/Makefile.in
---- file-roller-2.26.1.orig/data/icons/32x32/Makefile.in 2009-04-14 01:03:25.000000000 +0200
-+++ file-roller-2.26.1/data/icons/32x32/Makefile.in 2009-04-26 09:54:36.000000000 +0200
-@@ -121,6 +121,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -214,7 +215,7 @@
+Index: file-roller-2.26.2/data/icons/32x32/Makefile.in
+===================================================================
+--- file-roller-2.26.2.orig/data/icons/32x32/Makefile.in 2009-05-18 21:33:21.000000000 +0200
++++ file-roller-2.26.2/data/icons/32x32/Makefile.in 2009-06-11 23:33:49.655492018 +0200
+@@ -121,6 +121,7 @@ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -214,7 +215,7 @@ SUBDIRS = apps
all: all-recursive
.SUFFIXES:
@@ -806,7 +849,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -239,9 +240,9 @@
+@@ -239,9 +240,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
@@ -818,18 +861,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -urN file-roller-2.26.1.orig/data/icons/Makefile.in file-roller-2.26.1/data/icons/Makefile.in
---- file-roller-2.26.1.orig/data/icons/Makefile.in 2009-04-14 01:03:26.000000000 +0200
-+++ file-roller-2.26.1/data/icons/Makefile.in 2009-04-26 09:54:36.000000000 +0200
-@@ -121,6 +121,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -214,7 +215,7 @@
+Index: file-roller-2.26.2/data/icons/Makefile.in
+===================================================================
+--- file-roller-2.26.2.orig/data/icons/Makefile.in 2009-05-18 21:33:21.000000000 +0200
++++ file-roller-2.26.2/data/icons/Makefile.in 2009-06-11 23:33:49.659493085 +0200
+@@ -121,6 +121,7 @@ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -214,7 +215,7 @@ SUBDIRS = 16x16 22x22 24x24 32x32 scalab
all: all-recursive
.SUFFIXES:
@@ -838,7 +882,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -239,9 +240,9 @@
+@@ -239,9 +240,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
@@ -850,18 +894,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -urN file-roller-2.26.1.orig/data/icons/scalable/apps/Makefile.in file-roller-2.26.1/data/icons/scalable/apps/Makefile.in
---- file-roller-2.26.1.orig/data/icons/scalable/apps/Makefile.in 2009-04-14 01:03:26.000000000 +0200
-+++ file-roller-2.26.1/data/icons/scalable/apps/Makefile.in 2009-04-26 09:54:37.000000000 +0200
-@@ -119,6 +119,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -224,7 +225,7 @@
+Index: file-roller-2.26.2/data/icons/scalable/apps/Makefile.in
+===================================================================
+--- file-roller-2.26.2.orig/data/icons/scalable/apps/Makefile.in 2009-05-18 21:33:21.000000000 +0200
++++ file-roller-2.26.2/data/icons/scalable/apps/Makefile.in 2009-06-11 23:33:49.659493085 +0200
+@@ -119,6 +119,7 @@ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -224,7 +225,7 @@ gtk_update_icon_cache = gtk-update-icon-
all: all-am
.SUFFIXES:
@@ -870,7 +915,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -249,9 +250,9 @@
+@@ -249,9 +250,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
@@ -882,18 +927,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -urN file-roller-2.26.1.orig/data/icons/scalable/Makefile.in file-roller-2.26.1/data/icons/scalable/Makefile.in
---- file-roller-2.26.1.orig/data/icons/scalable/Makefile.in 2009-04-14 01:03:26.000000000 +0200
-+++ file-roller-2.26.1/data/icons/scalable/Makefile.in 2009-04-26 09:54:36.000000000 +0200
-@@ -121,6 +121,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -214,7 +215,7 @@
+Index: file-roller-2.26.2/data/icons/scalable/Makefile.in
+===================================================================
+--- file-roller-2.26.2.orig/data/icons/scalable/Makefile.in 2009-05-18 21:33:21.000000000 +0200
++++ file-roller-2.26.2/data/icons/scalable/Makefile.in 2009-06-11 23:33:49.659493085 +0200
+@@ -121,6 +121,7 @@ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -214,7 +215,7 @@ SUBDIRS = apps
all: all-recursive
.SUFFIXES:
@@ -902,7 +948,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -239,9 +240,9 @@
+@@ -239,9 +240,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
@@ -914,18 +960,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -urN file-roller-2.26.1.orig/data/Makefile.in file-roller-2.26.1/data/Makefile.in
---- file-roller-2.26.1.orig/data/Makefile.in 2009-04-14 01:03:23.000000000 +0200
-+++ file-roller-2.26.1/data/Makefile.in 2009-04-26 09:54:35.000000000 +0200
-@@ -133,6 +133,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -243,7 +244,7 @@
+Index: file-roller-2.26.2/data/Makefile.in
+===================================================================
+--- file-roller-2.26.2.orig/data/Makefile.in 2009-05-18 21:33:20.000000000 +0200
++++ file-roller-2.26.2/data/Makefile.in 2009-06-11 23:33:49.659493085 +0200
+@@ -133,6 +133,7 @@ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -243,7 +244,7 @@ DISTCLEANFILES = \
all: all-recursive
.SUFFIXES:
@@ -934,7 +981,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -268,9 +269,9 @@
+@@ -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
@@ -946,18 +993,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 -urN file-roller-2.26.1.orig/data/ui/Makefile.in file-roller-2.26.1/data/ui/Makefile.in
---- file-roller-2.26.1.orig/data/ui/Makefile.in 2009-04-14 01:03:26.000000000 +0200
-+++ file-roller-2.26.1/data/ui/Makefile.in 2009-04-26 09:54:37.000000000 +0200
-@@ -119,6 +119,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -224,7 +225,7 @@
+Index: file-roller-2.26.2/data/ui/Makefile.in
+===================================================================
+--- file-roller-2.26.2.orig/data/ui/Makefile.in 2009-05-18 21:33:21.000000000 +0200
++++ file-roller-2.26.2/data/ui/Makefile.in 2009-06-11 23:33:49.659493085 +0200
+@@ -119,6 +119,7 @@ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -224,7 +225,7 @@ EXTRA_DIST = $(ui_DATA)
all: all-am
.SUFFIXES:
@@ -966,7 +1014,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -249,9 +250,9 @@
+@@ -249,9 +250,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
@@ -978,18 +1026,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -urN file-roller-2.26.1.orig/help/Makefile.in file-roller-2.26.1/help/Makefile.in
---- file-roller-2.26.1.orig/help/Makefile.in 2009-04-14 01:03:27.000000000 +0200
-+++ file-roller-2.26.1/help/Makefile.in 2009-04-26 09:54:37.000000000 +0200
-@@ -134,6 +134,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -338,7 +339,7 @@
+Index: file-roller-2.26.2/help/Makefile.in
+===================================================================
+--- file-roller-2.26.2.orig/help/Makefile.in 2009-05-18 21:33:22.000000000 +0200
++++ file-roller-2.26.2/help/Makefile.in 2009-06-11 23:33:49.659493085 +0200
+@@ -134,6 +134,7 @@ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -338,7 +339,7 @@ DOC_LINGUAS = bg ca de el en_GB es fi fr
all: all-am
.SUFFIXES:
@@ -998,7 +1047,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -363,9 +364,9 @@
+@@ -363,9 +364,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
@@ -1010,18 +1059,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -urN file-roller-2.26.1.orig/Makefile.in file-roller-2.26.1/Makefile.in
---- file-roller-2.26.1.orig/Makefile.in 2009-04-14 01:03:28.000000000 +0200
-+++ file-roller-2.26.1/Makefile.in 2009-04-26 09:54:37.000000000 +0200
-@@ -135,6 +135,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -262,7 +263,7 @@
+Index: file-roller-2.26.2/Makefile.in
+===================================================================
+--- file-roller-2.26.2.orig/Makefile.in 2009-05-18 22:32:40.000000000 +0200
++++ file-roller-2.26.2/Makefile.in 2009-06-11 23:33:49.663492197 +0200
+@@ -135,6 +135,7 @@ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -263,7 +264,7 @@ all: config.h
.SUFFIXES:
am--refresh:
@:
@@ -1030,7 +1080,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -289,9 +290,9 @@
+@@ -290,9 +291,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1042,7 +1092,7 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
-@@ -303,7 +304,7 @@
+@@ -304,7 +305,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
@@ -1051,18 +1101,19 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
-diff -urN file-roller-2.26.1.orig/nautilus/Makefile.in file-roller-2.26.1/nautilus/Makefile.in
---- file-roller-2.26.1.orig/nautilus/Makefile.in 2009-04-14 01:03:27.000000000 +0200
-+++ file-roller-2.26.1/nautilus/Makefile.in 2009-04-26 09:54:37.000000000 +0200
-@@ -143,6 +143,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -256,7 +257,7 @@
+Index: file-roller-2.26.2/nautilus/Makefile.in
+===================================================================
+--- file-roller-2.26.2.orig/nautilus/Makefile.in 2009-05-18 21:33:22.000000000 +0200
++++ file-roller-2.26.2/nautilus/Makefile.in 2009-06-11 23:33:49.663492197 +0200
+@@ -143,6 +143,7 @@ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -256,7 +257,7 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -1071,7 +1122,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -281,9 +282,9 @@
+@@ -281,9 +282,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
@@ -1083,18 +1134,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-nautilus_extensionLTLIBRARIES: $(nautilus_extension_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -urN file-roller-2.26.1.orig/src/Makefile.in file-roller-2.26.1/src/Makefile.in
---- file-roller-2.26.1.orig/src/Makefile.in 2009-04-14 01:03:28.000000000 +0200
-+++ file-roller-2.26.1/src/Makefile.in 2009-04-26 09:54:37.000000000 +0200
-@@ -195,6 +195,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -424,7 +425,7 @@
+Index: file-roller-2.26.2/src/Makefile.in
+===================================================================
+--- file-roller-2.26.2.orig/src/Makefile.in 2009-05-18 21:33:22.000000000 +0200
++++ file-roller-2.26.2/src/Makefile.in 2009-06-11 23:33:49.663492197 +0200
+@@ -195,6 +195,7 @@ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -424,7 +425,7 @@ all: $(BUILT_SOURCES)
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -1103,7 +1155,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -449,9 +450,9 @@
+@@ -449,9 +450,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
@@ -1115,18 +1167,19 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -urN file-roller-2.26.1.orig/src/sh/Makefile.in file-roller-2.26.1/src/sh/Makefile.in
---- file-roller-2.26.1.orig/src/sh/Makefile.in 2009-04-14 01:03:28.000000000 +0200
-+++ file-roller-2.26.1/src/sh/Makefile.in 2009-04-26 09:54:37.000000000 +0200
-@@ -119,6 +119,7 @@
- LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -214,7 +215,7 @@
+Index: file-roller-2.26.2/src/sh/Makefile.in
+===================================================================
+--- file-roller-2.26.2.orig/src/sh/Makefile.in 2009-05-18 21:33:22.000000000 +0200
++++ file-roller-2.26.2/src/sh/Makefile.in 2009-06-11 23:33:49.663492197 +0200
+@@ -119,6 +119,7 @@ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+@@ -214,7 +215,7 @@ EXTRA_DIST = $(sh_DATA)
all: all-am
.SUFFIXES:
@@ -1135,7 +1188,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -239,9 +240,9 @@
+@@ -239,9 +240,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
@@ -1147,3 +1200,564 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+Index: file-roller-2.26.2/INSTALL
+===================================================================
+--- file-roller-2.26.2.orig/INSTALL 2009-06-11 23:35:41.315498607 +0200
++++ file-roller-2.26.2/INSTALL 2009-06-11 23:35:00.479491882 +0200
+@@ -2,15 +2,15 @@ Installation Instructions
+ *************************
+
+ Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+-2006, 2007 Free Software Foundation, Inc.
++2006, 2007, 2008 Free Software Foundation, Inc.
+
+-This file is free documentation; the Free Software Foundation gives
++ This file is free documentation; the Free Software Foundation gives
+ unlimited permission to copy, distribute and modify it.
+
+ Basic Installation
+ ==================
+
+-Briefly, the shell commands `./configure; make; make install' should
++ Briefly, the shell commands `./configure; make; make install' should
+ configure, build, and install this package. The following
+ more-detailed instructions are generic; see the `README' file for
+ instructions specific to this package.
+@@ -73,9 +73,9 @@ The simplest way to compile this package
+ Compilers and Options
+ =====================
+
+-Some systems require unusual options for compilation or linking that the
+-`configure' script does not know about. Run `./configure --help' for
+-details on some of the pertinent environment variables.
++ Some systems require unusual options for compilation or linking that
++the `configure' script does not know about. Run `./configure --help'
++for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+ by setting variables in the command line or in the environment. Here
+@@ -88,7 +88,7 @@ is an example:
+ Compiling For Multiple Architectures
+ ====================================
+
+-You can compile the package for more than one kind of computer at the
++ You can compile the package for more than one kind of computer at the
+ same time, by placing the object files for each architecture in their
+ own directory. To do this, you can use GNU `make'. `cd' to the
+ directory where you want the object files and executables to go and run
+@@ -100,10 +100,24 @@ architecture at a time in the source cod
+ installed the package for one architecture, use `make distclean' before
+ reconfiguring for another architecture.
+
++ On MacOS X 10.5 and later systems, you can create libraries and
++executables that work on multiple system types--known as "fat" or
++"universal" binaries--by specifying multiple `-arch' options to the
++compiler but only a single `-arch' option to the preprocessor. Like
++this:
++
++ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
++ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
++ CPP="gcc -E" CXXCPP="g++ -E"
++
++ This is not guaranteed to produce working output in all cases, you
++may have to build one architecture at a time and combine the results
++using the `lipo' tool if you have problems.
++
+ Installation Names
+ ==================
+
+-By default, `make install' installs the package's commands under
++ By default, `make install' installs the package's commands under
+ `/usr/local/bin', include files under `/usr/local/include', etc. You
+ can specify an installation prefix other than `/usr/local' by giving
+ `configure' the option `--prefix=PREFIX'.
+@@ -126,7 +140,7 @@ option `--program-prefix=PREFIX' or `--p
+ Optional Features
+ =================
+
+-Some packages pay attention to `--enable-FEATURE' options to
++ Some packages pay attention to `--enable-FEATURE' options to
+ `configure', where FEATURE indicates an optional part of the package.
+ They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+ is something like `gnu-as' or `x' (for the X Window System). The
+@@ -138,14 +152,36 @@ find the X include and library files aut
+ you can use the `configure' options `--x-includes=DIR' and
+ `--x-libraries=DIR' to specify their locations.
+
++Particular systems
++==================
++
++ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
++CC is not installed, it is recommended to use the following options in
++order to use an ANSI C compiler:
++
++ ./configure CC="cc -Ae"
++
++and if that doesn't work, install pre-built binaries of GCC for HP-UX.
++
++ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
++parse its `<wchar.h>' header file. The option `-nodtk' can be used as
++a workaround. If GNU CC is not installed, it is therefore recommended
++to try
++
++ ./configure CC="cc"
++
++and if that doesn't work, try
++
++ ./configure CC="cc -nodtk"
++
+ Specifying the System Type
+ ==========================
+
+-There may be some features `configure' cannot figure out automatically,
+-but needs to determine by the type of machine the package will run on.
+-Usually, assuming the package is built to be run on the _same_
+-architectures, `configure' can figure that out, but if it prints a
+-message saying it cannot guess the machine type, give it the
++ There may be some features `configure' cannot figure out
++automatically, but needs to determine by the type of machine the package
++will run on. Usually, assuming the package is built to be run on the
++_same_ architectures, `configure' can figure that out, but if it prints
++a message saying it cannot guess the machine type, give it the
+ `--build=TYPE' option. TYPE can either be a short name for the system
+ type, such as `sun4', or a canonical name which has the form:
+
+@@ -171,9 +207,9 @@ eventually be run) with `--host=TYPE'.
+ Sharing Defaults
+ ================
+
+-If you want to set default values for `configure' scripts to share, you
+-can create a site shell script called `config.site' that gives default
+-values for variables like `CC', `cache_file', and `prefix'.
++ If you want to set default values for `configure' scripts to share,
++you can create a site shell script called `config.site' that gives
++default values for variables like `CC', `cache_file', and `prefix'.
+ `configure' looks for `PREFIX/share/config.site' if it exists, then
+ `PREFIX/etc/config.site' if it exists. Or, you can set the
+ `CONFIG_SITE' environment variable to the location of the site script.
+@@ -182,7 +218,7 @@ A warning: not all `configure' scripts l
+ Defining Variables
+ ==================
+
+-Variables not defined in a site shell script can be set in the
++ Variables not defined in a site shell script can be set in the
+ environment passed to `configure'. However, some packages may run
+ configure again during the build, and the customized values of these
+ variables may be lost. In order to avoid this problem, you should set
+@@ -201,11 +237,19 @@ an Autoconf bug. Until the bug is fixed
+ `configure' Invocation
+ ======================
+
+-`configure' recognizes the following options to control how it operates.
++ `configure' recognizes the following options to control how it
++operates.
+
+ `--help'
+ `-h'
+- Print a summary of the options to `configure', and exit.
++ Print a summary of all of the options to `configure', and exit.
++
++`--help=short'
++`--help=recursive'
++ Print a summary of the options unique to this package's
++ `configure', and exit. The `short' variant lists options used
++ only in the top level, while the `recursive' variant lists options
++ also present in any nested packages.
+
+ `--version'
+ `-V'
+@@ -232,6 +276,16 @@ an Autoconf bug. Until the bug is fixed
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
++`--prefix=DIR'
++ Use DIR as the installation prefix. *Note Installation Names::
++ for more details, including other options available for fine-tuning
++ the installation locations.
++
++`--no-create'
++`-n'
++ Run the configure checks, but stop before creating any output
++ files.
++
+ `configure' also accepts some other, not widely useful, options. Run
+ `configure --help' for more details.
+
+Index: file-roller-2.26.2/config.guess
+===================================================================
+--- file-roller-2.26.2.orig/config.guess 2009-06-11 23:35:41.575500997 +0200
++++ file-roller-2.26.2/config.guess 2009-06-11 23:34:58.379992508 +0200
+@@ -4,7 +4,7 @@
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ # Free Software Foundation, Inc.
+
+-timestamp='2008-01-23'
++timestamp='2009-04-27'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -324,6 +324,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ case `/usr/bin/uname -p` in
+ sparc) echo sparc-icl-nx7; exit ;;
+ esac ;;
++ s390x:SunOS:*:*)
++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ exit ;;
+ sun4H:SunOS:5.*:*)
+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+@@ -331,7 +334,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ eval $set_cc_for_build
++ SUN_ARCH="i386"
++ # If there is a compiler, see if it is configured for 64-bit objects.
++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
++ # This test works for both compilers.
++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++ grep IS_64BIT_ARCH >/dev/null
++ then
++ SUN_ARCH="x86_64"
++ fi
++ fi
++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4*:SunOS:6*:*)
+ # According to config.sub, this is the proper way to canonicalize
+@@ -796,7 +812,7 @@ EOF
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+- EM64T | authenticamd)
++ EM64T | authenticamd | genuineintel)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+@@ -935,6 +951,9 @@ EOF
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit ;;
++ padre:Linux:*:*)
++ echo sparc-unknown-linux-gnu
++ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -985,9 +1004,6 @@ EOF
+ a.out-i386-linux)
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ exit ;;
+- coff-i386)
+- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+- exit ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+@@ -1102,8 +1118,11 @@ EOF
+ pc:*:*:*)
+ # Left here for compatibility:
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+- # the processor, so we play safe by assuming i386.
+- echo i386-pc-msdosdjgpp
++ # the processor, so we play safe by assuming i586.
++ # Note: whatever this is, it MUST be the same as what config.sub
++ # prints for the "djgpp" host, or else GDB configury will decide that
++ # this is a cross-build.
++ echo i586-pc-msdosdjgpp
+ exit ;;
+ Intel:Mach:3*:*)
+ echo i386-pc-mach3
+@@ -1141,6 +1160,16 @@ EOF
+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4; exit; } ;;
++ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
++ OS_REL='.3'
++ test -r /etc/.relid \
++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+@@ -1216,6 +1245,9 @@ EOF
+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
+ echo i586-pc-beos
+ exit ;;
++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
++ echo i586-pc-haiku
++ exit ;;
+ SX-4:SUPER-UX:*:*)
+ echo sx4-nec-superux${UNAME_RELEASE}
+ exit ;;
+@@ -1324,6 +1356,9 @@ EOF
+ i*86:rdos:*:*)
+ echo ${UNAME_MACHINE}-pc-rdos
+ exit ;;
++ i*86:AROS:*:*)
++ echo ${UNAME_MACHINE}-pc-aros
++ exit ;;
+ esac
+
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+Index: file-roller-2.26.2/config.sub
+===================================================================
+--- file-roller-2.26.2.orig/config.sub 2009-06-11 23:35:41.463499478 +0200
++++ file-roller-2.26.2/config.sub 2009-06-11 23:34:58.411992246 +0200
+@@ -4,7 +4,7 @@
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ # Free Software Foundation, Inc.
+
+-timestamp='2008-01-16'
++timestamp='2009-04-17'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -122,6 +122,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-
+ case $maybe_os in
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
++ kopensolaris*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+@@ -249,13 +250,16 @@ case $basic_machine in
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
++ | lm32 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+- | maxq | mb | microblaze | mcore | mep \
++ | maxq | mb | microblaze | mcore | mep | metag \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+- | mips64vr | mips64vrel \
++ | mips64octeon | mips64octeonel \
+ | mips64orion | mips64orionel \
++ | mips64r5900 | mips64r5900el \
++ | mips64vr | mips64vrel \
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
+@@ -268,6 +272,7 @@ case $basic_machine in
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipstx39 | mipstx39el \
+ | mn10200 | mn10300 \
++ | moxie \
+ | mt \
+ | msp430 \
+ | nios | nios2 \
+@@ -277,7 +282,7 @@ case $basic_machine in
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
+ | score \
+- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+@@ -286,7 +291,7 @@ case $basic_machine in
+ | v850 | v850e \
+ | we32k \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+- | z8k)
++ | z8k | z80)
+ basic_machine=$basic_machine-unknown
+ ;;
+ m6811 | m68hc11 | m6812 | m68hc12)
+@@ -329,14 +334,17 @@ case $basic_machine in
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
++ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+- | m88110-* | m88k-* | maxq-* | mcore-* \
++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+- | mips64vr-* | mips64vrel-* \
++ | mips64octeon-* | mips64octeonel-* \
+ | mips64orion-* | mips64orionel-* \
++ | mips64r5900-* | mips64r5900el-* \
++ | mips64vr-* | mips64vrel-* \
+ | mips64vr4100-* | mips64vr4100el-* \
+ | mips64vr4300-* | mips64vr4300el-* \
+ | mips64vr5000-* | mips64vr5000el-* \
+@@ -358,20 +366,20 @@ case $basic_machine in
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+ | romp-* | rs6000-* \
+- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+ | tron-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | xstormy16-* | xtensa*-* \
+ | ymp-* \
+- | z8k-*)
++ | z8k-* | z80-*)
+ ;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+@@ -439,6 +447,10 @@ case $basic_machine in
+ basic_machine=m68k-apollo
+ os=-bsd
+ ;;
++ aros)
++ basic_machine=i386-pc
++ os=-aros
++ ;;
+ aux)
+ basic_machine=m68k-apple
+ os=-aux
+@@ -459,6 +471,10 @@ case $basic_machine in
+ basic_machine=c90-cray
+ os=-unicos
+ ;;
++ cegcc)
++ basic_machine=arm-unknown
++ os=-cegcc
++ ;;
+ convex-c1)
+ basic_machine=c1-convex
+ os=-bsd
+@@ -526,6 +542,10 @@ case $basic_machine in
+ basic_machine=m88k-motorola
+ os=-sysv3
+ ;;
++ dicos)
++ basic_machine=i686-pc
++ os=-dicos
++ ;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+@@ -1128,6 +1148,10 @@ case $basic_machine in
+ basic_machine=z8k-unknown
+ os=-sim
+ ;;
++ z80-*-coff)
++ basic_machine=z80-unknown
++ os=-sim
++ ;;
+ none)
+ basic_machine=none-none
+ os=-none
+@@ -1166,7 +1190,7 @@ case $basic_machine in
+ we32k)
+ basic_machine=we32k-att
+ ;;
+- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+ basic_machine=sh-unknown
+ ;;
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+@@ -1238,8 +1262,9 @@ case $os in
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
++ | -kopensolaris* \
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+- | -aos* \
++ | -aos* | -aros* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+@@ -1248,7 +1273,7 @@ case $os in
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+- | -chorusos* | -chorusrdb* \
++ | -chorusos* | -chorusrdb* | -cegcc* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+@@ -1388,6 +1413,9 @@ case $os in
+ -zvmoe)
+ os=-zvmoe
+ ;;
++ -dicos*)
++ os=-dicos
++ ;;
+ -none)
+ ;;
+ *)
+Index: file-roller-2.26.2/ltmain.sh
+===================================================================
+--- file-roller-2.26.2.orig/ltmain.sh 2009-06-11 23:35:41.755500625 +0200
++++ file-roller-2.26.2/ltmain.sh 2009-06-11 23:34:22.708328005 +0200
+@@ -65,7 +65,7 @@
+ # compiler: $LTCC
+ # compiler flags: $LTCFLAGS
+ # linker: $LD (gnu? $with_gnu_ld)
+-# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1
++# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
+ # automake: $automake_version
+ # autoconf: $autoconf_version
+ #
+@@ -73,7 +73,7 @@
+
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION="2.2.6 Debian-2.2.6a-1ubuntu1"
++VERSION="2.2.6 Debian-2.2.6a-4"
+ TIMESTAMP=""
+ package_revision=1.3012
+
+@@ -5347,19 +5347,19 @@ func_mode_link ()
+ # It is a libtool convenience library, so add in its objects.
+ convenience="$convenience $ladir/$objdir/$old_library"
+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
++ tmp_libs=
++ for deplib in $dependency_libs; do
++ deplibs="$deplib $deplibs"
++ if $opt_duplicate_deps ; then
++ case "$tmp_libs " in
++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++ esac
++ fi
++ tmp_libs="$tmp_libs $deplib"
++ done
+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ func_fatal_error "\`$lib' is not a convenience library"
+ fi
+- tmp_libs=
+- for deplib in $dependency_libs; do
+- deplibs="$deplib $deplibs"
+- if $opt_duplicate_deps ; then
+- case "$tmp_libs " in
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+- esac
+- fi
+- tmp_libs="$tmp_libs $deplib"
+- done
+ continue
+ fi # $pass = conv
+
+@@ -5896,6 +5896,7 @@ func_mode_link ()
+ if test "$link_all_deplibs" != no; then
+ # Add the search paths of all dependency libraries
+ for deplib in $dependency_libs; do
++ path=
+ case $deplib in
+ -L*) path="$deplib" ;;
+ *.la)
Modified: desktop/unstable/file-roller/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/patches/99_ltmain_as-needed.patch?rev=20333&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/patches/99_ltmain_as-needed.patch (original)
+++ desktop/unstable/file-roller/debian/patches/99_ltmain_as-needed.patch Thu Jun 11 21:48:26 2009
@@ -1,7 +1,9 @@
---- a/ltmain.sh 2008-02-08 01:54:46.000000000 +0100
-+++ b/ltmain.sh 2008-08-08 01:56:29.000000000 +0200
-@@ -1807,6 +1807,11 @@
- arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+Index: file-roller-2.26.2/ltmain.sh
+===================================================================
+--- file-roller-2.26.2.orig/ltmain.sh 2009-06-11 23:34:22.708328005 +0200
++++ file-roller-2.26.2/ltmain.sh 2009-06-11 23:35:55.291494639 +0200
+@@ -4716,6 +4716,11 @@ func_mode_link ()
+ arg=$func_stripname_result
;;
+ -Wl,--as-needed)
@@ -10,9 +12,9 @@
+ ;;
+
-Wl,*)
- args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
- arg=
-@@ -2150,6 +2155,15 @@
+ func_stripname '-Wl,' '' "$arg"
+ args=$func_stripname_result
+@@ -5070,6 +5075,15 @@ func_mode_link ()
lib=
found=no
case $deplib in
Modified: desktop/unstable/file-roller/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/rules?rev=20333&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/rules (original)
+++ desktop/unstable/file-roller/debian/rules Thu Jun 11 21:48:26 2009
@@ -23,6 +23,7 @@
desktop-check-mime-types
clean::
+ rm -f src/fr-marshal.? src/fr-enum-types.?
if [ -f configure.in ] && [ ! -f gnome-doc-utils.make ]; then \
cp /usr/share/gnome-doc-utils/gnome-doc-utils.make . ; \
fi
More information about the pkg-gnome-commits
mailing list