r15983 - in /desktop/unstable/gnome-session/debian: changelog patches/01_ignore-gdm-lang.patch patches/02_gsd-spawn.patch patches/09_splash_hide.patch patches/90_autoconf-autoheader.patch

samm-guest at users.alioth.debian.org samm-guest at users.alioth.debian.org
Fri May 16 18:54:17 UTC 2008


Author: samm-guest
Date: Fri May 16 18:54:17 2008
New Revision: 15983

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15983
Log:
* New upstream release.
* Refresh 01_ignore-gdm-lang.patch, 02_gsd-spawn.patch, 09_splash_hide.patch
  and 90_autoconf-autoheader.patch.

Modified:
    desktop/unstable/gnome-session/debian/changelog
    desktop/unstable/gnome-session/debian/patches/01_ignore-gdm-lang.patch
    desktop/unstable/gnome-session/debian/patches/02_gsd-spawn.patch
    desktop/unstable/gnome-session/debian/patches/09_splash_hide.patch
    desktop/unstable/gnome-session/debian/patches/90_autoconf-autoheader.patch

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=15983&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog (original)
+++ desktop/unstable/gnome-session/debian/changelog Fri May 16 18:54:17 2008
@@ -1,8 +1,14 @@
-gnome-session (2.22.0-3) UNRELEASED; urgency=low
-
+gnome-session (2.22.1-1) UNRELEASED; urgency=low
+
+  [ Josselin Mouette ]
   * Drop dependency on gnome-power-manager. Closes: #472202.
 
- -- Josselin Mouette <joss at debian.org>  Sun, 23 Mar 2008 11:38:52 +0100
+  [ Sam Morris ]
+  * New upstream release.
+  * Refresh 01_ignore-gdm-lang.patch, 02_gsd-spawn.patch, 09_splash_hide.patch
+    and 90_autoconf-autoheader.patch.
+
+ -- Sam Morris <sam at robots.org.uk>  Wed, 07 May 2008 00:54:14 +0100
 
 gnome-session (2.22.0-2) unstable; urgency=low
 

Modified: desktop/unstable/gnome-session/debian/patches/01_ignore-gdm-lang.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/01_ignore-gdm-lang.patch?rev=15983&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/01_ignore-gdm-lang.patch (original)
+++ desktop/unstable/gnome-session/debian/patches/01_ignore-gdm-lang.patch Fri May 16 18:54:17 2008
@@ -1,11 +1,11 @@
 Debian #445646.
 Ignore GDM_LANG, which looks like some useless antiquity inherited from 
 an old Redhat version, and only serves the purpose of breaking locales.
-Index: gnome-session-2.20.1/gnome-session/main.c
+Index: gnome-session-2.22.1/gnome-session/main.c
 ===================================================================
---- gnome-session-2.20.1.orig/gnome-session/main.c	2007-10-15 21:49:11.000000000 +0200
-+++ gnome-session-2.20.1/gnome-session/main.c	2007-11-03 01:50:34.236117378 +0100
-@@ -111,32 +111,6 @@ ignore (int sig)
+--- gnome-session-2.22.1.orig/gnome-session/main.c	2008-04-07 23:45:55.000000000 +0100
++++ gnome-session-2.22.1/gnome-session/main.c	2008-05-07 00:29:14.000000000 +0100
+@@ -111,32 +111,6 @@
    sigaction (sig, &act, NULL);
  }
  
@@ -38,7 +38,7 @@
  /* Point GTK_RC_FILES at a separate file that we change in
   * in gnome-settings-daemon.
   */
-@@ -632,7 +606,6 @@ main (int argc, char *argv[])
+@@ -633,7 +607,6 @@
      }
    g_strfreev (versions);
        

Modified: desktop/unstable/gnome-session/debian/patches/02_gsd-spawn.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/02_gsd-spawn.patch?rev=15983&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/02_gsd-spawn.patch (original)
+++ desktop/unstable/gnome-session/debian/patches/02_gsd-spawn.patch Fri May 16 18:54:17 2008
@@ -10,11 +10,11 @@
 The better long term solution might be in the gnome-session dbus rewrite, which
 might mean apps are started by gnome-session, but this hasn't been confirmed.
 
-Index: gnome-session-2.20.3/configure.in
+Index: gnome-session-2.22.1/configure.in
 ===================================================================
