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

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Jun 26 08:18:36 2010
New Revision: 24599

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24599
Log:
05_36_workspaces.patch: patch from Bas van Sisseren. Fix assertion 
failure when more than 16 workspaces are defined.
Closes: #576651, #586207.

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

Modified: desktop/unstable/metacity/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/changelog?rev=24599&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/changelog [utf-8] (original)
+++ desktop/unstable/metacity/debian/changelog [utf-8] Sat Jun 26 08:18:36 2010
@@ -1,3 +1,11 @@
+metacity (1:2.30.1-3) UNRELEASED; urgency=low
+
+  * 05_36_workspaces.patch: patch from Bas van Sisseren. Fix assertion 
+    failure when more than 16 workspaces are defined.
+    Closes: #576651, #586207.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 26 Jun 2010 10:17:12 +0200
+
 metacity (1:2.30.1-2) unstable; urgency=low
 
   * Refresh 02_restart_hint.patch.

Added: 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=24599&op=file
==============================================================================
--- desktop/unstable/metacity/debian/patches/05_36_workspaces.patch (added)
+++ desktop/unstable/metacity/debian/patches/05_36_workspaces.patch [utf-8] Sat Jun 26 08:18:36 2010
@@ -1,0 +1,31 @@
+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
+@@ -7820,6 +7820,26 @@
+       <applyto>/apps/metacity/workspace_names/name_14</applyto>
+       <applyto>/apps/metacity/workspace_names/name_15</applyto>
+       <applyto>/apps/metacity/workspace_names/name_16</applyto>
++      <applyto>/apps/metacity/workspace_names/name_17</applyto>
++      <applyto>/apps/metacity/workspace_names/name_18</applyto>
++      <applyto>/apps/metacity/workspace_names/name_19</applyto>
++      <applyto>/apps/metacity/workspace_names/name_20</applyto>
++      <applyto>/apps/metacity/workspace_names/name_21</applyto>
++      <applyto>/apps/metacity/workspace_names/name_22</applyto>
++      <applyto>/apps/metacity/workspace_names/name_23</applyto>
++      <applyto>/apps/metacity/workspace_names/name_24</applyto>
++      <applyto>/apps/metacity/workspace_names/name_25</applyto>
++      <applyto>/apps/metacity/workspace_names/name_26</applyto>
++      <applyto>/apps/metacity/workspace_names/name_27</applyto>
++      <applyto>/apps/metacity/workspace_names/name_28</applyto>
++      <applyto>/apps/metacity/workspace_names/name_29</applyto>
++      <applyto>/apps/metacity/workspace_names/name_30</applyto>
++      <applyto>/apps/metacity/workspace_names/name_31</applyto>
++      <applyto>/apps/metacity/workspace_names/name_32</applyto>
++      <applyto>/apps/metacity/workspace_names/name_33</applyto>
++      <applyto>/apps/metacity/workspace_names/name_34</applyto>
++      <applyto>/apps/metacity/workspace_names/name_35</applyto>
++      <applyto>/apps/metacity/workspace_names/name_36</applyto>
+       <owner>metacity</owner>
+       <type>string</type>
+       <default></default>

Modified: desktop/unstable/metacity/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/patches/series?rev=24599&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/patches/series [utf-8] (original)
+++ desktop/unstable/metacity/debian/patches/series [utf-8] Sat Jun 26 08:18:36 2010
@@ -2,5 +2,6 @@
 02_restart_hint.patch
 03_gtop_error.patch
 04_gdk_grab_tracking.patch
+05_36_workspaces.patch
 90_autotools.patch
 99_ltmain_as-needed.patch