garnome r6200 - in trunk: . desktop/file-roller desktop/file-roller/files desktop/nautilus desktop/seahorse desktop/seahorse/files geektoys/gksu

[jsacco svn gnome org]

Author: jsacco
Date: Wed Jan 16 18:49:53 2008
New Revision: 6200
URL: http://svn.gnome.org/viewvc/garnome?rev=6200&view=rev

Log:
desktop/nautilus: patch libnautilus-extension.pc: add gnome-vfs-2.0 to Requires list; back out patches for gksu, seahorse, file-roller


Removed:
   trunk/desktop/file-roller/files/
   trunk/desktop/seahorse/files/
Modified:
   trunk/ChangeLog
   trunk/desktop/file-roller/Makefile
   trunk/desktop/file-roller/checksums
   trunk/desktop/nautilus/Makefile
   trunk/desktop/nautilus/checksums
   trunk/desktop/seahorse/Makefile
   trunk/desktop/seahorse/checksums
   trunk/geektoys/gksu/Makefile

Modified: trunk/desktop/file-roller/Makefile
==============================================================================
--- trunk/desktop/file-roller/Makefile	(original)
+++ trunk/desktop/file-roller/Makefile	Wed Jan 16 18:49:53 2008
@@ -2,7 +2,6 @@
 GARVERSION = 2.21.1
 CATEGORIES = desktop
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
-PATCHFILES = nautilus_Makefile.patch
 
 LIBDEPS = desktop/gnome-doc-utils desktop/nautilus
 

Modified: trunk/desktop/file-roller/checksums
==============================================================================
--- trunk/desktop/file-roller/checksums	(original)
+++ trunk/desktop/file-roller/checksums	Wed Jan 16 18:49:53 2008
@@ -1,2 +1 @@
 b369a13d1359434422f8915c46bcabc6  download/file-roller-2.21.1.tar.bz2
-a47f152b8e3e84a89285555ddf7c679c  download/nautilus_Makefile.patch

Modified: trunk/desktop/nautilus/Makefile
==============================================================================
--- trunk/desktop/nautilus/Makefile	(original)
+++ trunk/desktop/nautilus/Makefile	Wed Jan 16 18:49:53 2008
@@ -2,6 +2,7 @@
 GARVERSION = 2.21.5
 CATEGORIES = desktop
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
+PATCHFILES = libnautilus-extension.pc.in.patch
 
 LIBDEPS = platform/esound platform/libgnomeui platform/ORBit2 desktop/librsvg desktop/gnome-desktop desktop/eel desktop/gnome-keyring
 

Modified: trunk/desktop/nautilus/checksums
==============================================================================
--- trunk/desktop/nautilus/checksums	(original)
+++ trunk/desktop/nautilus/checksums	Wed Jan 16 18:49:53 2008
@@ -1 +1,2 @@
 cd1e6dbab5cd31678c0a8bc4ecd979fd  download/nautilus-2.21.5.tar.bz2
+8d9562e9a98b10d21843ab5649eaee5d  download/libnautilus-extension.pc.in.patch

Modified: trunk/desktop/seahorse/Makefile
==============================================================================
--- trunk/desktop/seahorse/Makefile	(original)
+++ trunk/desktop/seahorse/Makefile	Wed Jan 16 18:49:53 2008
@@ -2,7 +2,6 @@
 GARVERSION = 2.21.4
 CATEGORIES = desktop
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
-PATCHFILES = nautilus-ext-Makefile.patch
 
 LIBDEPS = platform/gtk+ platform/GConf platform/libglade
 

Modified: trunk/desktop/seahorse/checksums
==============================================================================
--- trunk/desktop/seahorse/checksums	(original)
+++ trunk/desktop/seahorse/checksums	Wed Jan 16 18:49:53 2008
@@ -1,2 +1 @@
 4ef7b083f0f2c1c8ab479905a633be3e  download/seahorse-2.21.4.tar.bz2
-809b57da764c452006c6ab73f82d9590  download/nautilus-ext-Makefile.patch

Modified: trunk/geektoys/gksu/Makefile
==============================================================================
--- trunk/geektoys/gksu/Makefile	(original)
+++ trunk/geektoys/gksu/Makefile	Wed Jan 16 18:49:53 2008
@@ -19,6 +19,3 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include ../category.mk
-
-# cheap hack to fix INCLUDE search path
-CFLAGS += -I$(includedir)/gnome-vfs-2.0