r38498 - in /desktop/experimental/gnome-panel/debian: ./ patches/

jbicha-guest at users.alioth.debian.org jbicha-guest at users.alioth.debian.org
Sun Jun 9 01:40:15 UTC 2013 

Author: jbicha-guest
Date: Sun Jun  9 01:40:15 2013
New Revision: 38498

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=38498
Log:
* New upstream release
* 00-Add-the-GNOME-Flashback-session.patch:
  - Backport patch to add session files for GNOME Flashback
* Dropped patches applied in new version
  - 15_avoid_applet_loading_failures.patch
  - 16_remove_online_accounts_from_user_menu.patch
  - 17_avoid_double_forking.patch
  - 19_dconf_api_changes.patch

Added:
    desktop/experimental/gnome-panel/debian/patches/00-Add-the-GNOME-Flashback-session.patch
Removed:
    desktop/experimental/gnome-panel/debian/patches/03_fallback_desktop_makefile.patch
    desktop/experimental/gnome-panel/debian/patches/15_avoid_applet_loading_failures.patch
    desktop/experimental/gnome-panel/debian/patches/16_remove_online_accounts_from_user_menu.patch
    desktop/experimental/gnome-panel/debian/patches/17_avoid_double_forking.patch
    desktop/experimental/gnome-panel/debian/patches/19_dconf_api_changes.patch
Modified:
    desktop/experimental/gnome-panel/debian/changelog
    desktop/experimental/gnome-panel/debian/patches/01_gnome-wm.patch
    desktop/experimental/gnome-panel/debian/patches/02_fallback_desktop.patch
    desktop/experimental/gnome-panel/debian/patches/14_revert_timedate_change.patch
    desktop/experimental/gnome-panel/debian/patches/series
    desktop/experimental/gnome-panel/debian/watch

Modified: desktop/experimental/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/changelog?rev=38498&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/changelog [utf-8] Sun Jun  9 01:40:15 2013
@@ -1,13 +1,20 @@
-gnome-panel (3.4.2.1-6) UNRELEASED; urgency=low
-
+gnome-panel (3.6.2-1) UNRELEASED; urgency=low
+
+  * New upstream release
   * Moved gnome-session-fallback from gnome-session:
     - debian/control.in
     - debian/gnome-session-fallback.*
     - debian/gnome-wm.desktop
     - debian/patches/01_gnome-wm.patch
     - debian/patches/02_fallback_desktop.patch
-    - debian/patches/50_ubuntu_sessions.patch
     - debian/scripts/
+  * 00-Add-the-GNOME-Flashback-session.patch:
+    - Backport patch to add session files for GNOME Flashback
+  * Dropped patches applied in new version
+    - 15_avoid_applet_loading_failures.patch
+    - 16_remove_online_accounts_from_user_menu.patch
+    - 17_avoid_double_forking.patch
+    - 19_dconf_api_changes.patch
 
  -- Jeremy Bicha <jbicha at ubuntu.com>  Sat, 08 Jun 2013 21:11:02 -0400
 

