r13284 - /desktop/unstable/gnome-menus/debian/patches/70_reautogen.patch

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Fri Oct 26 18:35:00 UTC 2007


Author: slomo
Date: Fri Oct 26 18:35:00 2007
New Revision: 13284

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13284
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=13284&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/70_reautogen.patch (original)
+++ desktop/unstable/gnome-menus/debian/patches/70_reautogen.patch Fri Oct 26 18:35:00 2007
@@ -1,6 +1,6 @@
-diff -x'*config.guess' -x'*config.sub' -x'*config.h.in~' -Naur gnome-menus-2.20.1.old/aclocal.m4 gnome-menus-2.20.1/aclocal.m4
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-menus-2.20.1.old/aclocal.m4 gnome-menus-2.20.1/aclocal.m4
 --- gnome-menus-2.20.1.old/aclocal.m4	2007-10-15 21:53:11.000000000 +0200
-+++ gnome-menus-2.20.1/aclocal.m4	2007-10-26 20:18:31.000000000 +0200
++++ gnome-menus-2.20.1/aclocal.m4	2007-10-26 20:33:46.000000000 +0200
 @@ -1,7 +1,7 @@
 -# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 +# generated automatically by aclocal 1.10 -*- Autoconf -*-
@@ -14186,9 +14186,9 @@
 +]) # _AM_PROG_TAR
  
  m4_include([acinclude.m4])
-diff -x'*config.guess' -x'*config.sub' -x'*config.h.in~' -Naur gnome-menus-2.20.1.old/config.h.in gnome-menus-2.20.1/config.h.in
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-menus-2.20.1.old/config.h.in gnome-menus-2.20.1/config.h.in
 --- gnome-menus-2.20.1.old/config.h.in	2007-10-15 21:53:19.000000000 +0200
-+++ gnome-menus-2.20.1/config.h.in	2007-10-26 20:18:35.000000000 +0200
++++ gnome-menus-2.20.1/config.h.in	2007-10-26 20:33:50.000000000 +0200
 @@ -15,15 +15,6 @@
  /* Define to 1 if you have the <dlfcn.h> header file. */
  #undef HAVE_DLFCN_H
@@ -14205,9 +14205,9 @@
  /* Define if the GNU gettext() function is already present or preinstalled. */
  #undef HAVE_GETTEXT
  
-diff -x'*config.guess' -x'*config.sub' -x'*config.h.in~' -Naur gnome-menus-2.20.1.old/configure gnome-menus-2.20.1/configure
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-menus-2.20.1.old/configure gnome-menus-2.20.1/configure
 --- gnome-menus-2.20.1.old/configure	2007-10-15 21:53:18.000000000 +0200
-+++ gnome-menus-2.20.1/configure	2007-10-26 20:18:34.000000000 +0200
++++ gnome-menus-2.20.1/configure	2007-10-26 20:33:50.000000000 +0200
 @@ -1,6 +1,6 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -21421,9 +21421,9 @@
        -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
  	< ${ac_aux_dir}/${file}.in > ${file}.out
    if cmp -s ${file} ${file}.out 2>/dev/null; then
-diff -x'*config.guess' -x'*config.sub' -x'*config.h.in~' -Naur gnome-menus-2.20.1.old/depcomp gnome-menus-2.20.1/depcomp
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-menus-2.20.1.old/depcomp gnome-menus-2.20.1/depcomp
 --- gnome-menus-2.20.1.old/depcomp	2007-10-15 21:53:27.000000000 +0200
-+++ gnome-menus-2.20.1/depcomp	2007-10-26 20:18:37.000000000 +0200
++++ gnome-menus-2.20.1/depcomp	2007-10-26 20:33:52.000000000 +0200
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects
@@ -21522,9 +21522,9 @@
        # in $dir$base.o.d.  We have to check for both files, because
        # one of the two compilations can be disabled.  We should prefer
        # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-diff -x'*config.guess' -x'*config.sub' -x'*config.h.in~' -Naur gnome-menus-2.20.1.old/desktop-directories/Makefile.in gnome-menus-2.20.1/desktop-directories/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-menus-2.20.1.old/desktop-directories/Makefile.in gnome-menus-2.20.1/desktop-directories/Makefile.in
 --- gnome-menus-2.20.1.old/desktop-directories/Makefile.in	2007-10-15 21:53:25.000000000 +0200
-+++ gnome-menus-2.20.1/desktop-directories/Makefile.in	2007-10-26 20:18:36.000000000 +0200
++++ gnome-menus-2.20.1/desktop-directories/Makefile.in	2007-10-26 20:33:51.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.
@@ -21784,9 +21784,9 @@
  
  
  @INTLTOOL_DIRECTORY_RULE@
