r16090 - in /desktop/unstable/file-roller/debian: changelog patches/02_nautilus_2.20.patch patches/70_autoconf.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed May 28 14:04:48 UTC 2008
Author: joss
Date: Wed May 28 14:04:47 2008
New Revision: 16090
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16090
Log:
* New upstream bugfix release.
* 02_nautilus_2.20.patch: revert the gio migration of the nautilus
extension so that it can still build against nautilus 2.20.
* 70_autoconf.patch: re-run autoconf on top of that.
Added:
desktop/unstable/file-roller/debian/patches/02_nautilus_2.20.patch
desktop/unstable/file-roller/debian/patches/70_autoconf.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=16090&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/changelog (original)
+++ desktop/unstable/file-roller/debian/changelog Wed May 28 14:04:47 2008
@@ -1,3 +1,12 @@
+file-roller (2.22.3-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+ * 02_nautilus_2.20.patch: revert the gio migration of the nautilus
+ extension so that it can still build against nautilus 2.20.
+ * 70_autoconf.patch: re-run autoconf on top of that.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 28 May 2008 15:49:16 +0200
+
file-roller (2.22.1-1) unstable; urgency=low
* New upstream bugfix release.
Added: desktop/unstable/file-roller/debian/patches/02_nautilus_2.20.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/patches/02_nautilus_2.20.patch?rev=16090&op=file
==============================================================================
--- desktop/unstable/file-roller/debian/patches/02_nautilus_2.20.patch (added)
+++ desktop/unstable/file-roller/debian/patches/02_nautilus_2.20.patch Wed May 28 14:04:47 2008
@@ -1,0 +1,96 @@
+Revert upstream commit r2220.
+Temporary measure until nautilus 2.22 is in unstable.
+
+Index: file-roller-2.22.3/configure.in
+===================================================================
+--- file-roller-2.22.3.orig/configure.in 2008-05-28 15:58:17.294210157 +0200
++++ file-roller-2.22.3/configure.in 2008-05-28 15:59:27.501707338 +0200
+@@ -18,13 +18,13 @@ dnl it too, or it will never make it int
+ dnl
+ dnl ==========================================================================
+
+-GLIB_REQUIRED=2.15.0
++GLIB_REQUIRED=2.12.0
+ GTK_REQUIRED=2.10.0
+ LIBGNOME_REQUIRED=2.6.0
+ LIBGNOMEUI_REQUIRED=2.6.0
+ GNOME_VFS_REQUIRED=2.10.0
+ LIBGLADE_REQUIRED=2.4.0
+-NAUTILUS_REQUIRED=2.22.2
++NAUTILUS_REQUIRED=2.10.0
+
+ AC_SUBST(GLIB_REQUIRED)
+ AC_SUBST(GTK_REQUIRED)
+@@ -38,7 +38,6 @@ dnl ====================================
+
+ PKG_CHECK_MODULES(FR, \
+ glib-2.0 >= $GLIB_REQUIRED \
+- gio-2.0 >= $GLIB_REQUIRED \
+ gthread-2.0 \
+ gtk+-2.0 >= $GTK_REQUIRED \
+ libgnome-2.0 >= $LIBGNOME_REQUIRED \
+@@ -57,8 +56,8 @@ AC_ARG_ENABLE(nautilus_actions, AC_HELP_
+
+ if test x"$enable_nautilus_actions" != xno; then
+ if pkg-config --atleast-version=$NAUTILUS_REQUIRED libnautilus-extension; then
+- NAUTILUS_CFLAGS=`pkg-config --cflags libnautilus-extension glib-2.0 gio-2.0`
+- NAUTILUS_LIBS=`pkg-config --libs libnautilus-extension glib-2.0 gio-2.0`
++ NAUTILUS_CFLAGS=`pkg-config --cflags libnautilus-extension glib-2.0 gnome-vfs-2.0`
++ NAUTILUS_LIBS=`pkg-config --libs libnautilus-extension glib-2.0 gnome-vfs-2.0`
+ build_nautilus_actions=yes
+ fi
+ fi
+Index: file-roller-2.22.3/nautilus/nautilus-fileroller.c
+===================================================================
+--- file-roller-2.22.3.orig/nautilus/nautilus-fileroller.c 2008-05-28 15:59:57.245710138 +0200
++++ file-roller-2.22.3/nautilus/nautilus-fileroller.c 2008-05-28 16:00:06.429707616 +0200
+@@ -24,7 +24,9 @@
+ #include <config.h>
+ #include <string.h>
+ #include <glib/gi18n-lib.h>
+-#include <gio/gio.h>
++#include <libgnomevfs/gnome-vfs-utils.h>
++#include <libgnomevfs/gnome-vfs-file-info.h>
++#include <libgnomevfs/gnome-vfs-ops.h>
+ #include <libnautilus-extension/nautilus-extension-types.h>
+ #include <libnautilus-extension/nautilus-file-info.h>
+ #include <libnautilus-extension/nautilus-menu-provider.h>
+@@ -204,17 +206,32 @@ nautilus_fr_get_file_items (NautilusMenu
+ for (scan = files; scan; scan = scan->next) {
+ NautilusFileInfo *file = scan->data;
+
+- if ((all_archives = is_archive (file)) == FALSE)
+- break;
++ if (all_archives && ! is_archive (file))
++ all_archives = FALSE;
+
+- if (can_write) {
+- NautilusFileInfo *parent;
+
+- parent = nautilus_file_info_get_parent_info (file);
+- can_write = nautilus_file_info_can_write (parent);
++ if (can_write) {
++ char *parent_uri;
++ GnomeVFSFileInfo *info;
++ GnomeVFSResult result;
++
++ parent_uri = nautilus_file_info_get_parent_uri (file);
++ info = gnome_vfs_file_info_new ();
++
++ result = gnome_vfs_get_file_info (parent_uri,
++ info,
++ (GNOME_VFS_FILE_INFO_FOLLOW_LINKS
++ | GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS));
++ if ((result == GNOME_VFS_OK) && (info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS))
++ can_write = (info->permissions & GNOME_VFS_PERM_ACCESS_WRITABLE) || (info->permissions & GNOME_VFS_PERM_USER_WRITE);
++
++ gnome_vfs_file_info_unref (info);
++ g_free (parent_uri);
+ }
+ }
+
++ /**/
++
+ one_item = (files != NULL) && (files->next == NULL);
+ one_archive = one_item && all_archives;
+
Added: desktop/unstable/file-roller/debian/patches/70_autoconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/patches/70_autoconf.patch?rev=16090&op=file
==============================================================================
--- desktop/unstable/file-roller/debian/patches/70_autoconf.patch (added)
+++ desktop/unstable/file-roller/debian/patches/70_autoconf.patch Wed May 28 14:04:47 2008
@@ -1,0 +1,111 @@
+Index: file-roller-2.22.3/configure
+===================================================================
+--- file-roller-2.22.3.orig/configure 2008-05-28 16:01:29.997712628 +0200
++++ file-roller-2.22.3/configure 2008-05-28 16:01:33.706205187 +0200
+@@ -20047,13 +20047,13 @@ fi
+
+
+
+-GLIB_REQUIRED=2.15.0
++GLIB_REQUIRED=2.12.0
+ GTK_REQUIRED=2.10.0
+ LIBGNOME_REQUIRED=2.6.0
+ LIBGNOMEUI_REQUIRED=2.6.0
+ GNOME_VFS_REQUIRED=2.10.0
+ LIBGLADE_REQUIRED=2.4.0
+-NAUTILUS_REQUIRED=2.22.2
++NAUTILUS_REQUIRED=2.10.0
+
+
+
+@@ -20076,7 +20076,6 @@ if test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
+ glib-2.0 >= \$GLIB_REQUIRED \\
+- gio-2.0 >= \$GLIB_REQUIRED \\
+ gthread-2.0 \\
+ gtk+-2.0 >= \$GTK_REQUIRED \\
+ libgnome-2.0 >= \$LIBGNOME_REQUIRED \\
+@@ -20086,7 +20085,6 @@ if test -n "$PKG_CONFIG"; then
+ libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
+ ($PKG_CONFIG --exists --print-errors "\
+ glib-2.0 >= $GLIB_REQUIRED \
+- gio-2.0 >= $GLIB_REQUIRED \
+ gthread-2.0 \
+ gtk+-2.0 >= $GTK_REQUIRED \
+ libgnome-2.0 >= $LIBGNOME_REQUIRED \
+@@ -20099,7 +20097,6 @@ if test -n "$PKG_CONFIG"; then
+ (exit $ac_status); }; then
+ pkg_cv_FR_CFLAGS=`$PKG_CONFIG --cflags "\
+ glib-2.0 >= $GLIB_REQUIRED \
+- gio-2.0 >= $GLIB_REQUIRED \
+ gthread-2.0 \
+ gtk+-2.0 >= $GTK_REQUIRED \
+ libgnome-2.0 >= $LIBGNOME_REQUIRED \
+@@ -20121,7 +20118,6 @@ if test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
+ glib-2.0 >= \$GLIB_REQUIRED \\
+- gio-2.0 >= \$GLIB_REQUIRED \\
+ gthread-2.0 \\
+ gtk+-2.0 >= \$GTK_REQUIRED \\
+ libgnome-2.0 >= \$LIBGNOME_REQUIRED \\
+@@ -20131,7 +20127,6 @@ if test -n "$PKG_CONFIG"; then
+ libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
+ ($PKG_CONFIG --exists --print-errors "\
+ glib-2.0 >= $GLIB_REQUIRED \
+- gio-2.0 >= $GLIB_REQUIRED \
+ gthread-2.0 \
+ gtk+-2.0 >= $GTK_REQUIRED \
+ libgnome-2.0 >= $LIBGNOME_REQUIRED \
+@@ -20144,7 +20139,6 @@ if test -n "$PKG_CONFIG"; then
+ (exit $ac_status); }; then
+ pkg_cv_FR_LIBS=`$PKG_CONFIG --libs "\
+ glib-2.0 >= $GLIB_REQUIRED \
+- gio-2.0 >= $GLIB_REQUIRED \
+ gthread-2.0 \
+ gtk+-2.0 >= $GTK_REQUIRED \
+ libgnome-2.0 >= $LIBGNOME_REQUIRED \
+@@ -20172,7 +20166,6 @@ fi
+ if test $_pkg_short_errors_supported = yes; then
+ FR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
+ glib-2.0 >= $GLIB_REQUIRED \
+- gio-2.0 >= $GLIB_REQUIRED \
+ gthread-2.0 \
+ gtk+-2.0 >= $GTK_REQUIRED \
+ libgnome-2.0 >= $LIBGNOME_REQUIRED \
+@@ -20183,7 +20176,6 @@ fi
+ else
+ FR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
+ glib-2.0 >= $GLIB_REQUIRED \
+- gio-2.0 >= $GLIB_REQUIRED \
+ gthread-2.0 \
+ gtk+-2.0 >= $GTK_REQUIRED \
+ libgnome-2.0 >= $LIBGNOME_REQUIRED \
+@@ -20197,7 +20189,6 @@ fi
+
+ { { echo "$as_me:$LINENO: error: Package requirements (\
+ glib-2.0 >= $GLIB_REQUIRED \
+- gio-2.0 >= $GLIB_REQUIRED \
+ gthread-2.0 \
+ gtk+-2.0 >= $GTK_REQUIRED \
+ libgnome-2.0 >= $LIBGNOME_REQUIRED \
+@@ -20217,7 +20208,6 @@ See the pkg-config man page for more det
+ " >&5
+ echo "$as_me: error: Package requirements (\
+ glib-2.0 >= $GLIB_REQUIRED \
+- gio-2.0 >= $GLIB_REQUIRED \
+ gthread-2.0 \
+ gtk+-2.0 >= $GTK_REQUIRED \
+ libgnome-2.0 >= $LIBGNOME_REQUIRED \
+@@ -20280,8 +20270,8 @@ fi
+
+ if test x"$enable_nautilus_actions" != xno; then
+ if pkg-config --atleast-version=$NAUTILUS_REQUIRED libnautilus-extension; then
+- NAUTILUS_CFLAGS=`pkg-config --cflags libnautilus-extension glib-2.0 gio-2.0`
+- NAUTILUS_LIBS=`pkg-config --libs libnautilus-extension glib-2.0 gio-2.0`
++ NAUTILUS_CFLAGS=`pkg-config --cflags libnautilus-extension glib-2.0 gnome-vfs-2.0`
++ NAUTILUS_LIBS=`pkg-config --libs libnautilus-extension glib-2.0 gnome-vfs-2.0`
+ build_nautilus_actions=yes
+ fi
+ fi
Modified: desktop/unstable/file-roller/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/patches/series?rev=16090&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/patches/series (original)
+++ desktop/unstable/file-roller/debian/patches/series Wed May 28 14:04:47 2008
@@ -1,2 +1,4 @@
01_menu_change.patch
+02_nautilus_2.20.patch
+70_autoconf.patch
99_ltmain_as-needed.patch -p0
More information about the pkg-gnome-commits
mailing list