r24506 - in /desktop/unstable/file-roller/debian: changelog patches/10_command_dpkg.patch patches/90_relibtoolize.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Thu Jun 10 02:56:05 UTC 2010
Author: joss
Date: Thu Jun 10 02:56:05 2010
New Revision: 24506
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24506
Log:
* 10_command_dpkg.patch: new patch. Add support for .deb files using
dpkg. Closes: #515175.
* 90_relibtoolize.patch: re-run the autotools on top of that.
Added:
desktop/unstable/file-roller/debian/patches/10_command_dpkg.patch
desktop/unstable/file-roller/debian/patches/90_relibtoolize.patch
Modified:
desktop/unstable/file-roller/debian/changelog
desktop/unstable/file-roller/debian/patches/series
Modified: desktop/unstable/file-roller/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/changelog?rev=24506&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/changelog [utf-8] (original)
+++ desktop/unstable/file-roller/debian/changelog [utf-8] Thu Jun 10 02:56:05 2010
@@ -1,3 +1,11 @@
+file-roller (2.30.1.1-2) unstable; urgency=low
+
+ * 10_command_dpkg.patch: new patch. Add support for .deb files using
+ dpkg. Closes: #515175.
+ * 90_relibtoolize.patch: re-run the autotools on top of that.
+
+ -- Josselin Mouette <joss at debian.org> Thu, 10 Jun 2010 04:56:03 +0200
+
file-roller (2.30.1.1-1) unstable; urgency=low
* New upstream bugfix release.
Added: desktop/unstable/file-roller/debian/patches/10_command_dpkg.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/patches/10_command_dpkg.patch?rev=24506&op=file
==============================================================================
--- desktop/unstable/file-roller/debian/patches/10_command_dpkg.patch (added)
+++ desktop/unstable/file-roller/debian/patches/10_command_dpkg.patch [utf-8] Thu Jun 10 02:56:05 2010
@@ -1,0 +1,422 @@
+Index: file-roller-2.30.1.1/src/fr-command-dpkg.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ file-roller-2.30.1.1/src/fr-command-dpkg.c 2010-06-10 04:53:31.281629195 +0200
+@@ -0,0 +1,314 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
++
++/*
++ * File-Roller
++ *
++ * Copyright (C) 2001 The Free Software Foundation, Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
++ */
++
++#include <config.h>
++#include <stdlib.h>
++#include <string.h>
++#include <time.h>
++
++#include <glib.h>
++
++#include "file-data.h"
++#include "file-utils.h"
++#include "glib-utils.h"
++#include "fr-command.h"
++#include "fr-command-dpkg.h"
++
++static void fr_command_dpkg_class_init (FrCommandDpkgClass *class);
++static void fr_command_dpkg_init (FrCommand *afile);
++static void fr_command_dpkg_finalize (GObject *object);
++
++/* Parent Class */
++
++static FrCommandClass *parent_class = NULL;
++
++static void
++process_metadata_line (char *line,
++ FrCommand *comm)
++{
++ FileData *fdata;
++ char **fields;
++ char *name;
++
++ g_return_if_fail (line != NULL);
++
++ fields = split_line (line, 6);
++ if (!fields[1] || !g_str_equal (fields[1], "bytes,")) {
++ g_strfreev (fields);
++ return;
++ }
++
++ fdata = file_data_new ();
++ fdata->size = g_ascii_strtoull (fields[0], NULL, 10);
++
++ if (fields[5] && g_str_equal (fields[4],"*")) {
++ name = g_strdup (fields[5]);
++ } else {
++ name = g_strdup (get_last_field (line, 5));
++ }
++ g_strstrip (name);
++
++ fdata->full_path = g_strconcat ("/DEBIAN/", name, NULL);
++ fdata->original_path = fdata->full_path + 1;
++
++ g_strfreev (fields);
++ g_free (name);
++
++ fdata->name = g_strdup (name);
++ fdata->path = g_strdup ("DEBIAN");
++ fr_command_add_file (comm, fdata);
++}
++
++static void
++process_data_line (char *line,
++ gpointer data)
++{
++ FileData *fdata;
++ FrCommand *comm = FR_COMMAND (data);
++ char **fields;
++ char **tmfields;
++ struct tm tm = {0, };
++ const char *name;
++
++ g_return_if_fail (line != NULL);
++
++ if (line[0] == ' ') {
++ /* This is the output of dpkg-deb -I */
++ process_metadata_line (line, comm);
++ return;
++ }
++
++ fdata = file_data_new ();
++
++ fields = split_line (line, 5);
++ fdata->size = g_ascii_strtoull (fields[2], NULL, 10);
++ tmfields = g_strsplit(fields[3], "-", 3);
++ if (tmfields[2]) {
++ tm.tm_year = atoi (tmfields[0]) - 1900;
++ tm.tm_mon = atoi (tmfields[1]);
++ tm.tm_mday = atoi (tmfields[2]);
++ }
++ g_strfreev (tmfields);
++ tmfields = g_strsplit (fields[4], ":", 2);
++ if (tmfields[1]) {
++ tm.tm_hour = atoi (tmfields[0]);
++ tm.tm_min = atoi (tmfields[1]);
++ }
++ g_strfreev (tmfields);
++ fdata->modified = mktime (&tm);
++ g_strfreev (fields);
++
++ name = get_last_field (line, 6);
++ fields = g_strsplit (name, " -> ", 2);
++
++ fdata->dir = line[0] == 'd';
++ name = fields[0];
++ if (g_str_has_prefix (name, "./")) { /* Should generally be the case */
++ fdata->full_path = g_strdup (name + 1);
++ fdata->original_path = fdata->full_path + 1;
++ } else if (name[0] == '/') {
++ fdata->full_path = g_strdup (name);
++ fdata->original_path = fdata->full_path;
++ } else {
++ fdata->full_path = g_strconcat ("/", name, NULL);
++ fdata->original_path = fdata->full_path + 1;
++ }
++ if (fdata->dir && (name[strlen (name) - 1] != '/')) {
++ char *old_full_path = fdata->full_path;
++ fdata->full_path = g_strconcat (old_full_path, "/", NULL);
++ g_free (old_full_path);
++ fdata->original_path = g_strdup (name);
++ fdata->free_original_path = TRUE;
++ }
++
++ if (fields[1] != NULL)
++ fdata->link = g_strdup (fields[1]);
++ g_strfreev (fields);
++
++ if (fdata->dir)
++ fdata->name = dir_name_from_path (fdata->full_path);
++ else
++ fdata->name = g_strdup (file_name_from_path (fdata->full_path));
++ fdata->path = remove_level_from_path (fdata->full_path);
++
++ if (*fdata->name == 0)
++ file_data_free (fdata);
++ else
++ fr_command_add_file (comm, fdata);
++}
++
++
++static void
++fr_command_dpkg_list (FrCommand *comm)
++{
++ fr_process_set_out_line_func (comm->process, process_data_line, comm);
++
++ fr_process_begin_command (comm->process, "dpkg-deb");
++ fr_process_add_arg (comm->process, "-I");
++ fr_process_add_arg (comm->process, comm->filename);
++ fr_process_end_command (comm->process);
++ fr_process_start (comm->process);
++
++ fr_process_begin_command (comm->process, "dpkg-deb");
++ fr_process_add_arg (comm->process, "-c");
++ fr_process_add_arg (comm->process, comm->filename);
++ fr_process_end_command (comm->process);
++ fr_process_start (comm->process);
++}
++
++
++static void
++fr_command_dpkg_extract (FrCommand *comm,
++ const char *from_file,
++ GList *file_list,
++ const char *dest_dir,
++ gboolean overwrite,
++ gboolean skip_older,
++ gboolean junk_paths)
++{
++ fr_process_begin_command (comm->process, "dpkg-deb");
++ fr_process_add_arg (comm->process, "-x");
++ fr_process_add_arg (comm->process, comm->filename);
++ if (dest_dir != NULL) {
++ fr_process_add_arg (comm->process, dest_dir);
++ } else {
++ fr_process_add_arg (comm->process, ".");
++ }
++ /* FIXME it is not possible to unpack only some files */
++ fr_process_end_command (comm->process);
++
++ /* Also extract metadata in DEBIAN/ */
++ fr_process_begin_command (comm->process, "dpkg-deb");
++ if (dest_dir != NULL) {
++ fr_process_set_working_dir (comm->process, dest_dir);
++ }
++ fr_process_add_arg (comm->process, "-e");
++ fr_process_add_arg (comm->process, comm->filename);
++ fr_process_end_command (comm->process);
++
++ fr_process_start (comm->process);
++}
++
++
++const char *dpkg_mime_type[] = { "application/x-deb", NULL };
++
++
++const char **
++fr_command_dpkg_get_mime_types (FrCommand *comm)
++{
++ return dpkg_mime_type;
++}
++
++
++FrCommandCap
++fr_command_dpkg_get_capabilities (FrCommand *comm,
++ const char *mime_type,
++ gboolean check_command)
++{
++ FrCommandCap capabilities;
++
++ capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
++ if (is_program_available ("dpkg-deb", check_command))
++ capabilities |= FR_COMMAND_CAN_READ;
++
++ return capabilities;
++}
++
++
++static const char *
++fr_command_dpkg_get_packages (FrCommand *comm,
++ const char *mime_type)
++{
++ return PACKAGES ("dpkg");
++}
++
++
++static void
++fr_command_dpkg_class_init (FrCommandDpkgClass *class)
++{
++ GObjectClass *gobject_class = G_OBJECT_CLASS (class);
++ FrCommandClass *afc;
++
++ parent_class = g_type_class_peek_parent (class);
++ afc = (FrCommandClass*) class;
++
++ gobject_class->finalize = fr_command_dpkg_finalize;
++
++ afc->list = fr_command_dpkg_list;
++ afc->extract = fr_command_dpkg_extract;
++ afc->get_mime_types = fr_command_dpkg_get_mime_types;
++ afc->get_capabilities = fr_command_dpkg_get_capabilities;
++ afc->get_packages = fr_command_dpkg_get_packages;
++}
++
++
++static void
++fr_command_dpkg_init (FrCommand *comm)
++{
++ comm->propAddCanUpdate = FALSE;
++ comm->propAddCanReplace = FALSE;
++ comm->propExtractCanAvoidOverwrite = FALSE;
++ comm->propExtractCanSkipOlder = FALSE;
++ comm->propExtractCanJunkPaths = FALSE;
++ comm->propPassword = FALSE;
++ comm->propTest = FALSE;
++}
++
++
++static void
++fr_command_dpkg_finalize (GObject *object)
++{
++ g_return_if_fail (object != NULL);
++ g_return_if_fail (FR_IS_COMMAND_DPKG (object));
++
++ /* Chain up */
++ if (G_OBJECT_CLASS (parent_class)->finalize)
++ G_OBJECT_CLASS (parent_class)->finalize (object);
++}
++
++
++GType
++fr_command_dpkg_get_type ()
++{
++ static GType type = 0;
++
++ if (! type) {
++ GTypeInfo type_info = {
++ sizeof (FrCommandDpkgClass),
++ NULL,
++ NULL,
++ (GClassInitFunc) fr_command_dpkg_class_init,
++ NULL,
++ NULL,
++ sizeof (FrCommandDpkg),
++ 0,
++ (GInstanceInitFunc) fr_command_dpkg_init
++ };
++
++ type = g_type_register_static (FR_TYPE_COMMAND,
++ "FRCommandDpkg",
++ &type_info,
++ 0);
++ }
++
++ return type;
++}
+Index: file-roller-2.30.1.1/src/fr-command-dpkg.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ file-roller-2.30.1.1/src/fr-command-dpkg.h 2010-06-10 02:03:40.605624552 +0200
+@@ -0,0 +1,53 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
++
++/*
++ * File-Roller
++ *
++ * Copyright (C) 2001 The Free Software Foundation, Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
++ */
++
++#ifndef FR_COMMAND_DPKG_H
++#define FR_COMMAND_DPKG_H
++
++#include <glib.h>
++#include "fr-command.h"
++#include "fr-process.h"
++
++#define FR_TYPE_COMMAND_DPKG (fr_command_dpkg_get_type ())
++#define FR_COMMAND_DPKG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FR_TYPE_COMMAND_DPKG, FrCommandDpkg))
++#define FR_COMMAND_DPKG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FR_TYPE_COMMAND_DPKG, FrCommandDpkgClass))
++#define FR_IS_COMMAND_DPKG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FR_TYPE_COMMAND_DPKG))
++#define FR_IS_COMMAND_DPKG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FR_TYPE_COMMAND_DPKG))
++#define FR_COMMAND_DPKG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), FR_TYPE_COMMAND_DPKG, FrCommandDpkgClass))
++
++typedef struct _FrCommandDpkg FrCommandDpkg;
++typedef struct _FrCommandDpkgClass FrCommandDpkgClass;
++
++struct _FrCommandDpkg
++{
++ FrCommand __parent;
++ gboolean is_empty;
++};
++
++struct _FrCommandDpkgClass
++{
++ FrCommandClass __parent_class;
++};
++
++GType fr_command_dpkg_get_type (void);
++
++#endif /* FR_COMMAND_DPKG_H */
+Index: file-roller-2.30.1.1/src/Makefile.am
+===================================================================
+--- file-roller-2.30.1.1.orig/src/Makefile.am 2010-06-10 02:00:49.206123980 +0200
++++ file-roller-2.30.1.1/src/Makefile.am 2010-06-10 04:07:41.069631162 +0200
+@@ -103,6 +103,8 @@ file_roller_SOURCES = \
+ fr-command-cfile.h \
+ fr-command-cpio.c \
+ fr-command-cpio.h \
++ fr-command-dpkg.c \
++ fr-command-dpkg.h \
+ fr-command-iso.c \
+ fr-command-iso.h \
+ fr-command-jar.h \
+Index: file-roller-2.30.1.1/src/main.c
+===================================================================
+--- file-roller-2.30.1.1.orig/src/main.c 2010-06-10 02:00:45.370123313 +0200
++++ file-roller-2.30.1.1/src/main.c 2010-06-10 04:09:01.477625692 +0200
+@@ -35,6 +35,7 @@
+ #include "fr-command-arj.h"
+ #include "fr-command-cfile.h"
+ #include "fr-command-cpio.h"
++#include "fr-command-dpkg.h"
+ #include "fr-command-iso.h"
+ #include "fr-command-jar.h"
+ #include "fr-command-lha.h"
+@@ -609,6 +610,7 @@ register_commands (void)
+ register_command (FR_TYPE_COMMAND_AR);
+ register_command (FR_TYPE_COMMAND_ARJ);
+ register_command (FR_TYPE_COMMAND_CPIO);
++ register_command (FR_TYPE_COMMAND_DPKG);
+ register_command (FR_TYPE_COMMAND_ISO);
+ register_command (FR_TYPE_COMMAND_JAR);
+ register_command (FR_TYPE_COMMAND_LHA);
+Index: file-roller-2.30.1.1/src/fr-command-ar.c
+===================================================================
+--- file-roller-2.30.1.1.orig/src/fr-command-ar.c 2010-06-10 04:21:37.689624554 +0200
++++ file-roller-2.30.1.1/src/fr-command-ar.c 2010-06-10 04:23:21.741630251 +0200
+@@ -278,7 +278,6 @@ fr_command_ar_handle_error (FrCommand
+
+
+ const char *ar_mime_type[] = { "application/x-ar",
+- "application/x-deb",
+ NULL };
+
+
Added: desktop/unstable/file-roller/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/patches/90_relibtoolize.patch?rev=24506&op=file
==============================================================================
--- desktop/unstable/file-roller/debian/patches/90_relibtoolize.patch (added)
+++ desktop/unstable/file-roller/debian/patches/90_relibtoolize.patch [utf-8] Thu Jun 10 02:56:05 2010
@@ -1,0 +1,1540 @@
+libtoolize --force --copy
+aclocal
+automake -acf -Wno-portability
+autoconf
+rm -rf autom4te.cache
+
+Index: file-roller-2.30.1.1/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/Makefile.in 2010-06-10 04:11:18.074126982 +0200
++++ file-roller-2.30.1.1/Makefile.in 2010-06-10 04:11:00.765622355 +0200
+@@ -201,6 +201,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: file-roller-2.30.1.1/aclocal.m4
+===================================================================
+--- file-roller-2.30.1.1.orig/aclocal.m4 2010-06-10 04:11:18.377626816 +0200
++++ file-roller-2.30.1.1/aclocal.m4 2010-06-10 04:10:50.710121165 +0200
+@@ -756,7 +756,7 @@ IT_PO_SUBDIR([po])
+ AC_DEFUN([IT_PO_SUBDIR],
+ [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+ dnl
+-dnl The following CONFIG_COMMANDS should be exetuted at the very end
++dnl The following CONFIG_COMMANDS should be executed at the very end
+ dnl of config.status.
+ AC_CONFIG_COMMANDS_PRE([
+ AC_CONFIG_COMMANDS([$1/stamp-it], [
+@@ -8765,8 +8765,9 @@ m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_D
+ m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
+ m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+
+-# nls.m4 serial 3 (gettext-0.15)
+-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
++# nls.m4 serial 5 (gettext-0.18)
++dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
++dnl 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.
+@@ -8784,20 +8785,21 @@ 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_PREREQ([2.50])
+
+ AC_DEFUN([AM_NLS],
+ [
+ AC_MSG_CHECKING([whether NLS is requested])
+ dnl Default is enabled NLS
+- AC_ARG_ENABLE(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)
++ AC_MSG_RESULT([$USE_NLS])
++ AC_SUBST([USE_NLS])
+ ])
+
+ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
++# serial 1 (pkg-config-0.24)
+ #
+ # Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
+ #
+@@ -8825,7 +8827,10 @@ AC_DEFUN([AM_NLS],
+ AC_DEFUN([PKG_PROG_PKG_CONFIG],
+ [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+ m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
++AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
++AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+ fi
+@@ -8838,7 +8843,6 @@ if test -n "$PKG_CONFIG"; then
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+-
+ fi[]dnl
+ ])# PKG_PROG_PKG_CONFIG
+
+@@ -8847,34 +8851,31 @@ fi[]dnl
+ # Check to see whether a particular set of modules exists. Similar
+ # to PKG_CHECK_MODULES(), but does not set variables or print errors.
+ #
+-#
+-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+-# this or PKG_CHECK_MODULES is called, or make sure to call
+-# PKG_CHECK_EXISTS manually
++# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++# only at the first occurence in configure.ac, so if the first place
++# it's called might be skipped (such as if it is within an "if", you
++# have to call PKG_CHECK_EXISTS manually
+ # --------------------------------------------------------------
+ AC_DEFUN([PKG_CHECK_EXISTS],
+ [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+ if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+- m4_ifval([$2], [$2], [:])
++ m4_default([$2], [:])
+ m4_ifvaln([$3], [else
+ $3])dnl
+ fi])
+
+-
+ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+ # ---------------------------------------------
+ m4_define([_PKG_CONFIG],
+-[if test -n "$PKG_CONFIG"; then
+- if test -n "$$1"; then
+- pkg_cv_[]$1="$$1"
+- else
+- PKG_CHECK_EXISTS([$3],
+- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+- [pkg_failed=yes])
+- fi
+-else
+- pkg_failed=untried
++[if test -n "$$1"; then
++ pkg_cv_[]$1="$$1"
++ elif test -n "$PKG_CONFIG"; then
++ PKG_CHECK_EXISTS([$3],
++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++ [pkg_failed=yes])
++ else
++ pkg_failed=untried
+ fi[]dnl
+ ])# _PKG_CONFIG
+
+@@ -8916,16 +8917,17 @@ and $1[]_LIBS to avoid the need to call
+ See the pkg-config man page for more details.])
+
+ if test $pkg_failed = yes; then
++ AC_MSG_RESULT([no])
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ else
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+- ifelse([$4], , [AC_MSG_ERROR(dnl
++ m4_default([$4], [AC_MSG_ERROR(
+ [Package requirements ($2) were not met:
+
+ $$1_PKG_ERRORS
+@@ -8933,25 +8935,24 @@ $$1_PKG_ERRORS
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+-_PKG_TEXT
+-])],
+- [AC_MSG_RESULT([no])
+- $4])
++_PKG_TEXT])dnl
++ ])
+ elif test $pkg_failed = untried; then
+- ifelse([$4], , [AC_MSG_FAILURE(dnl
++ AC_MSG_RESULT([no])
++ m4_default([$4], [AC_MSG_FAILURE(
+ [The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+ _PKG_TEXT
+
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+- [$4])
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
++ ])
+ else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+- ifelse([$3], , :, [$3])
++ $3
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+
+Index: file-roller-2.30.1.1/config.guess
+===================================================================
+--- file-roller-2.30.1.1.orig/config.guess 2010-06-10 04:11:18.285630129 +0200
++++ file-roller-2.30.1.1/config.guess 2010-06-10 04:10:58.621621366 +0200
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ # Free Software Foundation, Inc.
+
+-timestamp='2009-04-27'
++timestamp='2009-12-30'
+
+ # 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
+@@ -27,16 +27,16 @@ timestamp='2009-04-27'
+ # the same distribution terms that you use for the rest of that program.
+
+
+-# Originally written by Per Bothner <per at bothner.com>.
+-# Please send patches to <config-patches at gnu.org>. Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# Originally written by Per Bothner. Please send patches (context
++# diff format) to <config-patches at gnu.org> and include a ChangeLog
++# entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub. If it succeeds, it prints the system name on stdout, and
+ # exits with 0. Otherwise, it exits with 1.
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+ me=`echo "$0" | sed -e 's,.*/,,'`
+
+@@ -56,8 +56,9 @@ version="\
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -170,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ eval $set_cc_for_build
+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+- | grep __ELF__ >/dev/null
++ | grep -q __ELF__
+ then
+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ # Return netbsd for either. FIX?
+@@ -333,6 +334,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++ echo i386-pc-auroraux${UNAME_RELEASE}
++ exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ eval $set_cc_for_build
+ SUN_ARCH="i386"
+@@ -656,7 +660,7 @@ EOF
+ # => hppa64-hp-hpux11.23
+
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+- grep __LP64__ >/dev/null
++ grep -q __LP64__
+ then
+ HP_ARCH="hppa2.0w"
+ else
+@@ -807,12 +811,12 @@ EOF
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit ;;
+- *:Interix*:[3456]*)
++ *:Interix*:*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+- EM64T | authenticamd | genuineintel)
++ authenticamd | genuineintel | EM64T)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+@@ -822,6 +826,9 @@ EOF
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
+ exit ;;
++ 8664:Windows_NT:*)
++ echo x86_64-pc-mks
++ exit ;;
+ i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+@@ -851,6 +858,20 @@ EOF
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
++ alpha:Linux:*:*)
++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++ EV5) UNAME_MACHINE=alphaev5 ;;
++ EV56) UNAME_MACHINE=alphaev56 ;;
++ PCA56) UNAME_MACHINE=alphapca56 ;;
++ PCA57) UNAME_MACHINE=alphapca56 ;;
++ EV6) UNAME_MACHINE=alphaev6 ;;
++ EV67) UNAME_MACHINE=alphaev67 ;;
++ EV68*) UNAME_MACHINE=alphaev68 ;;
++ esac
++ objdump --private-headers /bin/sh | grep -q ld.so.1
++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++ exit ;;
+ arm*:Linux:*:*)
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+@@ -873,6 +894,17 @@ EOF
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit ;;
++ i*86:Linux:*:*)
++ LIBC=gnu
++ eval $set_cc_for_build
++ sed 's/^ //' << EOF >$dummy.c
++ #ifdef __dietlibc__
++ LIBC=dietlibc
++ #endif
++EOF
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++ exit ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+@@ -882,78 +914,34 @@ EOF
+ m68*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+- mips:Linux:*:*)
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #undef CPU
+- #undef mips
+- #undef mipsel
+- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+- CPU=mipsel
+- #else
+- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+- CPU=mips
+- #else
+- CPU=
+- #endif
+- #endif
+-EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^CPU/{
+- s: ::g
+- p
+- }'`"
+- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+- ;;
+- mips64:Linux:*:*)
++ mips:Linux:*:* | mips64:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+- #undef mips64
+- #undef mips64el
++ #undef ${UNAME_MACHINE}
++ #undef ${UNAME_MACHINE}el
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+- CPU=mips64el
++ CPU=${UNAME_MACHINE}el
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+- CPU=mips64
++ CPU=${UNAME_MACHINE}
+ #else
+ CPU=
+ #endif
+ #endif
+ EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^CPU/{
+- s: ::g
+- p
+- }'`"
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ or32:Linux:*:*)
+ echo or32-unknown-linux-gnu
+ exit ;;
+- ppc:Linux:*:*)
+- echo powerpc-unknown-linux-gnu
+- exit ;;
+- ppc64:Linux:*:*)
+- echo powerpc64-unknown-linux-gnu
+- exit ;;
+- alpha:Linux:*:*)
+- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+- EV5) UNAME_MACHINE=alphaev5 ;;
+- EV56) UNAME_MACHINE=alphaev56 ;;
+- PCA56) UNAME_MACHINE=alphapca56 ;;
+- PCA57) UNAME_MACHINE=alphapca56 ;;
+- EV6) UNAME_MACHINE=alphaev6 ;;
+- EV67) UNAME_MACHINE=alphaev67 ;;
+- EV68*) UNAME_MACHINE=alphaev68 ;;
+- esac
+- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+- 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 ;;
++ parisc64:Linux:*:* | hppa64:Linux:*:*)
++ echo hppa64-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
+@@ -962,8 +950,11 @@ EOF
+ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit ;;
+- parisc64:Linux:*:* | hppa64:Linux:*:*)
+- echo hppa64-unknown-linux-gnu
++ ppc64:Linux:*:*)
++ echo powerpc64-unknown-linux-gnu
++ exit ;;
++ ppc:Linux:*:*)
++ echo powerpc-unknown-linux-gnu
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+@@ -986,66 +977,6 @@ EOF
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+- i*86:Linux:*:*)
+- # The BFD linker knows what the default object file format is, so
+- # first see if it will tell us. cd to the root directory to prevent
+- # problems with other programs or directories called `ld' in the path.
+- # Set LC_ALL=C to ensure ld outputs messages in English.
+- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+- | sed -ne '/supported targets:/!d
+- s/[ ][ ]*/ /g
+- s/.*supported targets: *//
+- s/ .*//
+- p'`
+- case "$ld_supported_targets" in
+- elf32-i386)
+- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+- ;;
+- a.out-i386-linux)
+- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+- exit ;;
+- "")
+- # Either a pre-BFD a.out linker (linux-gnuoldld) or
+- # one that does not give us useful --help.
+- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+- exit ;;
+- esac
+- # Determine whether the default compiler is a.out or elf
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #include <features.h>
+- #ifdef __ELF__
+- # ifdef __GLIBC__
+- # if __GLIBC__ >= 2
+- LIBC=gnu
+- # else
+- LIBC=gnulibc1
+- # endif
+- # else
+- LIBC=gnulibc1
+- # endif
+- #else
+- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+- LIBC=gnu
+- #else
+- LIBC=gnuaout
+- #endif
+- #endif
+- #ifdef __dietlibc__
+- LIBC=dietlibc
+- #endif
+-EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^LIBC/{
+- s: ::g
+- p
+- }'`"
+- test x"${LIBC}" != x && {
+- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+- exit
+- }
+- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+- ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+@@ -1074,7 +1005,7 @@ EOF
+ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable
+ exit ;;
+- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ i*86:*DOS:*:*)
+@@ -1182,7 +1113,7 @@ EOF
+ rs6000:LynxOS:2.*:*)
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ SM[BE]S:UNIX_SV:*:*)
+@@ -1275,6 +1206,16 @@ EOF
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
++ i386)
++ eval $set_cc_for_build
++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++ grep IS_64BIT_ARCH >/dev/null
++ then
++ UNAME_PROCESSOR="x86_64"
++ fi
++ fi ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+Index: file-roller-2.30.1.1/config.sub
+===================================================================
+--- file-roller-2.30.1.1.orig/config.sub 2010-06-10 04:11:18.189625534 +0200
++++ file-roller-2.30.1.1/config.sub 2010-06-10 04:10:58.649621505 +0200
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ # Free Software Foundation, Inc.
+
+-timestamp='2009-04-17'
++timestamp='2010-01-22'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -32,13 +32,16 @@ timestamp='2009-04-17'
+
+
+ # Please send patches to <config-patches at gnu.org>. Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# diff and a properly formatted GNU ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+@@ -72,8 +75,9 @@ Report bugs and patches to <config-patch
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -149,10 +153,13 @@ case $os in
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+- -apple | -axis | -knuth | -cray)
++ -apple | -axis | -knuth | -cray | -microblaze)
+ os=
+ basic_machine=$1
+ ;;
++ -bluegene*)
++ os=-cnk
++ ;;
+ -sim | -cisco | -oki | -wec | -winbond)
+ os=
+ basic_machine=$1
+@@ -281,6 +288,7 @@ case $basic_machine in
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
++ | rx \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+@@ -288,13 +296,14 @@ case $basic_machine in
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
+ | tahoe | thumb | tic4x | tic80 | tron \
++ | ubicom32 \
+ | v850 | v850e \
+ | we32k \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | z8k | z80)
+ basic_machine=$basic_machine-unknown
+ ;;
+- m6811 | m68hc11 | m6812 | m68hc12)
++ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+ os=-none
+@@ -337,7 +346,7 @@ case $basic_machine in
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+@@ -365,15 +374,17 @@ case $basic_machine in
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+- | romp-* | rs6000-* \
++ | romp-* | rs6000-* | rx-* \
+ | 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-* | tile-* \
++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++ | tile-* | tilegx-* \
+ | tron-* \
++ | ubicom32-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+@@ -467,6 +478,10 @@ case $basic_machine in
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
++ bluegene*)
++ basic_machine=powerpc-ibm
++ os=-cnk
++ ;;
+ c90)
+ basic_machine=c90-cray
+ os=-unicos
+@@ -719,6 +734,9 @@ case $basic_machine in
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
++ microblaze)
++ basic_machine=microblaze-xilinx
++ ;;
+ mingw32)
+ basic_machine=i386-pc
+ os=-mingw32
+@@ -1069,6 +1087,11 @@ case $basic_machine in
+ basic_machine=tic6x-unknown
+ os=-coff
+ ;;
++ # This must be matched before tile*.
++ tilegx*)
++ basic_machine=tilegx-unknown
++ os=-linux-gnu
++ ;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+@@ -1240,6 +1263,9 @@ case $os in
+ # First match some system type aliases
+ # that might get confused with valid system types.
+ # -solaris* is a basic system type, with this one exception.
++ -auroraux)
++ os=-auroraux
++ ;;
+ -solaris1 | -solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ ;;
+@@ -1260,9 +1286,9 @@ case $os in
+ # Each alternative MUST END IN A *, to match a version number.
+ # -sysv* is not here because it comes later, after sysvr4.
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+- | -kopensolaris* \
++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
++ | -sym* | -kopensolaris* \
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ | -aos* | -aros* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+@@ -1283,7 +1309,7 @@ case $os in
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
+@@ -1416,6 +1442,8 @@ case $os in
+ -dicos*)
+ os=-dicos
+ ;;
++ -nacl*)
++ ;;
+ -none)
+ ;;
+ *)
+@@ -1613,7 +1641,7 @@ case $basic_machine in
+ -sunos*)
+ vendor=sun
+ ;;
+- -aix*)
++ -cnk*|-aix*)
+ vendor=ibm
+ ;;
+ -beos*)
+Index: file-roller-2.30.1.1/configure
+===================================================================
+--- file-roller-2.30.1.1.orig/configure 2010-06-10 04:11:17.966122616 +0200
++++ file-roller-2.30.1.1/configure 2010-06-10 04:11:07.597620059 +0200
+@@ -820,6 +820,8 @@ RUN_IN_PLACE_FALSE
+ RUN_IN_PLACE_TRUE
+ GTK_LIBS
+ GTK_CFLAGS
++PKG_CONFIG_LIBDIR
++PKG_CONFIG_PATH
+ PKG_CONFIG
+ NAUTILUS_REQUIRED
+ GTK_REQUIRED
+@@ -969,6 +971,8 @@ LIBS
+ CPPFLAGS
+ CPP
+ PKG_CONFIG
++PKG_CONFIG_PATH
++PKG_CONFIG_LIBDIR
+ GTK_CFLAGS
+ GTK_LIBS
+ FR_CFLAGS
+@@ -1638,6 +1642,10 @@ Some influential environment variables:
+ you have headers in a nonstandard directory <include dir>
+ CPP C preprocessor
+ PKG_CONFIG path to pkg-config utility
++ PKG_CONFIG_PATH
++ directories to add to pkg-config's search path
++ PKG_CONFIG_LIBDIR
++ path overriding pkg-config's built-in search path
+ GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
+ GTK_LIBS linker flags for GTK, overriding pkg-config
+ FR_CFLAGS C compiler flags for FR, overriding pkg-config
+@@ -4649,13 +4657,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:4652: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:4660: $ac_compile\"" >&5)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:4655: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:4663: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:4658: output\"" >&5)
++ (eval echo "\"\$as_me:4666: output\"" >&5)
+ cat conftest.out >&5
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+@@ -5861,7 +5869,7 @@ ia64-*-hpux*)
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 5864 "configure"' > conftest.$ac_ext
++ echo '#line 5872 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -7357,11 +7365,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:7360: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7368: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:7364: \$? = $ac_status" >&5
++ echo "$as_me:7372: \$? = $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.
+@@ -7696,11 +7704,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:7699: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7707: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:7703: \$? = $ac_status" >&5
++ echo "$as_me:7711: \$? = $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.
+@@ -7801,11 +7809,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:7804: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7812: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:7808: \$? = $ac_status" >&5
++ echo "$as_me:7816: \$? = $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
+@@ -7856,11 +7864,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:7859: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7867: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:7863: \$? = $ac_status" >&5
++ echo "$as_me:7871: \$? = $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
+@@ -10240,7 +10248,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 10243 "configure"
++#line 10251 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -10336,7 +10344,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 10339 "configure"
++#line 10347 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -10660,6 +10668,10 @@ NAUTILUS_REQUIRED=2.22.2
+
+
+
++
++
++
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+@@ -10772,18 +10784,16 @@ $as_echo "yes" >&6; }
+ $as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+-
+ fi
+
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
+ $as_echo_n "checking for GTK... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GTK_CFLAGS"; then
+- pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GTK_CFLAGS"; then
++ pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5
+ ac_status=$?
+@@ -10793,15 +10803,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GTK_LIBS"; then
+- pkg_cv_GTK_LIBS="$GTK_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GTK_LIBS"; then
++ pkg_cv_GTK_LIBS="$GTK_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5
+ ac_status=$?
+@@ -10811,14 +10819,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -10826,9 +10835,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED"`
++ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED" 2>&1`
+ else
+- GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED"`
++ GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GTK_PKG_ERRORS" >&5
+@@ -10842,9 +10851,10 @@ installed software in a non-standard pre
+
+ Alternatively, you may set the environment variables GTK_CFLAGS
+ and GTK_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+@@ -10862,7 +10872,7 @@ else
+ GTK_LIBS=$pkg_cv_GTK_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
+ fi
+
+
+@@ -10894,11 +10904,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FR" >&5
+ $as_echo_n "checking for FR... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$FR_CFLAGS"; then
+- pkg_cv_FR_CFLAGS="$FR_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$FR_CFLAGS"; then
++ pkg_cv_FR_CFLAGS="$FR_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
+ glib-2.0 >= \$GLIB_REQUIRED \\
+ gthread-2.0 \\
+@@ -10923,15 +10932,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$FR_LIBS"; then
+- pkg_cv_FR_LIBS="$FR_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$FR_LIBS"; then
++ pkg_cv_FR_LIBS="$FR_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
+ glib-2.0 >= \$GLIB_REQUIRED \\
+ gthread-2.0 \\
+@@ -10956,14 +10963,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -10971,19 +10979,19 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- FR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
++ FR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
+ glib-2.0 >= $GLIB_REQUIRED \
+ gthread-2.0 \
+ gio-unix-2.0 >= $GIO_REQUIRED \
+ gtk+-2.0 >= $GTK_REQUIRED \
+- gconf-2.0 >= $GCONF_REQUIRED"`
++ gconf-2.0 >= $GCONF_REQUIRED" 2>&1`
+ else
+- FR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
++ FR_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
+ glib-2.0 >= $GLIB_REQUIRED \
+ gthread-2.0 \
+ gio-unix-2.0 >= $GIO_REQUIRED \
+ gtk+-2.0 >= $GTK_REQUIRED \
+- gconf-2.0 >= $GCONF_REQUIRED"`
++ gconf-2.0 >= $GCONF_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$FR_PKG_ERRORS" >&5
+@@ -11002,9 +11010,10 @@ installed software in a non-standard pre
+
+ Alternatively, you may set the environment variables FR_CFLAGS
+ and FR_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+@@ -11022,7 +11031,7 @@ else
+ FR_LIBS=$pkg_cv_FR_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
+ fi
+
+
+@@ -11136,11 +11145,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
+ $as_echo_n "checking for DBUS... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$DBUS_CFLAGS"; then
+- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$DBUS_CFLAGS"; then
++ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "dbus-glib-1") 2>&5
+ ac_status=$?
+@@ -11150,15 +11158,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$DBUS_LIBS"; then
+- pkg_cv_DBUS_LIBS="$DBUS_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$DBUS_LIBS"; then
++ pkg_cv_DBUS_LIBS="$DBUS_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "dbus-glib-1") 2>&5
+ ac_status=$?
+@@ -11168,14 +11174,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -11183,17 +11190,17 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1"`
++ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1" 2>&1`
+ else
+- DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1"`
++ DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$DBUS_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- has_dbug_glib=no
++ has_dbug_glib=no
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ has_dbug_glib=no
+ else
+ DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
+@@ -12502,6 +12509,10 @@ fi
+
+
+
++
++
++
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+@@ -12614,7 +12625,6 @@ $as_echo "yes" >&6; }
+ $as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+-
+ fi
+
+ gdu_cv_version_required=0.3.2
+Index: file-roller-2.30.1.1/copy-n-paste/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/copy-n-paste/Makefile.in 2010-06-10 04:11:18.565626608 +0200
++++ file-roller-2.30.1.1/copy-n-paste/Makefile.in 2010-06-10 04:10:58.953622932 +0200
+@@ -184,6 +184,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: file-roller-2.30.1.1/data/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/data/Makefile.in 2010-06-10 04:11:18.698128227 +0200
++++ file-roller-2.30.1.1/data/Makefile.in 2010-06-10 04:10:59.109620051 +0200
+@@ -213,6 +213,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: file-roller-2.30.1.1/data/icons/16x16/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/data/icons/16x16/Makefile.in 2010-06-10 04:11:19.498130471 +0200
++++ file-roller-2.30.1.1/data/icons/16x16/Makefile.in 2010-06-10 04:10:59.181620197 +0200
+@@ -187,6 +187,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: file-roller-2.30.1.1/data/icons/16x16/actions/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/data/icons/16x16/actions/Makefile.in 2010-06-10 04:11:19.686121467 +0200
++++ file-roller-2.30.1.1/data/icons/16x16/actions/Makefile.in 2010-06-10 04:10:59.253620341 +0200
+@@ -171,6 +171,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: file-roller-2.30.1.1/data/icons/16x16/apps/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/data/icons/16x16/apps/Makefile.in 2010-06-10 04:11:19.590124696 +0200
++++ file-roller-2.30.1.1/data/icons/16x16/apps/Makefile.in 2010-06-10 04:10:59.329620090 +0200
+@@ -171,6 +171,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: file-roller-2.30.1.1/data/icons/22x22/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/data/icons/22x22/Makefile.in 2010-06-10 04:11:18.902122042 +0200
++++ file-roller-2.30.1.1/data/icons/22x22/Makefile.in 2010-06-10 04:10:59.401619257 +0200
+@@ -187,6 +187,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: file-roller-2.30.1.1/data/icons/22x22/apps/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/data/icons/22x22/apps/Makefile.in 2010-06-10 04:11:18.990129873 +0200
++++ file-roller-2.30.1.1/data/icons/22x22/apps/Makefile.in 2010-06-10 04:10:59.477619975 +0200
+@@ -171,6 +171,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: file-roller-2.30.1.1/data/icons/24x24/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/data/icons/24x24/Makefile.in 2010-06-10 04:11:19.798127397 +0200
++++ file-roller-2.30.1.1/data/icons/24x24/Makefile.in 2010-06-10 04:10:59.549620110 +0200
+@@ -187,6 +187,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: file-roller-2.30.1.1/data/icons/24x24/actions/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/data/icons/24x24/actions/Makefile.in 2010-06-10 04:11:20.001627424 +0200
++++ file-roller-2.30.1.1/data/icons/24x24/actions/Makefile.in 2010-06-10 04:10:59.621620250 +0200
+@@ -171,6 +171,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: file-roller-2.30.1.1/data/icons/24x24/apps/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/data/icons/24x24/apps/Makefile.in 2010-06-10 04:11:19.889621503 +0200
++++ file-roller-2.30.1.1/data/icons/24x24/apps/Makefile.in 2010-06-10 04:10:59.697619997 +0200
+@@ -171,6 +171,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: file-roller-2.30.1.1/data/icons/32x32/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/data/icons/32x32/Makefile.in 2010-06-10 04:11:19.297628799 +0200
++++ file-roller-2.30.1.1/data/icons/32x32/Makefile.in 2010-06-10 04:10:59.769620629 +0200
+@@ -187,6 +187,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: file-roller-2.30.1.1/data/icons/32x32/apps/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/data/icons/32x32/apps/Makefile.in 2010-06-10 04:11:19.401623796 +0200
++++ file-roller-2.30.1.1/data/icons/32x32/apps/Makefile.in 2010-06-10 04:10:59.845619889 +0200
+@@ -171,6 +171,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: file-roller-2.30.1.1/data/icons/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/data/icons/Makefile.in 2010-06-10 04:11:18.810128292 +0200
++++ file-roller-2.30.1.1/data/icons/Makefile.in 2010-06-10 04:10:59.917620034 +0200
+@@ -187,6 +187,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: file-roller-2.30.1.1/data/icons/scalable/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/data/icons/scalable/Makefile.in 2010-06-10 04:11:19.090124276 +0200
++++ file-roller-2.30.1.1/data/icons/scalable/Makefile.in 2010-06-10 04:10:59.989620173 +0200
+@@ -187,6 +187,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: file-roller-2.30.1.1/data/icons/scalable/apps/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/data/icons/scalable/apps/Makefile.in 2010-06-10 04:11:19.194126603 +0200
++++ file-roller-2.30.1.1/data/icons/scalable/apps/Makefile.in 2010-06-10 04:11:00.070120130 +0200
+@@ -171,6 +171,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: file-roller-2.30.1.1/data/ui/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/data/ui/Makefile.in 2010-06-10 04:11:20.109630807 +0200
++++ file-roller-2.30.1.1/data/ui/Makefile.in 2010-06-10 04:11:00.157620009 +0200
+@@ -171,6 +171,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: file-roller-2.30.1.1/help/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/help/Makefile.in 2010-06-10 04:11:21.505628770 +0200
++++ file-roller-2.30.1.1/help/Makefile.in 2010-06-10 04:11:00.285620429 +0200
+@@ -172,6 +172,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: file-roller-2.30.1.1/ltmain.sh
+===================================================================
+--- file-roller-2.30.1.1.orig/ltmain.sh 2010-06-10 04:11:18.469627894 +0200
++++ file-roller-2.30.1.1/ltmain.sh 2010-06-10 04:10:27.661626096 +0200
+@@ -65,7 +65,7 @@
+ # compiler: $LTCC
+ # compiler flags: $LTCFLAGS
+ # linker: $LD (gnu? $with_gnu_ld)
+-# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
++# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2
+ # automake: $automake_version
+ # autoconf: $autoconf_version
+ #
+@@ -73,7 +73,7 @@
+
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
++VERSION="2.2.6b Debian-2.2.6b-2"
+ TIMESTAMP=""
+ package_revision=1.3017
+
+Index: file-roller-2.30.1.1/nautilus/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/nautilus/Makefile.in 2010-06-10 04:11:20.261625409 +0200
++++ file-roller-2.30.1.1/nautilus/Makefile.in 2010-06-10 04:11:00.389620805 +0200
+@@ -206,6 +206,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: file-roller-2.30.1.1/src/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/src/Makefile.in 2010-06-10 04:11:20.781628231 +0200
++++ file-roller-2.30.1.1/src/Makefile.in 2010-06-10 04:11:00.509620548 +0200
+@@ -62,15 +62,16 @@ am__file_roller_SOURCES_DIST = actions.h
+ fr-command-alz.c fr-command-alz.h fr-command-ar.c \
+ fr-command-ar.h fr-command-arj.c fr-command-arj.h \
+ fr-command-cfile.c fr-command-cfile.h fr-command-cpio.c \
+- fr-command-cpio.h fr-command-iso.c fr-command-iso.h \
+- fr-command-jar.h fr-command-jar.c fr-command-lha.c \
+- fr-command-lha.h fr-command-rar.c fr-command-rar.h \
+- fr-command-rpm.c fr-command-rpm.h fr-command-tar.c \
+- fr-command-tar.h fr-command-unstuff.c fr-command-unstuff.h \
+- fr-command-zip.c fr-command-zip.h fr-command-zoo.c \
+- fr-command-zoo.h fr-command-7z.c fr-command-7z.h fr-error.c \
+- fr-error.h fr-list-model.c fr-list-model.h fr-stock.c \
+- fr-stock.h fr-process.c fr-process.h fr-window.c fr-window.h \
++ fr-command-cpio.h fr-command-dpkg.c fr-command-dpkg.h \
++ fr-command-iso.c fr-command-iso.h fr-command-jar.h \
++ fr-command-jar.c fr-command-lha.c fr-command-lha.h \
++ fr-command-rar.c fr-command-rar.h fr-command-rpm.c \
++ fr-command-rpm.h fr-command-tar.c fr-command-tar.h \
++ fr-command-unstuff.c fr-command-unstuff.h fr-command-zip.c \
++ fr-command-zip.h fr-command-zoo.c fr-command-zoo.h \
++ fr-command-7z.c fr-command-7z.h fr-error.c fr-error.h \
++ fr-list-model.c fr-list-model.h fr-stock.c fr-stock.h \
++ fr-process.c fr-process.h fr-window.c fr-window.h \
+ gconf-utils.c gconf-utils.h gio-utils.c gio-utils.h \
+ glib-utils.c glib-utils.h gtk-utils.c gtk-utils.h java-utils.c \
+ java-utils.h main.c main.h open-file.c open-file.h \
+@@ -90,13 +91,13 @@ am_file_roller_OBJECTS = actions.$(OBJEX
+ fr-command.$(OBJEXT) fr-command-ace.$(OBJEXT) \
+ fr-command-alz.$(OBJEXT) fr-command-ar.$(OBJEXT) \
+ fr-command-arj.$(OBJEXT) fr-command-cfile.$(OBJEXT) \
+- fr-command-cpio.$(OBJEXT) fr-command-iso.$(OBJEXT) \
+- fr-command-jar.$(OBJEXT) fr-command-lha.$(OBJEXT) \
+- fr-command-rar.$(OBJEXT) fr-command-rpm.$(OBJEXT) \
+- fr-command-tar.$(OBJEXT) fr-command-unstuff.$(OBJEXT) \
+- fr-command-zip.$(OBJEXT) fr-command-zoo.$(OBJEXT) \
+- fr-command-7z.$(OBJEXT) fr-error.$(OBJEXT) \
+- fr-list-model.$(OBJEXT) fr-stock.$(OBJEXT) \
++ fr-command-cpio.$(OBJEXT) fr-command-dpkg.$(OBJEXT) \
++ fr-command-iso.$(OBJEXT) fr-command-jar.$(OBJEXT) \
++ fr-command-lha.$(OBJEXT) fr-command-rar.$(OBJEXT) \
++ fr-command-rpm.$(OBJEXT) fr-command-tar.$(OBJEXT) \
++ fr-command-unstuff.$(OBJEXT) fr-command-zip.$(OBJEXT) \
++ fr-command-zoo.$(OBJEXT) fr-command-7z.$(OBJEXT) \
++ fr-error.$(OBJEXT) fr-list-model.$(OBJEXT) fr-stock.$(OBJEXT) \
+ fr-process.$(OBJEXT) fr-window.$(OBJEXT) gconf-utils.$(OBJEXT) \
+ gio-utils.$(OBJEXT) glib-utils.$(OBJEXT) gtk-utils.$(OBJEXT) \
+ java-utils.$(OBJEXT) main.$(OBJEXT) open-file.$(OBJEXT) \
+@@ -273,6 +274,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+@@ -427,6 +430,8 @@ file_roller_SOURCES = \
+ fr-command-cfile.h \
+ fr-command-cpio.c \
+ fr-command-cpio.h \
++ fr-command-dpkg.c \
++ fr-command-dpkg.h \
+ fr-command-iso.c \
+ fr-command-iso.h \
+ fr-command-jar.h \
+@@ -598,6 +603,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fr-command-arj.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fr-command-cfile.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fr-command-cpio.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fr-command-dpkg.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fr-command-iso.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fr-command-jar.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fr-command-lha.Po at am__quote@
+Index: file-roller-2.30.1.1/src/commands/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/src/commands/Makefile.in 2010-06-10 04:11:21.053625018 +0200
++++ file-roller-2.30.1.1/src/commands/Makefile.in 2010-06-10 04:11:00.605620731 +0200
+@@ -180,6 +180,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: file-roller-2.30.1.1/src/sh/Makefile.in
+===================================================================
+--- file-roller-2.30.1.1.orig/src/sh/Makefile.in 2010-06-10 04:11:20.897626920 +0200
++++ file-roller-2.30.1.1/src/sh/Makefile.in 2010-06-10 04:11:00.677620387 +0200
+@@ -171,6 +171,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
Modified: desktop/unstable/file-roller/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/patches/series?rev=24506&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/patches/series [utf-8] (original)
+++ desktop/unstable/file-roller/debian/patches/series [utf-8] Thu Jun 10 02:56:05 2010
@@ -1,1 +1,3 @@
+10_command_dpkg.patch
+90_relibtoolize.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list