r40126 - in /desktop/unstable/gnome-panel/debian: changelog patches/01_gnome-wm.patch patches/14_revert_timedate_change.patch patches/90-remove_artifact_on_icon_animation.patch patches/series

mitya57-guest at users.alioth.debian.org mitya57-guest at users.alioth.debian.org
Sun Oct 27 14:32:11 UTC 2013 

Author: mitya57-guest
Date: Sun Oct 27 14:32:10 2013
New Revision: 40126

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40126
Log:
Drop patches applied upstream, refresh other patches.

Modified:
    desktop/unstable/gnome-panel/debian/changelog
    desktop/unstable/gnome-panel/debian/patches/01_gnome-wm.patch
    desktop/unstable/gnome-panel/debian/patches/14_revert_timedate_change.patch
    desktop/unstable/gnome-panel/debian/patches/90-remove_artifact_on_icon_animation.patch
    desktop/unstable/gnome-panel/debian/patches/series

Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=40126&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/changelog	[utf-8] Sun Oct 27 14:32:10 2013
@@ -6,6 +6,7 @@
 
   [ Dmitry Shachnev ]
   * New upstream release.
+  * Drop patches applied upstream, refresh other patches.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Mon, 21 Oct 2013 12:37:19 +0400
 

Modified: desktop/unstable/gnome-panel/debian/patches/01_gnome-wm.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/01_gnome-wm.patch?rev=40126&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/01_gnome-wm.patch	[utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/01_gnome-wm.patch	[utf-8] Sun Oct 27 14:32:10 2013
@@ -1,9 +1,7 @@
-Index: gnome-panel-3.6.2/data/gnome-fallback.session.desktop.in
-===================================================================
---- 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
+--- a/data/gnome-flashback.session.desktop.in
++++ b/data/gnome-flashback.session.desktop.in
 @@ -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;
+-RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;
++RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;gnome-wm;

Modified: desktop/unstable/gnome-panel/debian/patches/14_revert_timedate_change.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/14_revert_timedate_change.patch?rev=40126&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/14_revert_timedate_change.patch	[utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/14_revert_timedate_change.patch	[utf-8] Sun Oct 27 14:32:10 2013
@@ -1,8 +1,6 @@
-Index: gnome-panel-3.6.2/applets/clock/clock.c
-===================================================================
---- gnome-panel-3.6.2.orig/applets/clock/clock.c	2013-06-08 22:15:34.778747917 -0400
-+++ gnome-panel-3.6.2/applets/clock/clock.c	2013-06-08 22:15:34.770747917 -0400
-@@ -66,6 +66,7 @@
+--- a/applets/clock/clock.c
++++ b/applets/clock/clock.c
+@@ -65,6 +65,7 @@
  #include "clock-location-tile.h"
  #include "clock-map.h"
  #include "clock-utils.h"
@@ -10,10 +8,8 @@
  #include "system-timezone.h"
  
  enum {
-Index: gnome-panel-3.6.2/applets/clock/set-timezone.c
-===================================================================
---- gnome-panel-3.6.2.orig/applets/clock/set-timezone.c	2013-06-08 22:15:34.778747917 -0400
-+++ gnome-panel-3.6.2/applets/clock/set-timezone.c	2013-06-08 22:15:34.774747917 -0400
+--- a/applets/clock/set-timezone.c
++++ b/applets/clock/set-timezone.c
 @@ -23,17 +23,23 @@
  #endif
  
@@ -136,10 +132,8 @@
                            NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL,
                            callback, user_data);
  }
-Index: gnome-panel-3.6.2/configure.ac
-===================================================================
---- gnome-panel-3.6.2.orig/configure.ac	2012-11-12 12:51:14.000000000 -0500
-+++ gnome-panel-3.6.2/configure.ac	2013-06-08 22:15:52.390747180 -0400
+--- a/configure.ac
++++ b/configure.ac
 @@ -131,7 +131,7 @@
  AC_SUBST(TZ_CFLAGS)
  AC_SUBST(TZ_LIBS)

Modified: desktop/unstable/gnome-panel/debian/patches/90-remove_artifact_on_icon_animation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/90-remove_artifact_on_icon_animation.patch?rev=40126&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/90-remove_artifact_on_icon_animation.patch	[utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/90-remove_artifact_on_icon_animation.patch	[utf-8] Sun Oct 27 14:32:10 2013
@@ -1,13 +1,11 @@
 # Description: Remove black frame artifact on launcher icon zoom animation
 # Origin/Author:  Yannick GICQUEL
 # Bug: https://bugzilla.gnome.org/show_bug.cgi?id=688618
-Index: gnome-panel/gnome-panel/xstuff.c
-===================================================================
---- gnome-panel.orig/gnome-panel/xstuff.c	2012-11-18 16:22:36.108284000 +0100
-+++ gnome-panel/gnome-panel/xstuff.c	2012-11-18 16:42:40.961891555 +0100
-@@ -326,6 +326,8 @@
- 			g_source_remove (zoom->timeout_id);
- 		zoom->timeout_id = 0;
+--- a/gnome-panel/xstuff.c
++++ b/gnome-panel/xstuff.c
+@@ -329,6 +329,8 @@
+ 		gtk_widget_hide (widget);
+ 		g_idle_add (idle_destroy, widget);
  
 +		gtk_widget_hide (widget);
 +

Modified: desktop/unstable/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/series?rev=40126&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/series	[utf-8] Sun Oct 27 14:32:10 2013
@@ -1,19 +1,8 @@
-00-Add-the-GNOME-Flashback-session.patch
-00-Fix-the-GNOME-Flashback-session-name.patch
-#00_dont-require-nautilus-classic.patch
 01_gnome-wm.patch
 01_menus_rename.patch
-02_flashback_desktop.patch
 03_tasklist_orientation.patch
 10_bookmarks_limit.patch
 11_compat_options.patch
 14_revert_timedate_change.patch
-18_fix_force_quit_applet.patch
 90-remove_artifact_on_icon_animation.patch
-91-fix_panels_in_separate_screens.patch
-92-fix_sunrise-times.patch
-drop-gweather-xml-include.patch
 fix-gweather-crash.patch
-git-build-with-gnome-desktop38-part1.patch
-git-build-with-gnome-desktop38-part2.patch
-git-build-with-gnome-desktop38-part3.patch

More information about the pkg-gnome-commits mailing list