r28687 - in /packages/experimental/anjuta-extras/debian: changelog patches/10_scratchbox_config.patch

[jordi at users.alioth.debian.org]

Author: jordi
Date: Tue Jun 28 11:19:56 2011
New Revision: 28687

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28687
Log:
Updated 10_scratchbox_config.patch.

Modified:
    packages/experimental/anjuta-extras/debian/changelog
    packages/experimental/anjuta-extras/debian/patches/10_scratchbox_config.patch

Modified: packages/experimental/anjuta-extras/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/anjuta-extras/debian/changelog?rev=28687&op=diff
==============================================================================
--- packages/experimental/anjuta-extras/debian/changelog [utf-8] (original)
+++ packages/experimental/anjuta-extras/debian/changelog [utf-8] Tue Jun 28 11:19:56 2011
@@ -4,7 +4,7 @@
   * New upstream release.
   * Update Build-Dependencies as per configure.ac.
   * Add anjuta_required.patch, to allow building with libanjuta 3.0.
-  * TODO: Update scratchbox_config.patch.
+  * Updated 10_scratchbox_config.patch.
   * Drop valgrid-related quirks from debian/rules, the plugin is gone.
   * Drop libxml_crash.patch, the plugin is gone.
 
@@ -17,7 +17,7 @@
     - Add autoreconf.mk include.
   * Bump debhelper compatibility level to 8. Update Build-Depends accordingly.
 
- -- Michael Biebl <biebl at debian.org>  Fri, 24 Jun 2011 07:32:47 +0200
+ -- Jordi Mallach <jordi at debian.org>  Tue, 28 Jun 2011 13:18:13 +0200
 
 anjuta-extras (2.32.0.0-3) unstable; urgency=low
 

Modified: packages/experimental/anjuta-extras/debian/patches/10_scratchbox_config.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/anjuta-extras/debian/patches/10_scratchbox_config.patch?rev=28687&op=diff
==============================================================================
--- packages/experimental/anjuta-extras/debian/patches/10_scratchbox_config.patch [utf-8] (original)
+++ packages/experimental/anjuta-extras/debian/patches/10_scratchbox_config.patch [utf-8] Tue Jun 28 11:19:56 2011
@@ -1,5 +1,5 @@
---- anjuta-extras.orig/plugins/scratchbox/anjuta-scratchbox.ui	2009-10-09 22:25:53.000000000 +0200
-+++ anjuta-extras/plugins/scratchbox/anjuta-scratchbox.ui	2009-10-10 00:04:56.000000000 +0200
+--- a/plugins/scratchbox/anjuta-scratchbox.ui
++++ b/plugins/scratchbox/anjuta-scratchbox.ui
 @@ -7,10 +7,10 @@
      </columns>
      <data>
@@ -17,8 +17,8 @@
                    </packing>
                  </child>
                  <child>
--                  <object class="GtkComboBox" id="preferences_combo:text:Sbox1,Sbox2:0:scratchbox.version">
-+                  <object class="GtkComboBox" id="preferences_combo:text:Sbox2,Sbox1:0:scratchbox.version">
+-                  <object class="GtkComboBox" id="preferences_combo:text:Sbox1,Sbox2:0:scratchbox-version">
++                  <object class="GtkComboBox" id="preferences_combo:text:Sbox2,Sbox1:0:scratchbox-version">
                      <property name="visible">True</property>
                      <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                      <property name="model">model1</property>
@@ -26,22 +26,22 @@
                    </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">
+-                  <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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                      <property name="preview_widget_active">False</property>
---- anjuta-extras.orig/plugins/scratchbox/plugin.c	2009-10-09 22:23:56.000000000 +0200
-+++ anjuta-extras/plugins/scratchbox/plugin.c	2009-10-09 22:37:40.000000000 +0200
-@@ -38,9 +38,9 @@
- #define ICON_FILE "anjuta-scratchbox-48.png"
+--- a/plugins/scratchbox/plugin.c
++++ b/plugins/scratchbox/plugin.c
+@@ -39,9 +39,9 @@
  #define GLADE_FILE PACKAGE_DATA_DIR"/glade/anjuta-scratchbox.ui"
  
--#define SB_ENTRY "preferences_folder:text:/scratchbox:0:build.scratchbox.path"
-+#define SB_ENTRY "preferences_folder:text:/usr:0:build.scratchbox.path"
+ #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 "combo_target"
--#define SB_SBOX_ENTRY "preferences_combo:text:Sbox1,Sbox2:0:scratchbox.version"
-+#define SB_SBOX_ENTRY "preferences_combo:text:Sbox2,Sbox1:0:scratchbox.version"
+-#define SB_SBOX_ENTRY "preferences_combo:text:Sbox1,Sbox2:0:scratchbox-version"
++#define SB_SBOX_ENTRY "preferences_combo:text:Sbox2,Sbox1:0:scratchbox-version"
  
- #define PREF_SB_PATH "build.scratchbox.path"
- #define PREF_SB_VERSION "scratchbox.version"
+ #define PREF_SB_PATH "build-scratchbox-path"
+ #define PREF_SB_VERSION "scratchbox-version"