r24295 - in /desktop/unstable/metacity/debian: changelog control control.in patches/02_restart_hint.patch patches/03_gtop_error.patch patches/series rules source/ source/format

joss at users.alioth.debian.org joss at users.alioth.debian.org
Fri May 7 19:30:22 UTC 2010 

Author: joss
Date: Fri May  7 19:30:21 2010
New Revision: 24295

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24295
Log:
* Refresh 02_restart_hint.patch.
* 03_gtop_error.patch: patch from Tomaž Šolc to handle libgtop errors.
  Closes: #549290.
* Switch to 3.0 source format.

Added:
    desktop/unstable/metacity/debian/patches/03_gtop_error.patch
    desktop/unstable/metacity/debian/source/
    desktop/unstable/metacity/debian/source/format
Modified:
    desktop/unstable/metacity/debian/changelog
    desktop/unstable/metacity/debian/control
    desktop/unstable/metacity/debian/control.in
    desktop/unstable/metacity/debian/patches/02_restart_hint.patch
    desktop/unstable/metacity/debian/patches/series
    desktop/unstable/metacity/debian/rules

Modified: desktop/unstable/metacity/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/changelog?rev=24295&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/changelog [utf-8] (original)
+++ desktop/unstable/metacity/debian/changelog [utf-8] Fri May  7 19:30:21 2010
@@ -1,3 +1,12 @@
+metacity (1:2.30.1-2) UNRELEASED; urgency=low
+
+  * Refresh 02_restart_hint.patch.
+  * 03_gtop_error.patch: patch from Tomaž Šolc to handle libgtop errors.
+    Closes: #549290.
+  * Switch to 3.0 source format.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 07 May 2010 21:28:05 +0200
+
 metacity (1:2.30.1-1) unstable; urgency=low
 
   * New upstream stable release:

Modified: desktop/unstable/metacity/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/control?rev=24295&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/control [utf-8] (original)
+++ desktop/unstable/metacity/debian/control [utf-8] Fri May  7 19:30:21 2010
@@ -10,7 +10,6 @@
 Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
-               quilt,
                intltool (>= 0.34.90),
                libgtk2.0-dev (>= 2.10.0),
                libpango1.0-dev (>= 1.2.0),

Modified: desktop/unstable/metacity/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/control.in?rev=24295&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/control.in [utf-8] (original)
+++ desktop/unstable/metacity/debian/control.in [utf-8] Fri May  7 19:30:21 2010
@@ -5,7 +5,6 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
-               quilt,
                intltool (>= 0.34.90),
                libgtk2.0-dev (>= 2.10.0),
                libpango1.0-dev (>= 1.2.0),

Modified: desktop/unstable/metacity/debian/patches/02_restart_hint.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/patches/02_restart_hint.patch?rev=24295&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/patches/02_restart_hint.patch [utf-8] (original)
+++ desktop/unstable/metacity/debian/patches/02_restart_hint.patch [utf-8] Fri May  7 19:30:21 2010
@@ -30,11 +30,11 @@
  src/core/session.c         |    8 --------
  4 files changed, 7 insertions(+), 24 deletions(-)
 
-diff --git a/src/core/display-private.h b/src/core/display-private.h
-index 19287f3..9c8ebc6 100644
---- a/src/core/display-private.h
-+++ b/src/core/display-private.h
-@@ -329,7 +329,7 @@ MetaScreen*   meta_display_screen_for_xwindow  (MetaDisplay *display,
+Index: metacity-2.30.1/src/core/display-private.h
+===================================================================
+--- metacity-2.30.1.orig/src/core/display-private.h	2009-05-02 04:23:00.000000000 +0200
++++ metacity-2.30.1/src/core/display-private.h	2010-05-07 21:27:02.028395432 +0200
+@@ -329,7 +329,7 @@ MetaScreen*   meta_display_screen_for_xw
  void          meta_display_grab                (MetaDisplay *display);
  void          meta_display_ungrab              (MetaDisplay *display);
  
@@ -43,11 +43,11 @@
                                                  MetaScreen  *screen,
                                                  guint32      timestamp);
  
