r14006 - in /desktop/unstable/gnome-panel/debian: changelog control control.in patches/01_panel_submenus.patch patches/02_switch-user_lock.patch patches/05_missing_includes.patch patches/99_ltmain_as-needed.patch patches/series rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Wed Dec 26 10:46:49 UTC 2007 

Author: joss
Date: Wed Dec 26 10:46:49 2007
New Revision: 14006

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14006
Log:
* Switch to quilt for patch handling; build-depend on quilt.
* Refresh patches to apply cleanly.

Added:
    desktop/unstable/gnome-panel/debian/patches/series
Modified:
    desktop/unstable/gnome-panel/debian/changelog
    desktop/unstable/gnome-panel/debian/control
    desktop/unstable/gnome-panel/debian/control.in
    desktop/unstable/gnome-panel/debian/patches/01_panel_submenus.patch
    desktop/unstable/gnome-panel/debian/patches/02_switch-user_lock.patch
    desktop/unstable/gnome-panel/debian/patches/05_missing_includes.patch
    desktop/unstable/gnome-panel/debian/patches/99_ltmain_as-needed.patch
    desktop/unstable/gnome-panel/debian/rules

Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=14006&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog (original)
+++ desktop/unstable/gnome-panel/debian/changelog Wed Dec 26 10:46:49 2007
@@ -1,7 +1,12 @@
 gnome-panel (2.20.2-3) UNRELEASED; urgency=low
 
+  [ Loic Minier ]
   * New patch, 60_caldav-clock-appointments, allows display of caldav://
     calendars in clock applet; thanks Roland Mas; closes: #454318.
+
+  [ Josselin Mouette ]
+  * Switch to quilt for patch handling; build-depend on quilt.
+  * Refresh patches to apply cleanly.
 
  -- Loic Minier <lool at dooz.org>  Tue, 04 Dec 2007 18:23:24 +0100
 

Modified: desktop/unstable/gnome-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/control?rev=14006&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/control (original)
+++ desktop/unstable/gnome-panel/debian/control Wed Dec 26 10:46:49 2007
@@ -6,6 +6,7 @@
 Standards-Version: 3.7.2
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
+               quilt,
                intltool (>= 0.35.0),
                gnome-pkg-tools (>= 0.10),
                dpkg-dev (>= 1.13.19),

Modified: desktop/unstable/gnome-panel/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/control.in?rev=14006&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/control.in (original)
+++ desktop/unstable/gnome-panel/debian/control.in Wed Dec 26 10:46:49 2007
@@ -6,6 +6,7 @@
 Standards-Version: 3.7.2
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
+               quilt,
                intltool (>= 0.35.0),
                gnome-pkg-tools (>= 0.10),
                dpkg-dev (>= 1.13.19),

