r33756 - in /packages/unstable/anjuta-extras/debian: changelog patches/10_scratchbox_path.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Mar 29 23:38:19 2012
New Revision: 33756

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33756
Log:
  gsettings to set the default build_path. Set the default version to Sbox2.
  Add a patch header explaining why this patch is necessary.

Modified:
    packages/unstable/anjuta-extras/debian/changelog
    packages/unstable/anjuta-extras/debian/patches/10_scratchbox_path.patch

Modified: packages/unstable/anjuta-extras/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/anjuta-extras/debian/changelog?rev=33756&op=diff
==============================================================================
--- packages/unstable/anjuta-extras/debian/changelog [utf-8] (original)
+++ packages/unstable/anjuta-extras/debian/changelog [utf-8] Thu Mar 29 23:38:19 2012
@@ -7,10 +7,10 @@
   * Use gnome:Version and gnome:NextVersion for the dependency on anjuta
     instead of hard-coding the versions.
   * debian/patches/10_scratchbox_path.patch: Updated, the new version uses
-    gsettings to set the default build_path. Add a patch header explaining why
-    this patch is necessary.
+    gsettings to set the default build_path. Set the default version to Sbox2.
+    Add a patch header explaining why this patch is necessary.
 
- -- Michael Biebl <biebl at debian.org>  Fri, 30 Mar 2012 01:19:43 +0200
+ -- Michael Biebl <biebl at debian.org>  Fri, 30 Mar 2012 01:37:27 +0200
 
 anjuta-extras (3.2.0-2) unstable; urgency=low
 

Modified: packages/unstable/anjuta-extras/debian/patches/10_scratchbox_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/anjuta-extras/debian/patches/10_scratchbox_path.patch?rev=33756&op=diff
==============================================================================
--- packages/unstable/anjuta-extras/debian/patches/10_scratchbox_path.patch [utf-8] (original)
+++ packages/unstable/anjuta-extras/debian/patches/10_scratchbox_path.patch [utf-8] Thu Mar 29 23:38:19 2012
@@ -1,13 +1,15 @@
-Description: Set default path for scratchbox sb*_config tools
+Description: Set default path for scratchbox sb2_config tool
  The scratchbox2 package in Debian installs the sb2_config tool in /usr/bin.
  This tool is used by the anjuta scratchbox plugin to configure the scratchbox
  login. As the plugins searches for $(build_path)/bin/sb*_config, set the
  default value for build_path to "/usr".
+ Also set default version to Sbox2, as scratchbox2 is the only available
+ version in the Debian archive.
 Index: anjuta-extras-3.4.0/plugins/scratchbox/org.gnome.anjuta.plugins.scratchbox.gschema.xml.in
 ===================================================================
 --- anjuta-extras-3.4.0.orig/plugins/scratchbox/org.gnome.anjuta.plugins.scratchbox.gschema.xml.in	2012-03-18 23:51:40.000000000 +0100
-+++ anjuta-extras-3.4.0/plugins/scratchbox/org.gnome.anjuta.plugins.scratchbox.gschema.xml.in	2012-03-30 01:13:33.853837745 +0200
-@@ -1,7 +1,7 @@
++++ anjuta-extras-3.4.0/plugins/scratchbox/org.gnome.anjuta.plugins.scratchbox.gschema.xml.in	2012-03-30 01:35:31.765791129 +0200
+@@ -1,14 +1,14 @@
  <schemalist>
  	<schema id="org.gnome.anjuta.plugins.scratchbox" path="/org/gnome/anjuta/plugins/scratchbox/">
  		<key name="build-path" type="s">
@@ -16,3 +18,11 @@
  		</key>
  		<key name="version" type="s">
  			<choices>
+ 				<choice value="Sbox1" />
+ 				<choice value="Sbox2" />
+ 			</choices>
+-			<default>"Sbox1"</default>
++			<default>"Sbox2"</default>
+ 		</key>
+ 		<key name="target" type="s">
+ 			<default>"None"</default>