-diff --git a/src/core/display.c b/src/core/display.c
-index 55c374a..8e35a35 100644
---- a/src/core/display.c
-+++ b/src/core/display.c
-@@ -926,7 +926,7 @@ meta_display_close (MetaDisplay *display,
+Index: metacity-2.30.1/src/core/display.c
+===================================================================
+--- metacity-2.30.1.orig/src/core/display.c	2010-01-20 23:00:51.000000000 +0100
++++ metacity-2.30.1/src/core/display.c	2010-05-07 21:27:02.028395432 +0200
+@@ -926,7 +926,7 @@ meta_display_close (MetaDisplay *display
      meta_compositor_destroy (display->compositor);
    
    g_free (display);
@@ -56,7 +56,7 @@
  
    meta_quit (META_EXIT_SUCCESS);
  }
-@@ -4762,13 +4762,10 @@ process_selection_clear (MetaDisplay   *display,
+@@ -4762,13 +4762,10 @@ process_selection_clear (MetaDisplay   *
        meta_verbose ("Got selection clear for screen %d on display %s\n",
                      screen->number, display->name);
        
@@ -71,7 +71,7 @@
        /* display and screen may both be invalid memory... */
        
        return;
-@@ -4790,12 +4787,10 @@ process_selection_clear (MetaDisplay   *display,
+@@ -4790,12 +4787,10 @@ process_selection_clear (MetaDisplay   *
  }
  
  void
@@ -85,7 +85,7 @@
    meta_verbose ("Unmanaging screen %d on display %s\n",
                  screen->number, display->name);
    
-@@ -4805,10 +4800,7 @@ meta_display_unmanage_screen (MetaDisplay **displayp,
+@@ -4805,10 +4800,7 @@ meta_display_unmanage_screen (MetaDispla
    display->screens = g_slist_remove (display->screens, screen);
  
    if (display->screens == NULL)
@@ -97,11 +97,11 @@
  }
  
  void
-diff --git a/src/core/main.c b/src/core/main.c
-index a36a396..44d317e 100644
---- a/src/core/main.c
-+++ b/src/core/main.c
-@@ -361,12 +361,11 @@ static void
+Index: metacity-2.30.1/src/core/main.c
+===================================================================
+--- metacity-2.30.1.orig/src/core/main.c	2010-01-15 01:31:32.000000000 +0100
++++ metacity-2.30.1/src/core/main.c	2010-05-07 21:27:02.032396011 +0200
+@@ -362,12 +362,11 @@ static void
  meta_finalize (void)
  {
    MetaDisplay *display = meta_get_display();
@@ -115,12 +115,12 @@
 +  meta_session_shutdown ();
  }
  
- static void
-diff --git a/src/core/session.c b/src/core/session.c
-index 7e3b389..0d69350 100644
---- a/src/core/session.c
-+++ b/src/core/session.c
-@@ -376,14 +376,6 @@ meta_session_shutdown (void)
+ static int sigterm_pipe_fds[2] = { -1, -1 };
+Index: metacity-2.30.1/src/core/session.c
+===================================================================
+--- metacity-2.30.1.orig/src/core/session.c	2010-01-15 01:31:32.000000000 +0100
++++ metacity-2.30.1/src/core/session.c	2010-05-07 21:27:02.032396011 +0200
+@@ -381,14 +381,6 @@ meta_session_shutdown (void)
    SmProp *props[1];
    char hint = SmRestartIfRunning;
  
@@ -135,5 +135,3 @@
    if (session_connection == NULL)
      return;
    
--- 
-1.6.4

Added: desktop/unstable/metacity/debian/patches/03_gtop_error.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/patches/03_gtop_error.patch?rev=24295&op=file
==============================================================================
--- desktop/unstable/metacity/debian/patches/03_gtop_error.patch (added)
+++ desktop/unstable/metacity/debian/patches/03_gtop_error.patch [utf-8] Fri May  7 19:30:21 2010
@@ -1,0 +1,20 @@
+--- metacity-2.28.0/src/core/window-props.c	2009-09-08 22:55:35.000000000 +0200
++++ metacity-2.28.0-tomaz/src/core/window-props.c	2010-02-16 11:38:50.000000000 +0100
+@@ -337,8 +337,15 @@
+       
+   glibtop_get_proc_uid (&process_details, process);
+ 
+-  *result = process_details.uid;
+-  return TRUE;
++  if (process_details.flags & (1L << GLIBTOP_PROC_UID_UID) ) 
++    {
++      *result = process_details.uid;
++      return TRUE;
++    }
++  else
++    {
++      return FALSE;
++    }
+ #else
+   /* I don't know, maybe we could do something hairy like see whether
+    * /proc/$PID exists and who owns it, in case they have procfs.

Modified: desktop/unstable/metacity/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/patches/series?rev=24295&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/patches/series [utf-8] (original)
+++ desktop/unstable/metacity/debian/patches/series [utf-8] Fri May  7 19:30:21 2010
@@ -1,4 +1,5 @@
 01_Wcast-align.patch
 02_restart_hint.patch
+03_gtop_error.patch
 90_autotools.patch
 99_ltmain_as-needed.patch

Modified: desktop/unstable/metacity/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/rules?rev=24295&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/rules [utf-8] (original)
+++ desktop/unstable/metacity/debian/rules [utf-8] Fri May  7 19:30:21 2010
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk

Added: desktop/unstable/metacity/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/source/format?rev=24295&op=file
==============================================================================
--- desktop/unstable/metacity/debian/source/format (added)
+++ desktop/unstable/metacity/debian/source/format [utf-8] Fri May  7 19:30:21 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the pkg-gnome-commits mailing list