r27629 - in /desktop/experimental/gnome-panel/debian: changelog control control.in patches/11_compat_options.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sat Apr 16 21:13:31 UTC 2011


Author: joss
Date: Sat Apr 16 21:13:31 2011
New Revision: 27629

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27629
Log:
* 11_compat_options.patch: new patch. Support the --screen option for 
  compatibility, since it used to appear in saved sessions. It 
  disappeared in GTK3 and prevents such sessions to be restored.
* Drop build-dependencies on dbus-glib.

Added:
    desktop/experimental/gnome-panel/debian/patches/11_compat_options.patch
Modified:
    desktop/experimental/gnome-panel/debian/changelog
    desktop/experimental/gnome-panel/debian/control
    desktop/experimental/gnome-panel/debian/control.in
    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=27629&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/changelog [utf-8] Sat Apr 16 21:13:31 2011
@@ -1,9 +1,13 @@
-gnome-panel (3.0.0.1-2) UNRELEASED; urgency=low
+gnome-panel (3.0.0.1-2) experimental; urgency=low
 
   * 04_modifier_contextmenu.patch: new patch. Make the context menu work 
     even when there are other keys in the modifier mask.
-
- -- Josselin Mouette <joss at debian.org>  Sat, 16 Apr 2011 22:16:48 +0200
+  * 11_compat_options.patch: new patch. Support the --screen option for 
+    compatibility, since it used to appear in saved sessions. It 
+    disappeared in GTK3 and prevents such sessions to be restored.
+  * Drop build-dependencies on dbus-glib.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 16 Apr 2011 22:29:02 +0200
 
 gnome-panel (3.0.0.1-1) experimental; urgency=low
 

Modified: desktop/experimental/gnome-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/control?rev=27629&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/control [utf-8] Sat Apr 16 21:13:31 2011
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Gustavo Noronha Silva <kov at debian.org>, Josselin Mouette <joss at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Gustavo Noronha Silva <kov at debian.org>, Josselin Mouette <joss at debian.org>
 Standards-Version: 3.9.0
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
@@ -40,8 +40,6 @@
                evolution-data-server-dev,
                libcairo2-dev (>= 1.10.0),
                libgweather-3-dev (>= 2.91.0),
-               libdbus-glib-1-dev (>= 0.80),
-               libdbus-1-dev (>= 1.1.2),
                libice-dev,
                libsm-dev,
                libtelepathy-glib-dev (>= 0.14.0),

Modified: desktop/experimental/gnome-panel/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/control.in?rev=27629&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/control.in [utf-8] Sat Apr 16 21:13:31 2011
@@ -35,8 +35,6 @@
                evolution-data-server-dev,
                libcairo2-dev (>= 1.10.0),
                libgweather-3-dev (>= 2.91.0),
-               libdbus-glib-1-dev (>= 0.80),
-               libdbus-1-dev (>= 1.1.2),
                libice-dev,
                libsm-dev,
                libtelepathy-glib-dev (>= 0.14.0),

Added: desktop/experimental/gnome-panel/debian/patches/11_compat_options.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/11_compat_options.patch?rev=27629&op=file
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/11_compat_options.patch (added)
+++ desktop/experimental/gnome-panel/debian/patches/11_compat_options.patch [utf-8] Sat Apr 16 21:13:31 2011
@@ -1,0 +1,16 @@
+Index: gnome-panel-3.0.0.1/gnome-panel/main.c
+===================================================================
+--- gnome-panel-3.0.0.1.orig/gnome-panel/main.c	2011-04-16 22:20:07.643885619 +0200
++++ gnome-panel-3.0.0.1/gnome-panel/main.c	2011-04-16 22:27:00.681904861 +0200
+@@ -36,9 +36,11 @@ GSList *panels = NULL;
+ GSList *panel_list = NULL;
+ 
+ static gboolean  replace = FALSE;
++static gint      screen = 0;
+ 
+ static const GOptionEntry options[] = {
+   { "replace", 0, 0, G_OPTION_ARG_NONE, &replace, N_("Replace a currently running panel"), NULL },
++  { "screen", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_INT, &screen, "Ignored - for compatibility", "num"},
+   { NULL }
+ };
+ 

Modified: desktop/experimental/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/series?rev=27629&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/patches/series [utf-8] Sat Apr 16 21:13:31 2011
@@ -4,3 +4,4 @@
 04_modifier_contextmenu.patch
 09_default_icons.patch
 10_bookmarks_limit.patch
+11_compat_options.patch




More information about the pkg-gnome-commits mailing list