r19561 - in /desktop/experimental/gnome-panel/debian: changelog control control.in copyright patches/04_gnome-panel-logout.patch

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sun Apr 12 13:26:48 UTC 2009 

Author: joss
Date: Sun Apr 12 13:26:47 2009
New Revision: 19561

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19561
Log:
* 04_gnome-panel-logout.patch: use the new API, so that we actually 
  talk to gnome-session if possible when invoking gnome-panel-logout.
* Fix debugging package section.
* Update licensing information to match reality.

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/copyright
    desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch

Modified: desktop/experimental/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/changelog?rev=19561&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/changelog (original)
+++ desktop/experimental/gnome-panel/debian/changelog Sun Apr 12 13:26:47 2009
@@ -6,10 +6,13 @@
   * 02_panel_logout.patch: update for new version, using the patch from 
     Gentoo instead, which allows to support the new gnome-session with a 
     clean fallback to XSMP/GDM if it is not available.
-  * 04_gnome-panel-logout.patch: update accordingly.
+  * 04_gnome-panel-logout.patch: use the new API, so that we actually 
+    talk to gnome-session if possible when invoking gnome-panel-logout.
   * 05_clock_dbus.patch: dropped, merged upstream.
   * Refresh other patches.
   * 70_relibtoolize.patch: updated for the new version.
+  * Fix debugging package section.
+  * Update licensing information to match reality.
 
  -- Josselin Mouette <joss at debian.org>  Sun, 12 Apr 2009 12:34:28 +0200
 

Modified: desktop/experimental/gnome-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/control?rev=19561&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/control (original)
+++ desktop/experimental/gnome-panel/debian/control Sun Apr 12 13:26:47 2009
@@ -83,7 +83,7 @@
  This library is used by GNOME Panel applets.
 
 Package: gnome-panel-dbg
-Section: libdevel
+Section: debug
 Priority: extra
 Architecture: any
 Depends: ${misc:Depends},

Modified: desktop/experimental/gnome-panel/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/control.in?rev=19561&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/control.in (original)
+++ desktop/experimental/gnome-panel/debian/control.in Sun Apr 12 13:26:47 2009
@@ -83,7 +83,7 @@
  This library is used by GNOME Panel applets.
 
 Package: gnome-panel-dbg
-Section: libdevel
+Section: debug
 Priority: extra
 Architecture: any
 Depends: ${misc:Depends},

Modified: desktop/experimental/gnome-panel/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/copyright?rev=19561&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/copyright (original)
+++ desktop/experimental/gnome-panel/debian/copyright Sun Apr 12 13:26:47 2009
@@ -10,22 +10,55 @@
   Too many to list here, but the full list is in:
     /usr/share/doc/gnome-panel/AUTHORS
 
-License:
+License for the panel:
 
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 dated June, 1991.
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
-   USA.
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 
+   02110-1301 USA.
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
+
+License for the library:
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA  02110-1301 USA.
+
+On Debian systems, the complete text of the GNU Library General
+Public License can be found in `/usr/share/common-licenses/LGPL-2'.
+
+
+License for the documentation:
+
+   Permission is granted to copy, distribute and/or modify this
+   document under the terms of the GNU Free Documentation
+   License (GFDL), Version 1.1 or any later version published
+   by the Free Software Foundation with no Invariant Sections,
+   no Front-Cover Texts, and no Back-Cover Texts.
+
+On Debian systems, the complete text of the GNU Free Documentation
+License can be found in `/usr/share/common-licenses/GFDL-1.2'.

Modified: desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch?rev=19561&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch (original)
+++ desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch Sun Apr 12 13:26:47 2009
@@ -1,7 +1,7 @@
 Index: gnome-panel-2.26.0/configure.in
 ===================================================================
---- gnome-panel-2.26.0.orig/configure.in	2009-04-12 14:35:06.786483812 +0200
-+++ gnome-panel-2.26.0/configure.in	2009-04-12 14:43:25.718480057 +0200
+--- gnome-panel-2.26.0.orig/configure.in	2009-04-12 15:03:07.345981528 +0200
++++ gnome-panel-2.26.0/configure.in	2009-04-12 15:03:09.161980557 +0200
 @@ -74,6 +74,10 @@ PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $O
  AC_SUBST(PANEL_CFLAGS)
  AC_SUBST(PANEL_LIBS)
@@ -15,8 +15,8 @@
  AC_SUBST(LIBPANEL_APPLET_LIBS)
 Index: gnome-panel-2.26.0/gnome-panel/Makefile.am
 ===================================================================
---- gnome-panel-2.26.0.orig/gnome-panel/Makefile.am	2009-04-12 14:43:25.646479425 +0200
-+++ gnome-panel-2.26.0/gnome-panel/Makefile.am	2009-04-12 14:43:25.718480057 +0200
+--- gnome-panel-2.26.0.orig/gnome-panel/Makefile.am	2009-04-12 15:03:07.317979924 +0200
++++ gnome-panel-2.26.0/gnome-panel/Makefile.am	2009-04-12 15:03:09.161980557 +0200
 @@ -31,6 +31,7 @@ STANDARD_PROPERTIES_CFLAGS = 					\
  
  bin_PROGRAMS = \