-diff -x'*config.guess' -x'*config.sub' -x'*config.h.in~' -Naur gnome-menus-2.20.1.old/install-sh gnome-menus-2.20.1/install-sh
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-menus-2.20.1.old/install-sh gnome-menus-2.20.1/install-sh
 --- gnome-menus-2.20.1.old/install-sh	2007-10-15 21:53:24.000000000 +0200
-+++ gnome-menus-2.20.1/install-sh	2007-10-26 20:18:36.000000000 +0200
++++ gnome-menus-2.20.1/install-sh	2007-10-26 20:33:51.000000000 +0200
 @@ -1,7 +1,7 @@
  #!/bin/sh
  # install - install a program, script, or datafile
@@ -22256,9 +22256,9 @@
  
  # Local variables:
  # eval: (add-hook 'write-file-hooks 'time-stamp)
-diff -x'*config.guess' -x'*config.sub' -x'*config.h.in~' -Naur gnome-menus-2.20.1.old/intltool-extract.in gnome-menus-2.20.1/intltool-extract.in
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-menus-2.20.1.old/intltool-extract.in gnome-menus-2.20.1/intltool-extract.in
 --- gnome-menus-2.20.1.old/intltool-extract.in	2007-10-15 21:53:07.000000000 +0200
-+++ gnome-menus-2.20.1/intltool-extract.in	2007-10-26 20:18:24.000000000 +0200
++++ gnome-menus-2.20.1/intltool-extract.in	2007-10-26 20:33:40.000000000 +0200
 @@ -32,7 +32,7 @@
  ## Release information
  my $PROGRAM      = "intltool-extract";
@@ -22279,9 +22279,9 @@
  
      return $_;
  }
-diff -x'*config.guess' -x'*config.sub' -x'*config.h.in~' -Naur gnome-menus-2.20.1.old/intltool-merge.in gnome-menus-2.20.1/intltool-merge.in
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-menus-2.20.1.old/intltool-merge.in gnome-menus-2.20.1/intltool-merge.in
 --- gnome-menus-2.20.1.old/intltool-merge.in	2007-10-15 21:53:07.000000000 +0200
-+++ gnome-menus-2.20.1/intltool-merge.in	2007-10-26 20:18:24.000000000 +0200
++++ gnome-menus-2.20.1/intltool-merge.in	2007-10-26 20:33:40.000000000 +0200
 @@ -35,7 +35,7 @@
  ## Release information
  my $PROGRAM = "intltool-merge";
@@ -22381,9 +22381,9 @@
  
      return $_;
  }
-diff -x'*config.guess' -x'*config.sub' -x'*config.h.in~' -Naur gnome-menus-2.20.1.old/intltool-update.in gnome-menus-2.20.1/intltool-update.in
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-menus-2.20.1.old/intltool-update.in gnome-menus-2.20.1/intltool-update.in
 --- gnome-menus-2.20.1.old/intltool-update.in	2007-10-15 21:53:07.000000000 +0200
-+++ gnome-menus-2.20.1/intltool-update.in	2007-10-26 20:18:24.000000000 +0200
++++ gnome-menus-2.20.1/intltool-update.in	2007-10-26 20:33:40.000000000 +0200
 @@ -30,7 +30,7 @@
  
  ## Release information
@@ -22614,9 +22614,9 @@
  	} 
  	else 
  	{
-diff -x'*config.guess' -x'*config.sub' -x'*config.h.in~' -Naur gnome-menus-2.20.1.old/layout/Makefile.in gnome-menus-2.20.1/layout/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-menus-2.20.1.old/layout/Makefile.in gnome-menus-2.20.1/layout/Makefile.in
 --- gnome-menus-2.20.1.old/layout/Makefile.in	2007-10-15 21:53:25.000000000 +0200
-+++ gnome-menus-2.20.1/layout/Makefile.in	2007-10-26 20:18:36.000000000 +0200
++++ gnome-menus-2.20.1/layout/Makefile.in	2007-10-26 20:33:51.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.
@@ -22871,9 +22871,9 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*config.guess' -x'*config.sub' -x'*config.h.in~' -Naur gnome-menus-2.20.1.old/libmenu/Makefile.in gnome-menus-2.20.1/libmenu/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-menus-2.20.1.old/libmenu/Makefile.in gnome-menus-2.20.1/libmenu/Makefile.in
 --- gnome-menus-2.20.1.old/libmenu/Makefile.in	2007-10-15 21:53:25.000000000 +0200
-+++ gnome-menus-2.20.1/libmenu/Makefile.in	2007-10-26 20:18:36.000000000 +0200
++++ gnome-menus-2.20.1/libmenu/Makefile.in	2007-10-26 20:33:51.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.
@@ -22901,22 +22901,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) \
@@ -22942,7 +22939,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@
@@ -22951,7 +22948,7 @@
  AMTAR = @AMTAR@
  AR = @AR@
  AS = @AS@