Added: desktop/experimental/gnome-panel/debian/patches/00-Add-the-GNOME-Flashback-session.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/00-Add-the-GNOME-Flashback-session.patch?rev=38498&op=file
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/00-Add-the-GNOME-Flashback-session.patch (added)
+++ desktop/experimental/gnome-panel/debian/patches/00-Add-the-GNOME-Flashback-session.patch [utf-8] Sun Jun  9 01:40:15 2013
@@ -1,0 +1,85 @@
+From fcc9e21a70d390c3824559132a83a61461bcb88a Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha at ubuntu.com>
+Date: Sun, 24 Feb 2013 22:22:29 +0000
+Subject: Add the GNOME Flashback session
+
+This was removed from gnome-session 3.7.4 so let's it add it back here
+(under new name)
+
+https://bugzilla.gnome.org/show_bug.cgi?id=694625
+---
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 83f82e2..84e1954 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -30,17 +30,33 @@ gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
+ 
+ @GSETTINGS_RULES@
+ 
++sessiondir = $(datadir)/gnome-session/sessions
++session_in_files = gnome-flashback.session.desktop.in
++session_DATA = $(session_in_files:.session.desktop.in=.session)
++
++xsessiondir = $(datadir)/xsessions
++xsession_in_files = gnome-flashback.desktop.in
++xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
++
++%.session: %.session.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
++
++ at INTLTOOL_DESKTOP_RULE@
++
+ default_layoutdir   = $(datadir)/gnome-panel
+ default_layout_DATA = panel-default-layout.layout
+ 
+ EXTRA_DIST =				\
+ 	$(gsettings_schemas_in_in)	\
++	$(session_in_files)		\
++	$(xsession_in_files)		\
+ 	$(default_layout_DATA)
+ 
+ CLEANFILES =			\
+ 	$(gsettings__enum_file)	\
+ 	$(gsettings_SCHEMAS_in)	\
+ 	$(gsettings_SCHEMAS)	\
+-	*.gschema.valid
++	*.gschema.valid		\
++	$(session_DATA)		\
++	$(xsession_DATA)
+ 
+ -include $(top_srcdir)/git.mk
+diff --git a/data/gnome-flashback.desktop.in b/data/gnome-flashback.desktop.in
+new file mode 100644
+index 0000000..4856f75
+--- /dev/null
++++ b/data/gnome-flashback.desktop.in
+@@ -0,0 +1,7 @@
++[Desktop Entry]
++_Name=GNOME Flashback
++_Comment=This session logs you into GNOME with the traditional panel
++Exec=gnome-session --session=gnome-flashback
++TryExec=gnome-session
++Icon=
++Type=Application
+diff --git a/data/gnome-flashback.session.desktop.in b/data/gnome-flashback.session.desktop.in
+new file mode 100644
+index 0000000..c012c58
+--- /dev/null
++++ b/data/gnome-flashback.session.desktop.in
+@@ -0,0 +1,3 @@
++[GNOME Session]
++_Name=GNOME Flashback
++RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;nautilus-classic;
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index bc65c4c..a6aa6c7 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -23,6 +23,8 @@ applets/wncklet/window-menu.c
+ applets/wncklet/wncklet.c
+ applets/wncklet/workspace-switcher.c
+ [type: gettext/glade]applets/wncklet/workspace-switcher.ui
++data/gnome-flashback.desktop.in
++data/gnome-flashback.session.desktop.in
+ data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in
+ data/org.gnome.gnome-panel.applet.fish.gschema.xml.in.in
+ data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in
+

