r25293 - in /desktop/unstable/metacity/debian: changelog patches/05_36_workspaces.patch

[pochu at users.alioth.debian.org]

Author: pochu
Date: Mon Oct  4 23:05:38 2010
New Revision: 25293

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25293
Log:
* debian/patches/05_36_workspaces.patch:
  - Apply the patch to the correct file.

Modified:
    desktop/unstable/metacity/debian/changelog
    desktop/unstable/metacity/debian/patches/05_36_workspaces.patch

Modified: desktop/unstable/metacity/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/changelog?rev=25293&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/changelog [utf-8] (original)
+++ desktop/unstable/metacity/debian/changelog [utf-8] Mon Oct  4 23:05:38 2010
@@ -1,10 +1,15 @@
-metacity (1:2.30.1-3) UNRELEASED; urgency=low
-
+metacity (1:2.30.1-3) unstable; urgency=low
+
+  [ Josselin Mouette ]
   * 05_36_workspaces.patch: patch from Bas van Sisseren. Fix assertion 
     failure when more than 16 workspaces are defined.
     Closes: #576651, #586207, #598016.
 
- -- Josselin Mouette <joss at debian.org>  Sat, 26 Jun 2010 10:17:12 +0200
+  [ Emilio Pozuelo Monfort ]
+  * debian/patches/05_36_workspaces.patch:
+    - Apply the patch to the correct file.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 05 Oct 2010 01:04:28 +0200
 
 metacity (1:2.30.1-2) unstable; urgency=low
 

Modified: desktop/unstable/metacity/debian/patches/05_36_workspaces.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/patches/05_36_workspaces.patch?rev=25293&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/patches/05_36_workspaces.patch [utf-8] (original)
+++ desktop/unstable/metacity/debian/patches/05_36_workspaces.patch [utf-8] Mon Oct  4 23:05:38 2010
@@ -1,7 +1,7 @@
 Index: metacity-2.30.1/src/metacity.schemas
 ===================================================================
---- metacity-2.30.1.orig/src/metacity.schemas	2010-06-26 10:14:38.939033168 +0200
-+++ metacity-2.30.1/src/metacity.schemas	2010-06-26 10:16:50.547037251 +0200
+--- metacity-2.30.1.orig/src/metacity.schemas.in.in	2010-06-26 10:14:38.939033168 +0200
++++ metacity-2.30.1/src/metacity.schemas.in.in	2010-06-26 10:16:50.547037251 +0200
 @@ -7820,6 +7820,26 @@
        <applyto>/apps/metacity/workspace_names/name_14</applyto>
        <applyto>/apps/metacity/workspace_names/name_15</applyto>