-@@ -134,18 +134,16 @@
+@@ -134,18 +132,16 @@
  EGREP = @EGREP@
  EXEEXT = @EXEEXT@
  F77 = @F77@
@@ -22973,7 +22970,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@
@@ -22989,7 +22986,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@
@@ -22997,7 +22994,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@
@@ -23008,7 +23005,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@
@@ -23016,7 +23013,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@
@@ -23034,7 +23031,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@
@@ -23042,7 +23039,7 @@
  datadir = @datadir@
  datarootdir = @datarootdir@
  docdir = @docdir@
-@@ -270,22 +266,26 @@
+@@ -270,22 +264,26 @@
  pythondir = @pythondir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
@@ -23072,14 +23069,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)			\
@@ -23088,7 +23078,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)
@@ -23097,7 +23087,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)
@@ -23106,7 +23096,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) 
@@ -23115,7 +23105,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@
@@ -23124,7 +23114,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 $@ $<; \
@@ -23152,7 +23141,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
@@ -23167,7 +23156,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)
@@ -23176,7 +23165,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)
@@ -23212,7 +23201,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 \
@@ -23221,7 +23210,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 \
@@ -23230,7 +23219,7 @@
  
  dvi: dvi-am
  
-@@ -607,12 +605,20 @@
+@@ -607,12 +600,20 @@
  install-data-am: install-libgnome_menu_includeHEADERS \
  	install-pkgconfigDATA
  
@@ -23251,7 +23240,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -633,22 +639,25 @@
+@@ -633,22 +634,25 @@
  
  ps-am:
  
@@ -23283,7 +23272,7 @@
  	uninstall-libgnome_menu_includeHEADERS uninstall-pkgconfigDATA
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -x'*config.guess' -x'*config.sub' -x'*config.h.in~' -Naur gnome-menus-2.20.1.old/ltmain.sh gnome-menus-2.20.1/ltmain.sh
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-menus-2.20.1.old/ltmain.sh gnome-menus-2.20.1/ltmain.sh
 --- gnome-menus-2.20.1.old/ltmain.sh	2007-02-17 10:05:30.000000000 +0100
 +++ gnome-menus-2.20.1/ltmain.sh	2007-08-14 19:43:36.000000000 +0200
 @@ -1,8 +1,8 @@
