r11025 - in /desktop/unstable/gnome-menus/debian: changelog patches/07_gnomevfs.patch

[lool at users.alioth.debian.org]

Author: lool
Date: Wed May 16 14:36:23 2007
New Revision: 11025

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11025
Log:
* Fix .orig file in patch 07_gnomevfs; fixes FTBFS on double build;
  closes: #424341.

Modified:
    desktop/unstable/gnome-menus/debian/changelog
    desktop/unstable/gnome-menus/debian/patches/07_gnomevfs.patch

Modified: desktop/unstable/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/changelog?rev=11025&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/changelog (original)
+++ desktop/unstable/gnome-menus/debian/changelog Wed May 16 14:36:23 2007
@@ -1,3 +1,10 @@
+gnome-menus (2.18.0-2) UNRELEASED; urgency=low
+
+  * Fix .orig file in patch 07_gnomevfs; fixes FTBFS on double build;
+    closes: #424341.
+
+ -- Loic Minier <lool at dooz.org>  Wed, 16 May 2007 16:35:49 +0200
+
 gnome-menus (2.18.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/unstable/gnome-menus/debian/patches/07_gnomevfs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/07_gnomevfs.patch?rev=11025&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/07_gnomevfs.patch (original)
+++ desktop/unstable/gnome-menus/debian/patches/07_gnomevfs.patch Wed May 16 14:36:23 2007
@@ -70,73 +70,6 @@
  	$(NULL)
  libgnome_menu_la_LDFLAGS =			\
  	-version-info $(LIB_MENU_LT_VERSION)	\
-diff -Naur gnome-menus-2.18.0-old/libmenu/Makefile.am.orig gnome-menus-2.18.0/libmenu/Makefile.am.orig
---- gnome-menus-2.18.0-old/libmenu/Makefile.am.orig	1970-01-01 01:00:00.000000000 +0100
-+++ gnome-menus-2.18.0/libmenu/Makefile.am.orig	2007-03-12 19:49:27.000000000 +0100
-@@ -0,0 +1,63 @@
-+NULL = 
-+
-+INCLUDES =				\
-+	-DGMENU_I_KNOW_THIS_IS_UNSTABLE	\
-+	$(GLIB_CFLAGS)			\
-+	$(DISABLE_DEPRECATED_CFLAGS)	\
-+	$(DEBUG_CFLAGS)			\
-+	$(WARN_CFLAGS)			\
-+	$(NULL)
-+
-+lib_LTLIBRARIES = libgnome-menu.la
-+
-+if INOTIFY_SUPPORT
-+MONITOR_BACKEND_SOURCES = menu-monitor-inotify.c
-+MONITOR_BACKEND_EX_DIST = menu-monitor-fam.c
-+else
-+MONITOR_BACKEND_SOURCES = menu-monitor-fam.c
-+MONITOR_BACKEND_EX_DIST = menu-monitor-inotify.c
-+endif
-+
-+libgnome_menu_la_SOURCES =		\
-+	canonicalize.c			\
-+	canonicalize.h			\
-+	desktop-entries.c		\
-+	desktop-entries.h		\
-+	entry-directories.c		\
-+	entry-directories.h		\
-+	gmenu-tree.c			\
-+	gmenu-tree.h			\
-+	menu-layout.c			\
-+	menu-layout.h			\
-+	menu-monitor.c			\
-+	menu-monitor.h			\
-+	menu-monitor-backend.h		\
-+	menu-util.c			\
-+	menu-util.h			\
-+	$(MONITOR_BACKEND_SOURCES)	\
-+	$(NULL)
-+
-+libgnome_menu_la_LIBADD = 		\
-+	$(GLIB_LIBS)			\
-+	$(FAM_LIBS)			\
-+	$(NULL)
-+libgnome_menu_la_LDFLAGS =			\
-+	-version-info $(LIB_MENU_LT_VERSION)	\
-+	-no-undefined				\
-+	-export-symbols-regex gmenu_tree	\
-+	$(NULL)
-+
-+libgnome_menu_includedir = $(includedir)/gnome-menus
-+
-+libgnome_menu_include_HEADERS =		\
-+	gmenu-tree.h			\
-+	$(NULL)
-+
-+EXTRA_DIST =				\
-+        libgnome-menu.pc.in		\
-+        libgnome-menu-uninstalled.pc.in	\
-+	$(MONITOR_BACKEND_EX_DIST)	\
-+	$(NULL)
-+
-+pkgconfigdir   = $(libdir)/pkgconfig
-+pkgconfig_DATA = libgnome-menu.pc
 diff -Naur gnome-menus-2.18.0-old/libmenu/menu-monitor-gnomevfs.c gnome-menus-2.18.0/libmenu/menu-monitor-gnomevfs.c
 --- gnome-menus-2.18.0-old/libmenu/menu-monitor-gnomevfs.c	1970-01-01 01:00:00.000000000 +0100
 +++ gnome-menus-2.18.0/libmenu/menu-monitor-gnomevfs.c	2007-04-25 07:03:58.000000000 +0200