@@ -52,8 +52,8 @@
 Index: gnome-panel-2.26.0/gnome-panel/gnome-panel-logout.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-panel-2.26.0/gnome-panel/gnome-panel-logout.c	2009-04-12 14:43:25.718480057 +0200
-@@ -0,0 +1,49 @@
++++ gnome-panel-2.26.0/gnome-panel/gnome-panel-logout.c	2009-04-12 15:09:18.257979071 +0200
+@@ -0,0 +1,53 @@
 +/* GNOME panel : logout/shutdown request standalone binary
 + *
 + * (C) 2007 Josselin Mouette
@@ -64,7 +64,7 @@
 +#include <glib/gi18n.h>
 +#include <libgnomeui/libgnomeui.h>
 +
-+#include "panel-logout.h"
++#include <libpanel-util/panel-session-manager.h>
 +
 +static gboolean shutdown_requested;
 +
@@ -78,6 +78,7 @@
 +{
 +	GOptionContext *context;
 +	GnomeProgram   *program;
++	PanelSessionManager *manager;
 +
 +	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
 +	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -95,9 +96,12 @@
 +				      NULL);
 +	gnome_client_set_restart_style (gnome_master_client (), GNOME_RESTART_NEVER);
 +
-+	panel_logout_new (shutdown_requested?PANEL_LOGOUT_DIALOG_SHUTDOWN:PANEL_LOGOUT_DIALOG_LOGOUT,
-+			  NULL,
-+			  GDK_CURRENT_TIME);
++	manager = panel_session_manager_get ();
++
++	if (shutdown_requested)
++	    panel_session_manager_request_shutdown (manager);
++	else
++	    panel_session_manager_request_logout (manager, PANEL_SESSION_MANAGER_LOGOUT_MODE_NORMAL);
 +
 +	gtk_main ();
 +	g_object_unref (program);
@@ -105,8 +109,8 @@
 +}
 Index: gnome-panel-2.26.0/gnome-panel/panel-logout.c
 ===================================================================
---- gnome-panel-2.26.0.orig/gnome-panel/panel-logout.c	2009-04-12 14:43:25.682480230 +0200
-+++ gnome-panel-2.26.0/gnome-panel/panel-logout.c	2009-04-12 14:43:25.718480057 +0200
+--- gnome-panel-2.26.0.orig/gnome-panel/panel-logout.c	2009-04-12 15:03:07.233980003 +0200
++++ gnome-panel-2.26.0/gnome-panel/panel-logout.c	2009-04-12 15:03:09.161980557 +0200
 @@ -182,8 +182,6 @@ panel_logout_response (PanelLogoutDialog
  	gtk_widget_destroy (GTK_WIDGET (logout_dialog));
  
@@ -160,8 +164,8 @@
  }
 Index: gnome-panel-2.26.0/gnome-panel/panel-session.c
 ===================================================================
---- gnome-panel-2.26.0.orig/gnome-panel/panel-session.c	2009-04-12 14:43:25.646479425 +0200
-+++ gnome-panel-2.26.0/gnome-panel/panel-session.c	2009-04-12 14:43:25.722480146 +0200
+--- gnome-panel-2.26.0.orig/gnome-panel/panel-session.c	2009-04-12 15:03:07.185981375 +0200
++++ gnome-panel-2.26.0/gnome-panel/panel-session.c	2009-04-12 15:03:09.161980557 +0200
 @@ -28,7 +28,9 @@
  
  #include <stdlib.h>
@@ -187,8 +191,8 @@
 +#endif // BUILDING_STANDALONE_LOGOUT
 Index: gnome-panel-2.26.0/gnome-panel/panel-util.c
 ===================================================================
---- gnome-panel-2.26.0.orig/gnome-panel/panel-util.c	2009-04-12 14:35:06.582479741 +0200
-+++ gnome-panel-2.26.0/gnome-panel/panel-util.c	2009-04-12 14:48:06.769979968 +0200
+--- gnome-panel-2.26.0.orig/gnome-panel/panel-util.c	2009-04-12 15:03:07.161981327 +0200
++++ gnome-panel-2.26.0/gnome-panel/panel-util.c	2009-04-12 15:03:09.165980647 +0200
 @@ -33,6 +33,7 @@
  #include <libpanel-util/panel-glib.h>
  #include <libpanel-util/panel-keyfile.h>
@@ -296,8 +300,8 @@
 +#endif // BUILDING_STANDALONE_LOGOUT
 Index: gnome-panel-2.26.0/gnome-panel/panel-lockdown.c
 ===================================================================
---- gnome-panel-2.26.0.orig/gnome-panel/panel-lockdown.c	2009-04-12 14:35:06.550480493 +0200
-+++ gnome-panel-2.26.0/gnome-panel/panel-lockdown.c	2009-04-12 14:43:25.722480146 +0200
+--- gnome-panel-2.26.0.orig/gnome-panel/panel-lockdown.c	2009-04-12 15:03:07.085981095 +0200
++++ gnome-panel-2.26.0/gnome-panel/panel-lockdown.c	2009-04-12 15:03:09.165980647 +0200
 @@ -26,10 +26,14 @@
  
  #include "panel-lockdown.h"

More information about the pkg-gnome-commits mailing list