---- gnome-session-2.20.3.orig/configure.in	2008-01-07 23:27:27.000000000 +0100
-+++ gnome-session-2.20.3/configure.in	2008-02-18 20:13:07.496883704 +0100
-@@ -427,6 +427,20 @@ AC_ARG_WITH(rsh-command,
+--- gnome-session-2.22.1.orig/configure.in	2008-04-07 23:45:59.000000000 +0100
++++ gnome-session-2.22.1/configure.in	2008-05-07 00:29:18.000000000 +0100
+@@ -393,6 +393,20 @@
  ])
  AC_SUBST(RSH_COMMAND)
  
@@ -35,11 +35,11 @@
  
  GNOME_SESSION_TARBALL=`date +%e`
  AC_DEFINE_UNQUOTED(GNOME_SESSION_TARBALL_DAY, $GNOME_SESSION_TARBALL,
-Index: gnome-session-2.20.3/gnome-session/gsm-gsd.c
+Index: gnome-session-2.22.1/gnome-session/gsm-gsd.c
 ===================================================================
---- gnome-session-2.20.3.orig/gnome-session/gsm-gsd.c	2008-01-07 23:27:23.000000000 +0100
-+++ gnome-session-2.20.3/gnome-session/gsm-gsd.c	2008-02-18 20:16:35.752884029 +0100
-@@ -9,11 +9,13 @@
+--- gnome-session-2.22.1.orig/gnome-session/gsm-gsd.c	2008-04-07 23:45:55.000000000 +0100
++++ gnome-session-2.22.1/gnome-session/gsm-gsd.c	2008-05-07 00:29:18.000000000 +0100
+@@ -11,11 +11,13 @@
  #include <dbus/dbus-glib-lowlevel.h>
  
  #include <gtk/gtkmessagedialog.h>
@@ -54,7 +54,7 @@
    gboolean     activating;
    time_t       start_time;
    guint        attempts;
-@@ -78,6 +80,8 @@ gsd_error_dialog (GnomeSettingsData *gsd
+@@ -80,6 +82,8 @@
    gtk_widget_show (dialog);
  }
  
@@ -63,7 +63,7 @@
  static void
  name_owner_changed (DBusGProxy *proxy,
                      const char *name,
-@@ -100,7 +104,7 @@ name_owner_changed (DBusGProxy *proxy,
+@@ -102,7 +106,7 @@
  
                gsd->dbus_proxy = NULL;
  
@@ -72,8 +72,8 @@
              }
  	}
        else
-@@ -111,15 +115,29 @@ name_owner_changed (DBusGProxy *proxy,
-     }
+@@ -128,15 +132,29 @@
+ 				 G_CALLBACK(plugin_activated), gsd);
  }
  
 -void

Modified: desktop/unstable/gnome-session/debian/patches/09_splash_hide.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/09_splash_hide.patch?rev=15983&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/09_splash_hide.patch (original)
+++ desktop/unstable/gnome-session/debian/patches/09_splash_hide.patch Fri May 16 18:54:17 2008
@@ -1,5 +1,7 @@
---- gnome-session-2.20.2.orig/gnome-session/manager.c	2007-11-27 01:03:13.000000000 +0100
-+++ gnome-session-2.20.2/gnome-session/manager.c	2007-11-27 13:28:17.000000000 +0100
+Index: gnome-session-2.22.1/gnome-session/manager.c
+===================================================================
+--- gnome-session-2.22.1.orig/gnome-session/manager.c	2008-04-07 23:45:55.000000000 +0100
++++ gnome-session-2.22.1/gnome-session/manager.c	2008-05-07 00:29:26.000000000 +0100
 @@ -1368,6 +1368,7 @@
  	      start_client (client);
  	    }
@@ -8,9 +10,11 @@
  	    goto out;
  	}
        save_state = MANAGER_IDLE;
---- gnome-session-2.20.2.orig/gnome-session/splash-widget.c	2007-11-27 01:03:13.000000000 +0100
-+++ gnome-session-2.20.2/gnome-session/splash-widget.c	2007-11-27 13:28:17.000000000 +0100
-@@ -717,3 +717,10 @@
+Index: gnome-session-2.22.1/gnome-session/splash-widget.c
+===================================================================
+--- gnome-session-2.22.1.orig/gnome-session/splash-widget.c	2008-04-07 23:45:55.000000000 +0100
++++ gnome-session-2.22.1/gnome-session/splash-widget.c	2008-05-07 00:29:26.000000000 +0100
+@@ -728,3 +728,10 @@
  	}
  }
  
