r15321 - in /desktop/experimental/gnome-panel/debian: changelog patches/02_switch-user_lock.patch patches/03_gnome-panel-logout.patch patches/60_caldav-clock-appointments.patch patches/99_ltmain_as-needed.patch
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Wed Mar 19 13:10:13 UTC 2008
Author: lool
Date: Wed Mar 19 13:10:12 2008
New Revision: 15321
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15321
Log:
Refresh patches 02_switch-user_lock, 03_gnome-panel-logout,
60_caldav-clock-appointments and 99_ltmain_as-needed to apply cleanly.
Modified:
desktop/experimental/gnome-panel/debian/changelog
desktop/experimental/gnome-panel/debian/patches/02_switch-user_lock.patch
desktop/experimental/gnome-panel/debian/patches/03_gnome-panel-logout.patch
desktop/experimental/gnome-panel/debian/patches/60_caldav-clock-appointments.patch
desktop/experimental/gnome-panel/debian/patches/99_ltmain_as-needed.patch
Modified: desktop/experimental/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/changelog?rev=15321&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/changelog (original)
+++ desktop/experimental/gnome-panel/debian/changelog Wed Mar 19 13:10:12 2008
@@ -1,3 +1,10 @@
+gnome-panel (2.22.0-2) UNRELEASED; urgency=low
+
+ * Refresh patches 02_switch-user_lock, 03_gnome-panel-logout,
+ 60_caldav-clock-appointments and 99_ltmain_as-needed to apply cleanly.
+
+ -- Loic Minier <lool at dooz.org> Wed, 19 Mar 2008 14:09:13 +0100
+
gnome-panel (2.22.0-1) experimental; urgency=low
* New upstream stable release:
Modified: desktop/experimental/gnome-panel/debian/patches/02_switch-user_lock.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/02_switch-user_lock.patch?rev=15321&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/02_switch-user_lock.patch (original)
+++ desktop/experimental/gnome-panel/debian/patches/02_switch-user_lock.patch Wed Mar 19 13:10:12 2008
@@ -1,8 +1,6 @@
-Index: gnome-panel-2.20.1/gnome-panel/panel-logout.c
-===================================================================
---- gnome-panel-2.20.1.orig/gnome-panel/panel-logout.c 2007-10-15 22:00:47.000000000 +0200
-+++ gnome-panel-2.20.1/gnome-panel/panel-logout.c 2007-12-26 11:46:19.628664753 +0100
-@@ -35,6 +35,7 @@
+--- a/gnome-panel/panel-logout.c 2008-03-19 14:09:06.000000000 +0100
++++ b/gnome-panel/panel-logout.c 2008-03-19 14:09:09.000000000 +0100
+@@ -37,6 +37,7 @@
#include "panel-power-manager.h"
#include "panel-session.h"
#include "panel-icon-names.h"
@@ -10,7 +8,7 @@
#define PANEL_LOGOUT_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_LOGOUT_DIALOG, PanelLogoutDialogPrivate))
-@@ -169,8 +170,10 @@ panel_logout_response (PanelLogoutDialog
+@@ -173,8 +174,10 @@
gpointer data)
{
PanelPowerManager *power_manager;
@@ -21,7 +19,7 @@
gtk_widget_destroy (GTK_WIDGET (logout_dialog));
switch (response_id) {
-@@ -181,6 +184,7 @@ panel_logout_response (PanelLogoutDialog
+@@ -185,6 +188,7 @@
panel_session_request_logout ();
break;
case PANEL_LOGOUT_RESPONSE_SWITCH_USER:
@@ -29,7 +27,7 @@
gdm_new_login ();
break;
case PANEL_LOGOUT_RESPONSE_SHUTDOWN:
-@@ -206,6 +210,7 @@ panel_logout_response (PanelLogoutDialog
+@@ -210,6 +214,7 @@
g_assert_not_reached ();
}
g_object_unref (power_manager);
Modified: desktop/experimental/gnome-panel/debian/patches/03_gnome-panel-logout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/03_gnome-panel-logout.patch?rev=15321&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/03_gnome-panel-logout.patch (original)
+++ desktop/experimental/gnome-panel/debian/patches/03_gnome-panel-logout.patch Wed Mar 19 13:10:12 2008
@@ -1,9 +1,7 @@
Bugzilla #507391
-Index: gnome-panel-2.20.3/gnome-panel/gnome-panel-logout.c
-===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-panel-2.20.3/gnome-panel/gnome-panel-logout.c 2008-02-16 17:47:32.099271109 +0100
++++ b/gnome-panel/gnome-panel-logout.c 2008-03-19 14:09:20.000000000 +0100
@@ -0,0 +1,49 @@
+/* GNOME panel : logout/shutdown request standalone binary
+ *
@@ -54,10 +52,8 @@
+ g_object_unref (program);
+ return 0;
+}
-Index: gnome-panel-2.20.3/gnome-panel/panel-session.c
-===================================================================
---- gnome-panel-2.20.3.orig/gnome-panel/panel-session.c 2008-01-07 23:26:25.000000000 +0100
-+++ gnome-panel-2.20.3/gnome-panel/panel-session.c 2008-02-16 17:47:32.099271109 +0100
+--- a/gnome-panel/panel-session.c 2008-03-19 14:09:06.000000000 +0100
++++ b/gnome-panel/panel-session.c 2008-03-19 14:09:20.000000000 +0100
@@ -29,8 +29,10 @@
#include <stdlib.h>
@@ -69,7 +65,7 @@
void
panel_session_request_logout (void)
-@@ -60,6 +62,7 @@ panel_session_request_logout (void)
+@@ -60,6 +62,7 @@
recursion_guard--;
}
@@ -77,24 +73,22 @@
static void
panel_session_handle_die_request (GnomeClient *client)
{
-@@ -107,3 +110,4 @@ panel_session_init (void)
+@@ -107,3 +110,4 @@
g_signal_connect (client, "die",
G_CALLBACK (panel_session_handle_die_request), NULL);
}
+#endif // BUILDING_STANDALONE_LOGOUT
-Index: gnome-panel-2.20.3/gnome-panel/panel-util.c
-===================================================================
---- gnome-panel-2.20.3.orig/gnome-panel/panel-util.c 2008-01-07 23:26:25.000000000 +0100
-+++ gnome-panel-2.20.3/gnome-panel/panel-util.c 2008-02-16 17:47:32.099271109 +0100
-@@ -31,6 +31,7 @@
- #include <libgnomevfs/gnome-vfs-uri.h>
- #include <libgnomevfs/gnome-vfs-ops.h>
+--- a/gnome-panel/panel-util.c 2008-03-19 14:09:06.000000000 +0100
++++ b/gnome-panel/panel-util.c 2008-03-19 14:09:20.000000000 +0100
+@@ -28,6 +28,7 @@
+ #include <libgnome/gnome-util.h>
+ #include <libgnomeui/gnome-help.h>
+#ifndef BUILDING_STANDALONE_LOGOUT
#include "applet.h"
#include "nothing.h"
#include "xstuff.h"
-@@ -468,6 +469,7 @@ panel_pop_window_busy (GtkWidget *window
+@@ -466,6 +467,7 @@
GINT_TO_POINTER (busy));
}
}
@@ -102,7 +96,7 @@
gboolean
panel_is_program_in_path (const char *program)
-@@ -481,6 +483,7 @@ panel_is_program_in_path (const char *pr
+@@ -479,6 +481,7 @@
}
}
@@ -110,7 +104,7 @@
static gboolean
panel_ensure_dir (const char *dirname)
{
-@@ -732,6 +735,7 @@ panel_load_icon (GtkIconTheme *icon_the
+@@ -675,6 +678,7 @@
return retval;
}
@@ -118,7 +112,7 @@
static char *
panel_lock_screen_action_get_command (const char *action)
-@@ -804,6 +808,7 @@ panel_lock_screen_action (GdkScreen *sc
+@@ -747,6 +751,7 @@
return;
if (!gdk_spawn_command_line_on_screen (screen, command, &error)) {
@@ -126,7 +120,7 @@
char *primary;
primary = g_strdup_printf (_("Could not execute '%s'"),
-@@ -812,6 +817,7 @@ panel_lock_screen_action (GdkScreen *sc
+@@ -755,6 +760,7 @@
"cannot_exec_screensaver", TRUE,
primary, error->message);
g_free (primary);
@@ -134,7 +128,7 @@
g_error_free (error);
}
-@@ -825,6 +831,7 @@ panel_lock_screen (GdkScreen *screen)
+@@ -768,6 +774,7 @@
}
@@ -142,16 +136,14 @@
char *
panel_make_full_path (const char *dir,
const char *filename)
-@@ -1579,3 +1586,4 @@ panel_util_set_tooltip_text (GtkWidget
- G_CALLBACK (panel_util_query_tooltip_cb),
- g_strdup (text), (GClosureNotify) g_free, 0);
- }
-+#endif // BUILDING_STANDALONE_LOGOUT
-Index: gnome-panel-2.20.3/configure.in
-===================================================================
---- gnome-panel-2.20.3.orig/configure.in 2008-01-07 23:33:56.000000000 +0100
-+++ gnome-panel-2.20.3/configure.in 2008-02-16 17:47:32.099271109 +0100
-@@ -72,6 +72,10 @@ PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $O
+@@ -1823,3 +1830,4 @@
+
+ return file;
+ }
++#endif // BUILDING_STANDALONE_LOGOUT
+--- a/configure.in 2008-03-19 14:09:06.000000000 +0100
++++ b/configure.in 2008-03-19 14:09:20.000000000 +0100
+@@ -73,6 +73,10 @@
AC_SUBST(PANEL_CFLAGS)
AC_SUBST(PANEL_LIBS)
@@ -162,11 +154,9 @@
PKG_CHECK_MODULES(LIBPANEL_APPLET, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED)
AC_SUBST(LIBPANEL_APPLET_CFLAGS)
AC_SUBST(LIBPANEL_APPLET_LIBS)
-Index: gnome-panel-2.20.3/gnome-panel/Makefile.am
-===================================================================
---- gnome-panel-2.20.3.orig/gnome-panel/Makefile.am 2008-01-07 23:26:25.000000000 +0100
-+++ gnome-panel-2.20.3/gnome-panel/Makefile.am 2008-02-16 17:47:32.099271109 +0100
-@@ -29,6 +29,7 @@ STANDARD_PROPERTIES_CFLAGS = \
+--- a/gnome-panel/Makefile.am 2008-03-19 14:09:06.000000000 +0100
++++ b/gnome-panel/Makefile.am 2008-03-19 14:09:20.000000000 +0100
+@@ -29,6 +29,7 @@
bin_PROGRAMS = \
gnome-panel \
@@ -174,7 +164,7 @@
gnome-desktop-item-edit
$(gnome_panel_OBJECTS): $(BUILT_SOURCES)
-@@ -163,6 +164,22 @@ gnome_panel_LDADD = \
+@@ -165,6 +166,22 @@
gnome_panel_LDFLAGS = -export-dynamic
@@ -197,11 +187,9 @@
gnome_desktop_item_edit_SOURCES = \
gnome-desktop-item-edit.c \
panel-ditem-editor.c \
-Index: gnome-panel-2.20.3/gnome-panel/panel-logout.c
-===================================================================
---- gnome-panel-2.20.3.orig/gnome-panel/panel-logout.c 2008-02-16 17:47:30.959270722 +0100
-+++ gnome-panel-2.20.3/gnome-panel/panel-logout.c 2008-02-16 17:50:26.587269360 +0100
-@@ -177,8 +177,6 @@ panel_logout_response (PanelLogoutDialog
+--- a/gnome-panel/panel-logout.c 2008-03-19 14:09:09.000000000 +0100
++++ b/gnome-panel/panel-logout.c 2008-03-19 14:09:20.000000000 +0100
+@@ -181,8 +181,6 @@
gtk_widget_destroy (GTK_WIDGET (logout_dialog));
switch (response_id) {
@@ -210,7 +198,7 @@
case PANEL_LOGOUT_RESPONSE_LOGOUT:
gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
panel_session_request_logout ();
-@@ -203,6 +201,7 @@ panel_logout_response (PanelLogoutDialog
+@@ -207,6 +205,7 @@
if (panel_power_manager_can_suspend (power_manager))
panel_power_manager_attempt_suspend (power_manager);
break;
@@ -218,7 +206,7 @@
case GTK_RESPONSE_NONE:
case GTK_RESPONSE_DELETE_EVENT:
break;
-@@ -211,6 +210,9 @@ panel_logout_response (PanelLogoutDialog
+@@ -215,6 +214,9 @@
}
g_object_unref (power_manager);
g_object_unref (screen);
@@ -228,7 +216,7 @@
}
static gboolean
-@@ -307,8 +309,10 @@ panel_logout_new (PanelLogoutDialogType
+@@ -311,8 +313,10 @@
if (current_dialog != NULL) {
if (current_dialog->priv->type == type) {
@@ -241,7 +229,7 @@
gtk_window_present_with_time (GTK_WINDOW (current_dialog),
activate_time);
panel_logout_set_timeout (current_dialog);
-@@ -391,6 +395,8 @@ panel_logout_new (PanelLogoutDialogType
+@@ -395,7 +399,9 @@
panel_logout_set_timeout (logout_dialog);
@@ -250,4 +238,5 @@
+ gtk_window_set_screen (GTK_WINDOW (logout_dialog), screen);
+ }
gtk_widget_show (GTK_WIDGET (logout_dialog));
- }
+ gdk_window_focus (GTK_WIDGET (current_dialog)->window, activate_time);
+ }
Modified: desktop/experimental/gnome-panel/debian/patches/60_caldav-clock-appointments.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/60_caldav-clock-appointments.patch?rev=15321&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/60_caldav-clock-appointments.patch (original)
+++ desktop/experimental/gnome-panel/debian/patches/60_caldav-clock-appointments.patch Wed Mar 19 13:10:12 2008
@@ -1,15 +1,13 @@
calendar-window.c: (is_appointment): Merge fix by Roland Mas to match "caldav:"
as well. GNOME #501569, Debian #454318.
---- gnome-panel-2.20.2/applets/clock/calendar-window.c 2007-11-27 01:02:56.000000000 +0100
-+++ gnome-panel-2.20.2.new/applets/clock/calendar-window.c 2007-12-04 18:22:47.000000000 +0100
-@@ -369,8 +369,9 @@
-
+--- a/applets/clock/calendar-window.c 2008-03-19 14:09:05.000000000 +0100
++++ b/applets/clock/calendar-window.c 2008-03-19 14:09:30.000000000 +0100
+@@ -386,7 +386,8 @@
gtk_tree_model_get (model, iter, APPOINTMENT_COLUMN_URI, &uri, -1);
if (uri)
-- return (strcmp (uri, "file") == 0 ||
+ return (strcmp (uri, "file") == 0 ||
- strcmp (uri, "webcal") == 0);
-+ return (strcmp (uri, "file") == 0 ||
+ strcmp (uri, "webcal") == 0 ||
+ strcmp (uri, "caldav") == 0);
return FALSE;
Modified: desktop/experimental/gnome-panel/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/99_ltmain_as-needed.patch?rev=15321&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/99_ltmain_as-needed.patch (original)
+++ desktop/experimental/gnome-panel/debian/patches/99_ltmain_as-needed.patch Wed Mar 19 13:10:12 2008
@@ -1,8 +1,6 @@
-Index: gnome-panel-2.20.2/ltmain.sh
-===================================================================
---- gnome-panel-2.20.2.orig/ltmain.sh 2008-01-05 00:13:26.196419875 +0100
-+++ gnome-panel-2.20.2/ltmain.sh 2008-01-05 00:15:22.179029347 +0100
-@@ -1794,6 +1794,11 @@ EOF
+--- a/ltmain.sh 2008-03-19 14:09:41.000000000 +0100
++++ b/ltmain.sh 2008-03-19 14:09:44.000000000 +0100
+@@ -1807,6 +1807,11 @@
arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
;;
@@ -14,7 +12,7 @@
-Wl,*)
args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
arg=
-@@ -2137,6 +2142,15 @@ EOF
+@@ -2150,6 +2155,15 @@
lib=
found=no
case $deplib in
More information about the pkg-gnome-commits
mailing list