@@ -23839,9 +23828,9 @@
  
  All other options (arguments beginning with \`-') are ignored.
  
-diff -x'*config.guess' -x'*config.sub' -x'*config.h.in~' -Naur gnome-menus-2.20.1.old/Makefile.in gnome-menus-2.20.1/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-menus-2.20.1.old/Makefile.in gnome-menus-2.20.1/Makefile.in
 --- gnome-menus-2.20.1.old/Makefile.in	2007-10-15 21:53:27.000000000 +0200
-+++ gnome-menus-2.20.1/Makefile.in	2007-10-26 20:18:37.000000000 +0200
++++ gnome-menus-2.20.1/Makefile.in	2007-10-26 20:33:52.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.
@@ -24186,9 +24175,9 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*config.guess' -x'*config.sub' -x'*config.h.in~' -Naur gnome-menus-2.20.1.old/missing gnome-menus-2.20.1/missing
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-menus-2.20.1.old/missing gnome-menus-2.20.1/missing
 --- gnome-menus-2.20.1.old/missing	2007-10-15 21:53:24.000000000 +0200
-+++ gnome-menus-2.20.1/missing	2007-10-26 20:18:36.000000000 +0200
++++ gnome-menus-2.20.1/missing	2007-10-26 20:33:51.000000000 +0200
 @@ -1,9 +1,9 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
@@ -24371,9 +24360,9 @@
  	*h*)
  	    firstarg=`echo "$firstarg" | sed s/h//`
  	    tar "$firstarg" "$@" && exit 0
-diff -x'*config.guess' -x'*config.sub' -x'*config.h.in~' -Naur gnome-menus-2.20.1.old/mkinstalldirs gnome-menus-2.20.1/mkinstalldirs
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-menus-2.20.1.old/mkinstalldirs gnome-menus-2.20.1/mkinstalldirs
 --- gnome-menus-2.20.1.old/mkinstalldirs	2007-10-15 21:53:27.000000000 +0200
-+++ gnome-menus-2.20.1/mkinstalldirs	2007-10-26 20:18:37.000000000 +0200
++++ gnome-menus-2.20.1/mkinstalldirs	2007-10-26 20:33:52.000000000 +0200
 @@ -1,7 +1,7 @@
  #! /bin/sh
  # mkinstalldirs --- make directory hierarchy
@@ -24393,9 +24382,9 @@
  errstatus=0
  dirmode=
  
-diff -x'*config.guess' -x'*config.sub' -x'*config.h.in~' -Naur gnome-menus-2.20.1.old/po/Makefile.in.in gnome-menus-2.20.1/po/Makefile.in.in
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-menus-2.20.1.old/po/Makefile.in.in gnome-menus-2.20.1/po/Makefile.in.in
 --- gnome-menus-2.20.1.old/po/Makefile.in.in	2007-10-15 21:53:07.000000000 +0200
-+++ gnome-menus-2.20.1/po/Makefile.in.in	2007-10-26 20:18:24.000000000 +0200
++++ gnome-menus-2.20.1/po/Makefile.in.in	2007-10-26 20:33:40.000000000 +0200
 @@ -133,7 +133,7 @@
  dvi info tags TAGS ID:
  
@@ -24405,9 +24394,9 @@
  
  uninstall:
  	linguas="$(USE_LINGUAS)"; \
-diff -x'*config.guess' -x'*config.sub' -x'*config.h.in~' -Naur gnome-menus-2.20.1.old/python/Makefile.in gnome-menus-2.20.1/python/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-menus-2.20.1.old/python/Makefile.in gnome-menus-2.20.1/python/Makefile.in
 --- gnome-menus-2.20.1.old/python/Makefile.in	2007-10-15 21:53:26.000000000 +0200
-+++ gnome-menus-2.20.1/python/Makefile.in	2007-10-26 20:18:36.000000000 +0200
++++ gnome-menus-2.20.1/python/Makefile.in	2007-10-26 20:33:51.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.
@@ -24748,9 +24737,9 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*config.guess' -x'*config.sub' -x'*config.h.in~' -Naur gnome-menus-2.20.1.old/simple-editor/GMenuSimpleEditor/Makefile.in gnome-menus-2.20.1/simple-editor/GMenuSimpleEditor/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-menus-2.20.1.old/simple-editor/GMenuSimpleEditor/Makefile.in gnome-menus-2.20.1/simple-editor/GMenuSimpleEditor/Makefile.in
 --- gnome-menus-2.20.1.old/simple-editor/GMenuSimpleEditor/Makefile.in	2007-10-15 21:53:26.000000000 +0200
-+++ gnome-menus-2.20.1/simple-editor/GMenuSimpleEditor/Makefile.in	2007-10-26 20:18:37.000000000 +0200
++++ gnome-menus-2.20.1/simple-editor/GMenuSimpleEditor/Makefile.in	2007-10-26 20:33:52.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.
@@ -25018,9 +25007,9 @@
  
  
  all-local: config.py
-diff -x'*config.guess' -x'*config.sub' -x'*config.h.in~' -Naur gnome-menus-2.20.1.old/simple-editor/Makefile.in gnome-menus-2.20.1/simple-editor/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-menus-2.20.1.old/simple-editor/Makefile.in gnome-menus-2.20.1/simple-editor/Makefile.in
 --- gnome-menus-2.20.1.old/simple-editor/Makefile.in	2007-10-15 21:53:26.000000000 +0200
-+++ gnome-menus-2.20.1/simple-editor/Makefile.in	2007-10-26 20:18:37.000000000 +0200
++++ gnome-menus-2.20.1/simple-editor/Makefile.in	2007-10-26 20:33:52.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.
@@ -25362,9 +25351,9 @@
  
  
  gmenu-simple-editor: gmenu-simple-editor.in
-diff -x'*config.guess' -x'*config.sub' -x'*config.h.in~' -Naur gnome-menus-2.20.1.old/util/Makefile.in gnome-menus-2.20.1/util/Makefile.in
+diff -x'*config.sub' -x'*config.guess' -Naur gnome-menus-2.20.1.old/util/Makefile.in gnome-menus-2.20.1/util/Makefile.in
 --- gnome-menus-2.20.1.old/util/Makefile.in	2007-10-15 21:53:27.000000000 +0200
-+++ gnome-menus-2.20.1/util/Makefile.in	2007-10-26 20:18:37.000000000 +0200
++++ gnome-menus-2.20.1/util/Makefile.in	2007-10-26 20:33:52.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