@@ -21,8 +25,10 @@
 +	gtk_widget_hide (GTK_WIDGET (global_splash));
 +	}
 +}
---- gnome-session-2.20.2.orig/gnome-session/splash-widget.h	2007-11-27 01:03:13.000000000 +0100
-+++ gnome-session-2.20.2/gnome-session/splash-widget.h	2007-11-27 13:28:17.000000000 +0100
+Index: gnome-session-2.22.1/gnome-session/splash-widget.h
+===================================================================
+--- gnome-session-2.22.1.orig/gnome-session/splash-widget.h	2008-04-07 23:45:55.000000000 +0100
++++ gnome-session-2.22.1/gnome-session/splash-widget.h	2008-05-07 00:29:26.000000000 +0100
 @@ -80,5 +80,6 @@
  void splash_start  (void);
  void splash_update (const gchar *text);

Modified: desktop/unstable/gnome-session/debian/patches/90_autoconf-autoheader.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/90_autoconf-autoheader.patch?rev=15983&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/90_autoconf-autoheader.patch (original)
+++ desktop/unstable/gnome-session/debian/patches/90_autoconf-autoheader.patch Fri May 16 18:54:17 2008
@@ -1,6 +1,7 @@
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-session-2.22.0.old/aclocal.m4 gnome-session-2.22.0/aclocal.m4
---- gnome-session-2.22.0.old/aclocal.m4	2008-03-10 22:01:39.000000000 +0100
-+++ gnome-session-2.22.0/aclocal.m4	2008-03-16 20:26:07.000000000 +0100
+Index: gnome-session-2.22.1/aclocal.m4
+===================================================================
+--- gnome-session-2.22.1.orig/aclocal.m4	2008-04-07 23:49:00.000000000 +0100
++++ gnome-session-2.22.1/aclocal.m4	2008-05-07 00:29:34.000000000 +0100
 @@ -1,7 +1,7 @@
 -# generated automatically by aclocal 1.10 -*- Autoconf -*-
 +# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -14880,9 +14881,10 @@
 +AC_SUBST([am__untar])
 +]) # _AM_PROG_TAR
  
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-session-2.22.0.old/config.h.in gnome-session-2.22.0/config.h.in
---- gnome-session-2.22.0.old/config.h.in	2008-03-10 22:01:42.000000000 +0100
-+++ gnome-session-2.22.0/config.h.in	2008-03-16 20:26:12.000000000 +0100
+Index: gnome-session-2.22.1/config.h.in
+===================================================================
+--- gnome-session-2.22.1.orig/config.h.in	2008-04-07 23:49:04.000000000 +0100
++++ gnome-session-2.22.1/config.h.in	2008-05-07 00:29:34.000000000 +0100
 @@ -105,6 +105,9 @@
  /* Define to the version of this package. */
  #undef PACKAGE_VERSION
@@ -14893,9 +14895,10 @@
  /* Define to 1 if you have the ANSI C header files. */
  #undef STDC_HEADERS
  
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-session-2.22.0.old/configure gnome-session-2.22.0/configure
---- gnome-session-2.22.0.old/configure	2008-03-10 22:01:42.000000000 +0100
-+++ gnome-session-2.22.0/configure	2008-03-16 20:26:11.000000000 +0100
+Index: gnome-session-2.22.1/configure
+===================================================================
+--- gnome-session-2.22.1.orig/configure	2008-04-07 23:49:03.000000000 +0100
++++ gnome-session-2.22.1/configure	2008-05-07 00:29:34.000000000 +0100
 @@ -887,10 +887,13 @@
  host_cpu
  host_vendor
