r42233 - in /desktop/experimental/gnome-panel/debian: changelog patches/01_gnome-wm.patch patches/03_tasklist_orientation.patch patches/11_compat_options.patch patches/14_revert_timedate_change.patch patches/series

[mitya57-guest at users.alioth.debian.org]

Author: mitya57-guest
Date: Sun Aug 24 13:53:22 2014
New Revision: 42233

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42233
Log:
* Rebase 14_revert_timedate_change.patch.
* Remove all other patches, no longer needed or applied upstream.

Removed:
    desktop/experimental/gnome-panel/debian/patches/01_gnome-wm.patch
    desktop/experimental/gnome-panel/debian/patches/03_tasklist_orientation.patch
    desktop/experimental/gnome-panel/debian/patches/11_compat_options.patch
Modified:
    desktop/experimental/gnome-panel/debian/changelog
    desktop/experimental/gnome-panel/debian/patches/14_revert_timedate_change.patch
    desktop/experimental/gnome-panel/debian/patches/series

Modified: desktop/experimental/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/changelog?rev=42233&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/changelog	[utf-8] Sun Aug 24 13:53:22 2014
@@ -5,6 +5,8 @@
     moved to the new source package (gnome-flashback).
   * Update (build-)dependencies for 3.10.0 (no longer depend on
     gconf2 and python)
+  * Rebase 14_revert_timedate_change.patch.
+  * Remove all other patches, no longer needed or applied upstream.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Wed, 20 Aug 2014 19:45:23 +0400
 

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=42233&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 Aug 24 13:53:22 2014
@@ -1,3 +1,8 @@
+Description: revert switch to datetimed as we support non-systemd systems
+Author: Jeremy Bicha <jbicha at ubuntu.com>
+Forwarded: not-needed
+Last-Update: 2014-08-24
+
 --- a/applets/clock/clock.c
 +++ b/applets/clock/clock.c
 @@ -63,6 +63,7 @@
@@ -134,12 +139,12 @@
  }
 --- a/configure.ac
 +++ b/configure.ac
-@@ -131,7 +131,7 @@
+@@ -136,7 +136,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 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)
+-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 >= $LIBRSVG_REQUIRED gweather-3.0 >= $GWEATHER_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED polkit-gobject-1 dconf >= $DCONF_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 >= $LIBRSVG_REQUIRED gweather-3.0 >= $GWEATHER_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED dconf >= $DCONF_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=42233&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/patches/series	[utf-8] Sun Aug 24 13:53:22 2014
@@ -1,4 +1 @@
-01_gnome-wm.patch
-03_tasklist_orientation.patch
-11_compat_options.patch
 14_revert_timedate_change.patch