Modified: desktop/unstable/gnome-panel/debian/patches/01_panel_submenus.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/01_panel_submenus.patch?rev=14006&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/01_panel_submenus.patch (original)
+++ desktop/unstable/gnome-panel/debian/patches/01_panel_submenus.patch Wed Dec 26 10:46:49 2007
@@ -1,6 +1,8 @@
---- gnome-panel/panel-menu-button.c.old	2007-05-08 13:12:25.000000000 +0200
-+++ gnome-panel/panel-menu-button.c	2007-05-08 13:12:36.000000000 +0200
-@@ -69,8 +69,8 @@
+Index: gnome-panel-2.20.1/gnome-panel/panel-menu-button.c
+===================================================================
+--- gnome-panel-2.20.1.orig/gnome-panel/panel-menu-button.c	2007-10-15 22:00:47.000000000 +0200
++++ gnome-panel-2.20.1/gnome-panel/panel-menu-button.c	2007-12-26 11:46:06.091893336 +0100
+@@ -70,8 +70,8 @@ typedef struct {
  } MenuPathRootItem;
  
  static MenuPathRootItem root_items [] = {

Modified: desktop/unstable/gnome-panel/debian/patches/02_switch-user_lock.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/02_switch-user_lock.patch?rev=14006&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/02_switch-user_lock.patch (original)
+++ desktop/unstable/gnome-panel/debian/patches/02_switch-user_lock.patch Wed Dec 26 10:46:49 2007
@@ -1,5 +1,7 @@
---- gnome-panel/panel-logout.c.orig	2007-10-13 00:01:41.928750440 +0200
-+++ gnome-panel/panel-logout.c	2007-10-13 00:12:52.526965655 +0200
+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 @@
  #include "panel-power-manager.h"
  #include "panel-session.h"
@@ -8,7 +10,7 @@
  
  #define PANEL_LOGOUT_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_LOGOUT_DIALOG, PanelLogoutDialogPrivate))
  
-@@ -169,8 +170,10 @@
+@@ -169,8 +170,10 @@ panel_logout_response (PanelLogoutDialog
  		       gpointer   data)
  {
  	PanelPowerManager *power_manager;
@@ -19,7 +21,7 @@
  	gtk_widget_destroy (GTK_WIDGET (logout_dialog));
  
  	switch (response_id) {
-@@ -181,6 +184,7 @@
+@@ -181,6 +184,7 @@ panel_logout_response (PanelLogoutDialog
  		panel_session_request_logout ();
  		break;
  	case PANEL_LOGOUT_RESPONSE_SWITCH_USER:
@@ -27,7 +29,7 @@
  		gdm_new_login ();
  		break;
  	case PANEL_LOGOUT_RESPONSE_SHUTDOWN:
-@@ -206,6 +210,7 @@
+@@ -206,6 +210,7 @@ panel_logout_response (PanelLogoutDialog
  		g_assert_not_reached ();
  	}
  	g_object_unref (power_manager);

Modified: desktop/unstable/gnome-panel/debian/patches/05_missing_includes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/05_missing_includes.patch?rev=14006&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/05_missing_includes.patch (original)
+++ desktop/unstable/gnome-panel/debian/patches/05_missing_includes.patch Wed Dec 26 10:46:49 2007
@@ -1,9 +1,10 @@
 GNOME #436836; Debian #314692.
 
-diff -urN gnome-panel-2.10.1.orig/applets/clock/clock.c gnome-panel-2.10.1/applets/clock/clock.c
---- gnome-panel-2.10.1.orig/applets/clock/clock.c	2005-03-07 07:15:15.000000000 -0700
-+++ gnome-panel-2.10.1/applets/clock/clock.c	2005-06-17 13:44:44.149885607 -0600
-@@ -41,6 +41,7 @@
+Index: gnome-panel-2.20.1/applets/clock/clock.c
+===================================================================
+--- gnome-panel-2.20.1.orig/applets/clock/clock.c	2007-10-15 22:00:49.000000000 +0200
++++ gnome-panel-2.20.1/applets/clock/clock.c	2007-12-26 11:46:28.397164441 +0100
+@@ -31,6 +31,7 @@
  
  #include "config.h"
  
@@ -11,13 +12,15 @@
  #include <stdio.h>
  #include <sys/stat.h>
  #include <unistd.h>
-diff -urN gnome-panel-2.10.1.orig/gnome-panel/panel.c gnome-panel-2.10.1/gnome-panel/panel.c
---- gnome-panel-2.10.1.orig/gnome-panel/panel.c	2005-03-31 13:05:04.000000000 -0700
-+++ gnome-panel-2.10.1/gnome-panel/panel.c	2005-06-17 13:43:21.107894436 -0600
-@@ -23,6 +23,7 @@
+Index: gnome-panel-2.20.1/gnome-panel/panel.c
+===================================================================
+--- gnome-panel-2.20.1.orig/gnome-panel/panel.c	2007-10-15 22:00:47.000000000 +0200
++++ gnome-panel-2.20.1/gnome-panel/panel.c	2007-12-26 11:46:28.397164441 +0100
+@@ -24,6 +24,7 @@
  #include <libgnomevfs/gnome-vfs-ops.h>
  #include <libgnomevfs/gnome-vfs-mime-handlers.h>
  #include <libgnomevfs/gnome-vfs-file-info.h>
 +#include <libgnomevfs/gnome-vfs-utils.h>
  
  #include "panel.h"
+ 

Modified: desktop/unstable/gnome-panel/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/99_ltmain_as-needed.patch?rev=14006&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/99_ltmain_as-needed.patch (original)
+++ desktop/unstable/gnome-panel/debian/patches/99_ltmain_as-needed.patch Wed Dec 26 10:46:49 2007
@@ -1,8 +1,8 @@
-Index: nautilus-2.18.1/ltmain.sh
+Index: gnome-panel-2.20.1/ltmain.sh
 ===================================================================
---- nautilus-2.18.1.orig/ltmain.sh	2006-07-13 09:12:13.000000000 +0200
-+++ nautilus-2.18.1/ltmain.sh	2007-06-06 23:36:38.899175453 +0200
-@@ -1784,6 +1784,11 @@
+--- gnome-panel-2.20.1.orig/ltmain.sh	2007-02-17 10:05:30.000000000 +0100
++++ gnome-panel-2.20.1/ltmain.sh	2007-12-26 11:47:01.031024139 +0100
+@@ -1754,6 +1754,11 @@ EOF
  	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
  	;;
  
@@ -14,7 +14,7 @@
        -Wl,*)
  	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
  	arg=
-@@ -2124,6 +2129,15 @@
+@@ -2094,6 +2099,15 @@ EOF
  	lib=
  	found=no
  	case $deplib in

Added: desktop/unstable/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/series?rev=14006&op=file
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/series (added)
+++ desktop/unstable/gnome-panel/debian/patches/series Wed Dec 26 10:46:49 2007
@@ -1,0 +1,5 @@
+01_panel_submenus.patch
+02_switch-user_lock.patch
+05_missing_includes.patch
+60_caldav-clock-appointments.patch
+99_ltmain_as-needed.patch

Modified: desktop/unstable/gnome-panel/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/rules?rev=14006&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/rules (original)
+++ desktop/unstable/gnome-panel/debian/rules Wed Dec 26 10:46:49 2007
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk

More information about the pkg-gnome-commits mailing list