r33755 - in /packages/unstable/anjuta-extras/debian: changelog patches/10_scratchbox_path.patch patches/99_ltmain_as-needed.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Mar 29 23:24:34 2012
New Revision: 33755

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33755
Log:
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.

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

Modified: packages/unstable/anjuta-extras/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/anjuta-extras/debian/changelog?rev=33755&op=diff
==============================================================================
--- packages/unstable/anjuta-extras/debian/changelog [utf-8] (original)
+++ packages/unstable/anjuta-extras/debian/changelog [utf-8] Thu Mar 29 23:24:34 2012
@@ -6,8 +6,11 @@
   * Bump Build-Depends on libanjuta-dev to (>= 2:3.4.0).
   * 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.
 
- -- Michael Biebl <biebl at debian.org>  Fri, 30 Mar 2012 00:48:07 +0200
+ -- Michael Biebl <biebl at debian.org>  Fri, 30 Mar 2012 01:19:43 +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=33755&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:24:34 2012
@@ -1,22 +1,18 @@
---- a/plugins/scratchbox/plugin.c
-+++ b/plugins/scratchbox/plugin.c
-@@ -39,7 +39,7 @@
- #define GLADE_FILE PACKAGE_DATA_DIR "/glade/anjuta-scratchbox.ui"
- 
- #define SB_SCHEMA "org.gnome.anjuta.scratchbox"
--#define SB_ENTRY "preferences_folder:text:/scratchbox:0:build-scratchbox-path"
-+#define SB_ENTRY "preferences_folder:text:/usr:0:build-scratchbox-path"
- #define SB_TARGET_ENTRY "preferences_combo:text:None:0:scratchbox-target"
- #define SB_SBOX_ENTRY "preferences_combo:text:Sbox1,Sbox2:0:scratchbox-version"
- 
---- a/plugins/scratchbox/anjuta-scratchbox.ui
-+++ b/plugins/scratchbox/anjuta-scratchbox.ui
-@@ -106,7 +106,7 @@
-                   </packing>
-                 </child>
-                 <child>
--                  <object class="GtkFileChooserButton" id="preferences_folder:text:/scratchbox:0:build-scratchbox-path">
-+                  <object class="GtkFileChooserButton" id="preferences_folder:text:/usr:0:build-scratchbox-path">
-                     <property name="visible">True</property>
-                     <property name="can_focus">False</property>
-                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+Description: Set default path for scratchbox sb*_config tools
+ 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".
+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 @@
+ <schemalist>
+ 	<schema id="org.gnome.anjuta.plugins.scratchbox" path="/org/gnome/anjuta/plugins/scratchbox/">
+ 		<key name="build-path" type="s">
+-			<default>"/scratchbox"</default>
++			<default>"/usr"</default>
+ 		</key>
+ 		<key name="version" type="s">
+ 			<choices>

Modified: packages/unstable/anjuta-extras/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/anjuta-extras/debian/patches/99_ltmain_as-needed.patch?rev=33755&op=diff
==============================================================================
--- packages/unstable/anjuta-extras/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ packages/unstable/anjuta-extras/debian/patches/99_ltmain_as-needed.patch [utf-8] Thu Mar 29 23:24:34 2012
@@ -1,6 +1,8 @@
---- a/ltmain.sh
-+++ b/ltmain.sh
-@@ -4716,6 +4716,11 @@
+Index: anjuta-extras-3.4.0/ltmain.sh
+===================================================================
+--- anjuta-extras-3.4.0.orig/ltmain.sh	2012-03-27 01:06:51.000000000 +0200
++++ anjuta-extras-3.4.0/ltmain.sh	2012-03-30 00:28:13.925933950 +0200
+@@ -5787,6 +5787,11 @@
  	arg=$func_stripname_result
  	;;
  
@@ -12,7 +14,7 @@
        -Wl,*)
  	func_stripname '-Wl,' '' "$arg"
  	args=$func_stripname_result
-@@ -5070,6 +5075,15 @@
+@@ -6150,6 +6155,15 @@
  	lib=
  	found=no
  	case $deplib in