r12612 - /desktop/unstable/gnome-menus/debian/patches/70_reautogen.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Thu Sep 20 09:44:06 UTC 2007
Author: slomo
Date: Thu Sep 20 09:44:06 2007
New Revision: 12612
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12612
Log:
* fix patch
Modified:
desktop/unstable/gnome-menus/debian/patches/70_reautogen.patch
Modified: desktop/unstable/gnome-menus/debian/patches/70_reautogen.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/70_reautogen.patch?rev=12612&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/70_reautogen.patch (original)
+++ desktop/unstable/gnome-menus/debian/patches/70_reautogen.patch Thu Sep 20 09:44:06 2007
@@ -1,6 +1,6 @@
diff -Naur gnome-menus-2.20.0.old/aclocal.m4 gnome-menus-2.20.0/aclocal.m4
--- gnome-menus-2.20.0.old/aclocal.m4 2007-09-17 20:48:49.000000000 +0200
-+++ gnome-menus-2.20.0/aclocal.m4 2007-09-20 11:28:34.000000000 +0200
++++ gnome-menus-2.20.0/aclocal.m4 2007-09-20 11:42:59.000000000 +0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
@@ -14189,7 +14189,7 @@
diff -Naur gnome-menus-2.20.0.old/config.guess gnome-menus-2.20.0/config.guess
diff -Naur gnome-menus-2.20.0.old/config.h.in gnome-menus-2.20.0/config.h.in
--- gnome-menus-2.20.0.old/config.h.in 2007-09-17 20:48:55.000000000 +0200
-+++ gnome-menus-2.20.0/config.h.in 2007-09-20 11:28:39.000000000 +0200
++++ gnome-menus-2.20.0/config.h.in 2007-09-20 11:43:04.000000000 +0200
@@ -15,15 +15,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
@@ -14209,7 +14209,7 @@
diff -Naur gnome-menus-2.20.0.old/config.sub gnome-menus-2.20.0/config.sub
diff -Naur gnome-menus-2.20.0.old/configure gnome-menus-2.20.0/configure
--- gnome-menus-2.20.0.old/configure 2007-09-17 20:48:54.000000000 +0200
-+++ gnome-menus-2.20.0/configure 2007-09-20 11:28:37.000000000 +0200
++++ gnome-menus-2.20.0/configure 2007-09-20 11:43:02.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -21425,7 +21425,7 @@
if cmp -s ${file} ${file}.out 2>/dev/null; then
diff -Naur gnome-menus-2.20.0.old/depcomp gnome-menus-2.20.0/depcomp
--- gnome-menus-2.20.0.old/depcomp 2007-09-17 20:49:02.000000000 +0200
-+++ gnome-menus-2.20.0/depcomp 2007-09-20 11:28:40.000000000 +0200
++++ gnome-menus-2.20.0/depcomp 2007-09-20 11:43:05.000000000 +0200
@@ -1,9 +1,10 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
@@ -21526,7 +21526,7 @@
# $dir$base.o.d over $dir.libs/$base.o.d because the latter is
diff -Naur gnome-menus-2.20.0.old/desktop-directories/Makefile.in gnome-menus-2.20.0/desktop-directories/Makefile.in
--- gnome-menus-2.20.0.old/desktop-directories/Makefile.in 2007-09-17 20:49:00.000000000 +0200
-+++ gnome-menus-2.20.0/desktop-directories/Makefile.in 2007-09-20 11:28:40.000000000 +0200
++++ gnome-menus-2.20.0/desktop-directories/Makefile.in 2007-09-20 11:43:05.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -21789,7 +21789,7 @@
diff -Naur gnome-menus-2.20.0.old/INSTALL gnome-menus-2.20.0/INSTALL
diff -Naur gnome-menus-2.20.0.old/install-sh gnome-menus-2.20.0/install-sh
--- gnome-menus-2.20.0.old/install-sh 2007-09-17 20:48:59.000000000 +0200
-+++ gnome-menus-2.20.0/install-sh 2007-09-20 11:28:40.000000000 +0200
++++ gnome-menus-2.20.0/install-sh 2007-09-20 11:43:05.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
@@ -22261,7 +22261,7 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
diff -Naur gnome-menus-2.20.0.old/layout/Makefile.in gnome-menus-2.20.0/layout/Makefile.in
--- gnome-menus-2.20.0.old/layout/Makefile.in 2007-09-17 20:49:00.000000000 +0200
-+++ gnome-menus-2.20.0/layout/Makefile.in 2007-09-20 11:28:40.000000000 +0200
++++ gnome-menus-2.20.0/layout/Makefile.in 2007-09-20 11:43:05.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -22518,7 +22518,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naur gnome-menus-2.20.0.old/libmenu/Makefile.in gnome-menus-2.20.0/libmenu/Makefile.in
--- gnome-menus-2.20.0.old/libmenu/Makefile.in 2007-09-17 20:49:01.000000000 +0200
-+++ gnome-menus-2.20.0/libmenu/Makefile.in 2007-09-20 11:28:40.000000000 +0200
++++ gnome-menus-2.20.0/libmenu/Makefile.in 2007-09-20 11:43:05.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -22546,22 +22546,19 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -69,25 +65,31 @@
+@@ -69,25 +65,29 @@
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 \
- menu-monitor-fam.c menu-monitor-inotify.c
- at INOTIFY_SUPPORT_FALSE@am__objects_1 = menu-monitor-fam.lo
-+ user-is-sudoer.c user-is-sudoer.h menu-monitor-gnomevfs.c \
-+ menu-monitor-inotify.c
++ menu-monitor-gnomevfs.c menu-monitor-inotify.c
+ at INOTIFY_SUPPORT_FALSE@am__objects_1 = menu-monitor-gnomevfs.lo
@INOTIFY_SUPPORT_TRUE at am__objects_1 = menu-monitor-inotify.lo
am__objects_2 =
am_libgnome_menu_la_OBJECTS = canonicalize.lo desktop-entries.lo \
entry-directories.lo gmenu-tree.lo menu-layout.lo \
-- menu-monitor.lo menu-util.lo $(am__objects_1) $(am__objects_2)
-+ menu-monitor.lo menu-util.lo user-is-sudoer.lo \
-+ $(am__objects_1) $(am__objects_2)
+ menu-monitor.lo menu-util.lo $(am__objects_1) $(am__objects_2)
libgnome_menu_la_OBJECTS = $(am_libgnome_menu_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+libgnome_menu_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -22587,7 +22584,7 @@
SOURCES = $(libgnome_menu_la_SOURCES)
DIST_SOURCES = $(am__libgnome_menu_la_SOURCES_DIST)
pkgconfigDATA_INSTALL = $(INSTALL_DATA)
-@@ -100,8 +102,6 @@
+@@ -100,8 +100,6 @@
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -22596,7 +22593,7 @@
AMTAR = @AMTAR@
AR = @AR@
AS = @AS@
-@@ -134,18 +134,16 @@
+@@ -134,18 +132,16 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
@@ -22618,7 +22615,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -156,14 +154,12 @@
+@@ -156,14 +152,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -22634,7 +22631,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -175,7 +171,6 @@
+@@ -175,7 +169,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -22642,7 +22639,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -186,9 +181,8 @@
+@@ -186,9 +179,8 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -22653,7 +22650,7 @@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -214,6 +208,7 @@
+@@ -214,6 +206,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -22661,7 +22658,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -221,13 +216,13 @@
+@@ -221,13 +214,13 @@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
@@ -22679,7 +22676,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -239,6 +234,7 @@
+@@ -239,6 +232,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -22687,7 +22684,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -270,22 +266,26 @@
+@@ -270,22 +264,26 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -22717,14 +22714,7 @@
libgnome_menu_la_SOURCES = \
canonicalize.c \
canonicalize.h \
-@@ -302,12 +302,14 @@
- menu-monitor-backend.h \
- menu-util.c \
- menu-util.h \
-+ user-is-sudoer.c \
-+ user-is-sudoer.h \
- $(MONITOR_BACKEND_SOURCES) \
- $(NULL)
+@@ -307,7 +305,7 @@
libgnome_menu_la_LIBADD = \
$(GLIB_LIBS) \
@@ -22733,7 +22723,7 @@
$(NULL)
libgnome_menu_la_LDFLAGS = \
-@@ -368,7 +370,7 @@
+@@ -368,7 +366,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@@ -22742,7 +22732,7 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-@@ -379,7 +381,7 @@
+@@ -379,7 +377,7 @@
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
@@ -22751,7 +22741,7 @@
p=$(am__strip_dir) \
echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
$(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-@@ -394,7 +396,7 @@
+@@ -394,7 +392,7 @@
rm -f "$${dir}/so_locations"; \
done
libgnome-menu.la: $(libgnome_menu_la_OBJECTS) $(libgnome_menu_la_DEPENDENCIES)
@@ -22760,7 +22750,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -407,28 +409,29 @@
+@@ -407,28 +405,28 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/entry-directories.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gmenu-tree.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/menu-layout.Plo at am__quote@
@@ -22769,7 +22759,6 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/menu-monitor-inotify.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/menu-monitor.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/menu-util.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/user-is-sudoer.Plo at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -22797,7 +22786,7 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-@@ -438,13 +441,9 @@
+@@ -438,13 +436,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -22812,7 +22801,7 @@
@list='$(pkgconfig_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -461,7 +460,7 @@
+@@ -461,7 +455,7 @@
done
install-libgnome_menu_includeHEADERS: $(libgnome_menu_include_HEADERS)
@$(NORMAL_INSTALL)
@@ -22821,7 +22810,7 @@
@list='$(libgnome_menu_include_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -526,22 +525,21 @@
+@@ -526,22 +520,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -22857,7 +22846,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -557,7 +555,7 @@
+@@ -557,7 +550,7 @@
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
installdirs:
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libgnome_menu_includedir)"; do \
@@ -22866,7 +22855,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -592,7 +590,7 @@
+@@ -592,7 +585,7 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -22875,7 +22864,7 @@
dvi: dvi-am
-@@ -607,12 +605,20 @@
+@@ -607,12 +600,20 @@
install-data-am: install-libgnome_menu_includeHEADERS \
install-pkgconfigDATA
@@ -22896,7 +22885,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -633,22 +639,25 @@
+@@ -633,22 +634,25 @@
ps-am:
@@ -23486,7 +23475,7 @@
diff -Naur gnome-menus-2.20.0.old/Makefile.in gnome-menus-2.20.0/Makefile.in
--- gnome-menus-2.20.0.old/Makefile.in 2007-09-17 20:49:02.000000000 +0200
-+++ gnome-menus-2.20.0/Makefile.in 2007-09-20 11:28:41.000000000 +0200
++++ gnome-menus-2.20.0/Makefile.in 2007-09-20 11:43:06.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -23833,7 +23822,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naur gnome-menus-2.20.0.old/missing gnome-menus-2.20.0/missing
--- gnome-menus-2.20.0.old/missing 2007-09-17 20:48:59.000000000 +0200
-+++ gnome-menus-2.20.0/missing 2007-09-20 11:28:40.000000000 +0200
++++ gnome-menus-2.20.0/missing 2007-09-20 11:43:05.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
@@ -24018,7 +24007,7 @@
tar "$firstarg" "$@" && exit 0
diff -Naur gnome-menus-2.20.0.old/mkinstalldirs gnome-menus-2.20.0/mkinstalldirs
--- gnome-menus-2.20.0.old/mkinstalldirs 2007-09-17 20:49:02.000000000 +0200
-+++ gnome-menus-2.20.0/mkinstalldirs 2007-09-20 11:28:41.000000000 +0200
++++ gnome-menus-2.20.0/mkinstalldirs 2007-09-20 11:43:06.000000000 +0200
@@ -1,7 +1,7 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
@@ -24040,7 +24029,7 @@
diff -Naur gnome-menus-2.20.0.old/python/Makefile.in gnome-menus-2.20.0/python/Makefile.in
--- gnome-menus-2.20.0.old/python/Makefile.in 2007-09-17 20:49:01.000000000 +0200
-+++ gnome-menus-2.20.0/python/Makefile.in 2007-09-20 11:28:40.000000000 +0200
++++ gnome-menus-2.20.0/python/Makefile.in 2007-09-20 11:43:05.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -24383,7 +24372,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naur gnome-menus-2.20.0.old/simple-editor/GMenuSimpleEditor/Makefile.in gnome-menus-2.20.0/simple-editor/GMenuSimpleEditor/Makefile.in
--- gnome-menus-2.20.0.old/simple-editor/GMenuSimpleEditor/Makefile.in 2007-09-17 20:49:01.000000000 +0200
-+++ gnome-menus-2.20.0/simple-editor/GMenuSimpleEditor/Makefile.in 2007-09-20 11:28:40.000000000 +0200
++++ gnome-menus-2.20.0/simple-editor/GMenuSimpleEditor/Makefile.in 2007-09-20 11:43:05.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -24653,7 +24642,7 @@
all-local: config.py
diff -Naur gnome-menus-2.20.0.old/simple-editor/Makefile.in gnome-menus-2.20.0/simple-editor/Makefile.in
--- gnome-menus-2.20.0.old/simple-editor/Makefile.in 2007-09-17 20:49:02.000000000 +0200
-+++ gnome-menus-2.20.0/simple-editor/Makefile.in 2007-09-20 11:28:40.000000000 +0200
++++ gnome-menus-2.20.0/simple-editor/Makefile.in 2007-09-20 11:43:05.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -24997,7 +24986,7 @@
gmenu-simple-editor: gmenu-simple-editor.in
diff -Naur gnome-menus-2.20.0.old/util/Makefile.in gnome-menus-2.20.0/util/Makefile.in
--- gnome-menus-2.20.0.old/util/Makefile.in 2007-09-17 20:49:02.000000000 +0200
-+++ gnome-menus-2.20.0/util/Makefile.in 2007-09-20 11:28:41.000000000 +0200
++++ gnome-menus-2.20.0/util/Makefile.in 2007-09-20 11:43:05.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
More information about the pkg-gnome-commits
mailing list