@@ -18918,9 +18921,10 @@
      dirpart=`$as_dirname -- "$mf" ||
  $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  	 X"$mf" : 'X\(//\)[^/]' \| \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-session-2.22.0.old/data/icons/16x16/Makefile.in gnome-session-2.22.0/data/icons/16x16/Makefile.in
---- gnome-session-2.22.0.old/data/icons/16x16/Makefile.in	2008-03-10 22:01:43.000000000 +0100
-+++ gnome-session-2.22.0/data/icons/16x16/Makefile.in	2008-03-16 20:26:13.000000000 +0100
+Index: gnome-session-2.22.1/data/icons/16x16/Makefile.in
+===================================================================
+--- gnome-session-2.22.1.orig/data/icons/16x16/Makefile.in	2008-04-07 23:49:05.000000000 +0100
++++ gnome-session-2.22.1/data/icons/16x16/Makefile.in	2008-05-07 00:29:34.000000000 +0100
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18956,9 +18960,10 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-session-2.22.0.old/data/icons/22x22/Makefile.in gnome-session-2.22.0/data/icons/22x22/Makefile.in
---- gnome-session-2.22.0.old/data/icons/22x22/Makefile.in	2008-03-10 22:01:43.000000000 +0100
-+++ gnome-session-2.22.0/data/icons/22x22/Makefile.in	2008-03-16 20:26:14.000000000 +0100
+Index: gnome-session-2.22.1/data/icons/22x22/Makefile.in
+===================================================================
+--- gnome-session-2.22.1.orig/data/icons/22x22/Makefile.in	2008-04-07 23:49:05.000000000 +0100
++++ gnome-session-2.22.1/data/icons/22x22/Makefile.in	2008-05-07 00:29:34.000000000 +0100
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18994,9 +18999,10 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-session-2.22.0.old/data/icons/24x24/Makefile.in gnome-session-2.22.0/data/icons/24x24/Makefile.in
---- gnome-session-2.22.0.old/data/icons/24x24/Makefile.in	2008-03-10 22:01:44.000000000 +0100
-+++ gnome-session-2.22.0/data/icons/24x24/Makefile.in	2008-03-16 20:26:14.000000000 +0100
+Index: gnome-session-2.22.1/data/icons/24x24/Makefile.in
+===================================================================
+--- gnome-session-2.22.1.orig/data/icons/24x24/Makefile.in	2008-04-07 23:49:05.000000000 +0100
++++ gnome-session-2.22.1/data/icons/24x24/Makefile.in	2008-05-07 00:29:34.000000000 +0100
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19032,9 +19038,10 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-session-2.22.0.old/data/icons/32x32/Makefile.in gnome-session-2.22.0/data/icons/32x32/Makefile.in
---- gnome-session-2.22.0.old/data/icons/32x32/Makefile.in	2008-03-10 22:01:44.000000000 +0100
-+++ gnome-session-2.22.0/data/icons/32x32/Makefile.in	2008-03-16 20:26:14.000000000 +0100
+Index: gnome-session-2.22.1/data/icons/32x32/Makefile.in
+===================================================================
+--- gnome-session-2.22.1.orig/data/icons/32x32/Makefile.in	2008-04-07 23:49:05.000000000 +0100
++++ gnome-session-2.22.1/data/icons/32x32/Makefile.in	2008-05-07 00:29:34.000000000 +0100
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19070,9 +19077,10 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-session-2.22.0.old/data/icons/Makefile.in gnome-session-2.22.0/data/icons/Makefile.in
---- gnome-session-2.22.0.old/data/icons/Makefile.in	2008-03-10 22:01:44.000000000 +0100
-+++ gnome-session-2.22.0/data/icons/Makefile.in	2008-03-16 20:26:14.000000000 +0100
+Index: gnome-session-2.22.1/data/icons/Makefile.in
+===================================================================
+--- gnome-session-2.22.1.orig/data/icons/Makefile.in	2008-04-07 23:49:05.000000000 +0100
++++ gnome-session-2.22.1/data/icons/Makefile.in	2008-05-07 00:29:34.000000000 +0100
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19146,9 +19154,10 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-session-2.22.0.old/data/icons/scalable/Makefile.in gnome-session-2.22.0/data/icons/scalable/Makefile.in
---- gnome-session-2.22.0.old/data/icons/scalable/Makefile.in	2008-03-10 22:01:44.000000000 +0100
-+++ gnome-session-2.22.0/data/icons/scalable/Makefile.in	2008-03-16 20:26:14.000000000 +0100
+Index: gnome-session-2.22.1/data/icons/scalable/Makefile.in
+===================================================================
+--- gnome-session-2.22.1.orig/data/icons/scalable/Makefile.in	2008-04-07 23:49:05.000000000 +0100
++++ gnome-session-2.22.1/data/icons/scalable/Makefile.in	2008-05-07 00:29:34.000000000 +0100
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19184,9 +19193,10 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-session-2.22.0.old/data/Makefile.in gnome-session-2.22.0/data/Makefile.in
---- gnome-session-2.22.0.old/data/Makefile.in	2008-03-10 22:01:43.000000000 +0100
-+++ gnome-session-2.22.0/data/Makefile.in	2008-03-16 20:26:13.000000000 +0100
+Index: gnome-session-2.22.1/data/Makefile.in
+===================================================================
+--- gnome-session-2.22.1.orig/data/Makefile.in	2008-04-07 23:49:05.000000000 +0100
++++ gnome-session-2.22.1/data/Makefile.in	2008-05-07 00:29:34.000000000 +0100
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19260,9 +19270,10 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-session-2.22.0.old/depcomp gnome-session-2.22.0/depcomp
---- gnome-session-2.22.0.old/depcomp	2008-03-10 22:01:44.000000000 +0100
-+++ gnome-session-2.22.0/depcomp	2008-03-16 20:26:14.000000000 +0100
+Index: gnome-session-2.22.1/depcomp
+===================================================================
+--- gnome-session-2.22.1.orig/depcomp	2008-04-07 23:49:05.000000000 +0100
++++ gnome-session-2.22.1/depcomp	2008-05-07 00:29:34.000000000 +0100
 @@ -1,9 +1,9 @@
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects
@@ -19327,9 +19338,10 @@
    else
      # The sourcefile does not contain any dependencies, so just
      # store a dummy comment line, to avoid errors with the Makefile
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-session-2.22.0.old/gnome-session/Makefile.in gnome-session-2.22.0/gnome-session/Makefile.in
---- gnome-session-2.22.0.old/gnome-session/Makefile.in	2008-03-10 22:01:44.000000000 +0100
-+++ gnome-session-2.22.0/gnome-session/Makefile.in	2008-03-16 20:26:15.000000000 +0100
+Index: gnome-session-2.22.1/gnome-session/Makefile.in
+===================================================================
+--- gnome-session-2.22.1.orig/gnome-session/Makefile.in	2008-04-07 23:49:05.000000000 +0100
++++ gnome-session-2.22.1/gnome-session/Makefile.in	2008-05-07 00:29:34.000000000 +0100
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19374,7 +19386,7 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-@@ -478,8 +481,8 @@
+@@ -480,8 +483,8 @@
  	     || test -f $$p1 \
  	  ; then \
  	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -19385,7 +19397,7 @@
  	  else :; fi; \
  	done
  
-@@ -614,8 +617,8 @@
+@@ -617,8 +620,8 @@
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -19396,7 +19408,7 @@
  	mkid -fID $$unique
  tags: TAGS
  
-@@ -627,8 +630,8 @@
+@@ -630,8 +633,8 @@
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -19407,7 +19419,7 @@
  	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
  	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -638,13 +641,12 @@
+@@ -641,13 +644,12 @@
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
  	tags=; \
@@ -19423,9 +19435,10 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-session-2.22.0.old/install-sh gnome-session-2.22.0/install-sh
---- gnome-session-2.22.0.old/install-sh	2008-03-10 22:01:43.000000000 +0100
-+++ gnome-session-2.22.0/install-sh	2008-03-16 20:26:13.000000000 +0100
+Index: gnome-session-2.22.1/install-sh
+===================================================================
+--- gnome-session-2.22.1.orig/install-sh	2008-04-07 23:49:04.000000000 +0100
++++ gnome-session-2.22.1/install-sh	2008-05-07 00:29:34.000000000 +0100
 @@ -1,7 +1,7 @@
  #!/bin/sh
  # install - install a program, script, or datafile
@@ -19788,9 +19801,10 @@
  
      trap '' 0
    fi
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-session-2.22.0.old/intltool-extract.in gnome-session-2.22.0/intltool-extract.in
---- gnome-session-2.22.0.old/intltool-extract.in	2008-03-10 22:01:34.000000000 +0100
-+++ gnome-session-2.22.0/intltool-extract.in	2008-03-16 20:26:01.000000000 +0100
+Index: gnome-session-2.22.1/intltool-extract.in
+===================================================================
+--- gnome-session-2.22.1.orig/intltool-extract.in	2008-04-07 23:48:56.000000000 +0100
++++ gnome-session-2.22.1/intltool-extract.in	2008-05-07 00:29:34.000000000 +0100
 @@ -32,7 +32,7 @@
  ## Release information
  my $PROGRAM      = "intltool-extract";
@@ -19809,9 +19823,10 @@
  	$messages{entity_decode($3)} = [] unless $3 =~ /^(window|label)[0-9]+$/;
          if (defined($2) and !($3 =~ /^(window|label)[0-9]+$/)) {
  	   $comments{entity_decode($3)} = entity_decode($2) ;
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-session-2.22.0.old/intltool-merge.in gnome-session-2.22.0/intltool-merge.in
---- gnome-session-2.22.0.old/intltool-merge.in	2008-03-10 22:01:34.000000000 +0100
-+++ gnome-session-2.22.0/intltool-merge.in	2008-03-16 20:26:01.000000000 +0100
+Index: gnome-session-2.22.1/intltool-merge.in
+===================================================================
+--- gnome-session-2.22.1.orig/intltool-merge.in	2008-04-07 23:48:56.000000000 +0100
++++ gnome-session-2.22.1/intltool-merge.in	2008-05-07 00:29:34.000000000 +0100
 @@ -35,7 +35,7 @@
  ## Release information
  my $PROGRAM = "intltool-merge";
@@ -19821,9 +19836,10 @@
  
  ## Loaded modules
  use strict; 
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-session-2.22.0.old/intltool-update.in gnome-session-2.22.0/intltool-update.in
---- gnome-session-2.22.0.old/intltool-update.in	2008-03-10 22:01:34.000000000 +0100
-+++ gnome-session-2.22.0/intltool-update.in	2008-03-16 20:26:01.000000000 +0100
+Index: gnome-session-2.22.1/intltool-update.in
+===================================================================
+--- gnome-session-2.22.1.orig/intltool-update.in	2008-04-07 23:48:56.000000000 +0100
++++ gnome-session-2.22.1/intltool-update.in	2008-05-07 00:29:34.000000000 +0100
 @@ -30,7 +30,7 @@
  
  ## Release information
@@ -19845,9 +19861,10 @@
  
  if ($POT_ARG)
  {
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-session-2.22.0.old/ltmain.sh gnome-session-2.22.0/ltmain.sh
---- gnome-session-2.22.0.old/ltmain.sh	2008-03-05 16:01:59.000000000 +0100
-+++ gnome-session-2.22.0/ltmain.sh	2008-02-02 14:28:24.000000000 +0100
+Index: gnome-session-2.22.1/ltmain.sh
+===================================================================
+--- gnome-session-2.22.1.orig/ltmain.sh	2008-03-05 15:01:59.000000000 +0000
++++ gnome-session-2.22.1/ltmain.sh	2008-05-07 00:29:34.000000000 +0100
 @@ -1,8 +1,8 @@
  # ltmain.sh - Provide generalized library-building support services.
  # NOTE: Changing this file will not affect anything until you rerun configure.
@@ -20505,9 +20522,10 @@
  
  All other options (arguments beginning with \`-') are ignored.
  
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-session-2.22.0.old/Makefile.in gnome-session-2.22.0/Makefile.in
---- gnome-session-2.22.0.old/Makefile.in	2008-03-10 22:01:44.000000000 +0100
-+++ gnome-session-2.22.0/Makefile.in	2008-03-16 20:26:15.000000000 +0100
+Index: gnome-session-2.22.1/Makefile.in
+===================================================================
+--- gnome-session-2.22.1.orig/Makefile.in	2008-04-07 23:49:06.000000000 +0100
++++ gnome-session-2.22.1/Makefile.in	2008-05-07 00:29:34.000000000 +0100
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20612,9 +20630,10 @@
  	distclean-tags distcleancheck distdir distuninstallcheck dvi \
  	dvi-am html html-am info info-am install install-am \
  	install-data install-data-am install-dvi install-dvi-am \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-session-2.22.0.old/man/Makefile.in gnome-session-2.22.0/man/Makefile.in
---- gnome-session-2.22.0.old/man/Makefile.in	2008-03-10 22:01:44.000000000 +0100
-+++ gnome-session-2.22.0/man/Makefile.in	2008-03-16 20:26:15.000000000 +0100
+Index: gnome-session-2.22.1/man/Makefile.in
+===================================================================
+--- gnome-session-2.22.1.orig/man/Makefile.in	2008-04-07 23:49:05.000000000 +0100
++++ gnome-session-2.22.1/man/Makefile.in	2008-05-07 00:29:34.000000000 +0100
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.




More information about the pkg-gnome-commits mailing list