Modified: desktop/experimental/gnome-panel/debian/patches/01_gnome-wm.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/01_gnome-wm.patch?rev=38498&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/01_gnome-wm.patch [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/patches/01_gnome-wm.patch [utf-8] Sun Jun  9 01:40:15 2013
@@ -1,11 +1,9 @@
-Index: gnome-session-3.0.0/data/gnome-fallback.session.desktop.in.in
+Index: gnome-panel-3.6.2/data/gnome-fallback.session.desktop.in
 ===================================================================
---- gnome-session-3.0.0.orig/data/gnome-fallback.session.desktop.in.in	2011-04-20 21:19:19.751604438 +0200
-+++ gnome-session-3.0.0/data/gnome-fallback.session.desktop.in.in	2011-04-20 21:19:24.495627620 +0200
-@@ -2,5 +2,5 @@
- _Name=GNOME fallback
- RequiredComponents=gnome-panel;gnome-settings-daemon;
- RequiredProviders=windowmanager;notifications;
--DefaultProvider-windowmanager=metacity
-+DefaultProvider-windowmanager=gnome-wm
- DefaultProvider-notifications=notification-daemon
+--- gnome-panel-3.6.2.orig/data/gnome-flashback.session.desktop.in       2013-02-24 17:57:13.224232326 -0500
++++ gnome-panel-3.6.2/data/gnome-flashback.session.desktop.in    2013-02-24 17:57:13.216232326 -0500
+@@ -1,3 +1,3 @@
+ [GNOME Session]
+ _Name=GNOME Flashback
+-RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;nautilus-classic;
++RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;gnome-wm;nautilus-classic;

Modified: desktop/experimental/gnome-panel/debian/patches/02_fallback_desktop.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/02_fallback_desktop.patch?rev=38498&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/02_fallback_desktop.patch [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/patches/02_fallback_desktop.patch [utf-8] Sun Jun  9 01:40:15 2013
@@ -1,12 +1,13 @@
-Index: gnome-session-3.0.2/data/gnome-fallback.desktop.in
+Index: gnome-panel-3.6.2/data/gnome-flashback.desktop.in
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-session-3.0.2/data/gnome-fallback.desktop.in	2011-11-04 20:06:03.653307488 +0100
-@@ -0,0 +1,7 @@
-+[Desktop Entry]
-+_Name=GNOME Classic
-+_Comment=This session logs you into GNOME
+--- gnome-panel-3.6.2.orig/data/gnome-flashback.desktop.in       2013-02-25 21:04:11.761830320 -0500
++++ gnome-panel-3.6.2/data/gnome-flashback.desktop.in    2013-02-25 21:05:08.737827937 -0500
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ _Name=GNOME Fallback
+ _Comment=This session logs you into GNOME with the traditional panel
+-Exec=gnome-session --session=gnome-flashback
 +Exec=gnome-session-fallback
-+TryExec=gnome-session
-+Icon=
-+Type=Application
+ TryExec=gnome-session
+ Icon=
+ Type=Application

Modified: desktop/experimental/gnome-panel/debian/patches/14_revert_timedate_change.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/14_revert_timedate_change.patch?rev=38498&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/14_revert_timedate_change.patch [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/patches/14_revert_timedate_change.patch [utf-8] Sun Jun  9 01:40:15 2013
@@ -1,19 +1,19 @@
-Index: gnome-panel-3.4.1/applets/clock/clock.c
+Index: gnome-panel-3.5.91/applets/clock/clock.c
 ===================================================================
---- gnome-panel-3.4.1.orig/applets/clock/clock.c	2012-03-15 09:56:49.000000000 +0100
-+++ gnome-panel-3.4.1/applets/clock/clock.c	2012-04-19 17:47:58.132533624 +0200
-@@ -68,6 +68,7 @@
+--- gnome-panel-3.5.91.orig/applets/clock/clock.c	2012-09-08 21:46:24.868146546 -0400
++++ gnome-panel-3.5.91/applets/clock/clock.c	2012-09-08 21:46:26.464146479 -0400
+@@ -66,6 +66,7 @@
  #include "clock-location-tile.h"
  #include "clock-map.h"
  #include "clock-utils.h"
 +#include "set-timezone.h"
  #include "system-timezone.h"
  
- #define INTERNETSECOND (864)
-Index: gnome-panel-3.4.1/applets/clock/set-timezone.c
+ enum {
+Index: gnome-panel-3.5.91/applets/clock/set-timezone.c
 ===================================================================
---- gnome-panel-3.4.1.orig/applets/clock/set-timezone.c	2012-03-15 09:56:49.000000000 +0100
-+++ gnome-panel-3.4.1/applets/clock/set-timezone.c	2012-04-19 17:47:58.132533624 +0200
+--- gnome-panel-3.5.91.orig/applets/clock/set-timezone.c	2012-09-08 21:46:24.868146546 -0400
++++ gnome-panel-3.5.91/applets/clock/set-timezone.c	2012-09-08 21:46:26.464146479 -0400
 @@ -23,17 +23,23 @@
  #endif
  
@@ -136,16 +136,16 @@
                            NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL,
                            callback, user_data);
  }
-Index: gnome-panel-3.4.1/configure.ac
+Index: gnome-panel-3.5.91/configure.ac
 ===================================================================
---- gnome-panel-3.4.1.orig/configure.ac	2012-03-26 10:47:41.000000000 +0200
-+++ gnome-panel-3.4.1/configure.ac	2012-04-19 17:47:58.132533624 +0200
-@@ -149,7 +149,7 @@
+--- gnome-panel-3.5.91.orig/configure.ac	2012-09-04 08:07:29.000000000 -0400
++++ gnome-panel-3.5.91/configure.ac	2012-09-08 21:46:43.796145754 -0400
+@@ -131,7 +131,7 @@
  AC_SUBST(TZ_CFLAGS)
  AC_SUBST(TZ_LIBS)
  
--PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 gweather-3.0 >= $GWEATHER_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED polkit-gobject-1)
-+PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 gweather-3.0 >= $GWEATHER_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED)
+-PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED librsvg-2.0 gweather-3.0 >= $GWEATHER_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED polkit-gobject-1)
++PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED librsvg-2.0 gweather-3.0 >= $GWEATHER_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED)
  AC_SUBST(CLOCK_CFLAGS)
  AC_SUBST(CLOCK_LIBS)
  

Modified: desktop/experimental/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/series?rev=38498&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/patches/series [utf-8] Sun Jun  9 01:40:15 2013
@@ -1,10 +1,9 @@
+00-Add-the-GNOME-Flashback-session.patch
+#01_gnome-wm.patch
 01_menus_rename.patch
+02_fallback_desktop.patch
 03_tasklist_orientation.patch
 10_bookmarks_limit.patch
 11_compat_options.patch
 14_revert_timedate_change.patch
-15_avoid_applet_loading_failures.patch
-16_remove_online_accounts_from_user_menu.patch
-17_avoid_double_forking.patch
 18_fix_force_quit_applet.patch
-19_dconf_api_changes.patch

Modified: desktop/experimental/gnome-panel/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/watch?rev=38498&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/watch [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/watch [utf-8] Sun Jun  9 01:40:15 2013
@@ -1,2 +1,2 @@
 version=3
-http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/([\d\.]+[02468])/gnome-panel-(.*)\.tar\.xz
+http://download.gnome.org/sources/gnome-panel/([\d\.]+[02468])/gnome-panel-(.*)\.tar\.xz

More information about the pkg-gnome-commits mailing list