[Pkg-mono-svn-commits] rev 2908 - in non-group/banshee: tags tags/0.11.4+dfsg-1/debian tags/0.11.4+dfsg-1/debian/patches trunk/debian trunk/debian/patches

Sebastian Dröge slomo at alioth.debian.org
Mon Jan 15 21:03:16 CET 2007


Author: slomo
Date: 2007-01-15 21:03:16 +0100 (Mon, 15 Jan 2007)
New Revision: 2908

Added:
   non-group/banshee/tags/0.11.4+dfsg-1/
   non-group/banshee/tags/0.11.4+dfsg-1/debian/patches/02_no-gconfd.patch
   non-group/banshee/trunk/debian/patches/02_no-gconfd.patch
Modified:
   non-group/banshee/tags/0.11.4+dfsg-1/debian/changelog
   non-group/banshee/tags/0.11.4+dfsg-1/debian/rules
   non-group/banshee/trunk/debian/changelog
   non-group/banshee/trunk/debian/rules
Log:
* update and tag banshee 0.11.4+dfsg-1 and upload to experimental


Copied: non-group/banshee/tags/0.11.4+dfsg-1 (from rev 2907, non-group/banshee/trunk)

Modified: non-group/banshee/tags/0.11.4+dfsg-1/debian/changelog
===================================================================
--- non-group/banshee/trunk/debian/changelog	2007-01-15 14:12:03 UTC (rev 2907)
+++ non-group/banshee/tags/0.11.4+dfsg-1/debian/changelog	2007-01-15 20:03:16 UTC (rev 2908)
@@ -13,6 +13,9 @@
   * debian/Banshee.Plugins.Radio.dll.config,
     debian/banshee.install:
     + Add missing dllmap
+  * debian/patches/02_no-gconfd.patch,
+    debian/rules:
+    + Don't require a running gconfd-2
 
  -- Sebastian Dröge <slomo at debian.org>  Mon, 15 Jan 2007 13:58:24 +0100
 

Added: non-group/banshee/tags/0.11.4+dfsg-1/debian/patches/02_no-gconfd.patch
===================================================================
--- non-group/banshee/trunk/debian/patches/02_no-gconfd.patch	2007-01-15 14:12:03 UTC (rev 2907)
+++ non-group/banshee/tags/0.11.4+dfsg-1/debian/patches/02_no-gconfd.patch	2007-01-15 20:03:16 UTC (rev 2908)
@@ -0,0 +1,70 @@
+Index: src/Core/Banshee.Base/Banshee.Configuration/GConfConfigurationClient.cs
+===================================================================
+--- src/Core/Banshee.Base/Banshee.Configuration/GConfConfigurationClient.cs	(revision 1980)
++++ src/Core/Banshee.Base/Banshee.Configuration/GConfConfigurationClient.cs	(working copy)
+@@ -42,6 +42,20 @@
+         private GConf.Client client;
+         private Dictionary<string, string> key_table = new Dictionary<string, string>();
+         
++        private static bool disable_gconf_checked = false;
++        private static bool disable_gconf = false;
++        
++        private static bool DisableGConf {
++            get { 
++                if(!disable_gconf_checked) {
++                    disable_gconf = Globals.EnvironmentIsSet("BANSHEE_DISABLE_GCONF");
++                    disable_gconf_checked = true;
++                }
++                
++                return disable_gconf;
++            }
++        }
++        
+         public static string BaseKey {
+             get { return base_key; }
+         }
+@@ -81,13 +95,17 @@
+         
+         public T Get<T>(string namespce, string key, T fallback)
+         {
++            if(DisableGConf) {
++                return fallback;
++            }
++            
+             if(client == null) {
+                 client = new GConf.Client();
+             }
+             
+             try {
+                 return (T)client.Get(CreateKey(namespce, key));
+-            } catch(GConf.NoSuchKeyException) {
++            } catch {
+                 return fallback;
+             }
+         }
+@@ -104,6 +122,10 @@
+         
+         public void Set<T>(string namespce, string key, T value)
+         {
++            if(DisableGConf) {
++                return;
++            }
++            
+             if(client == null) {
+                 client = new GConf.Client();
+             }
+Index: build/gconf-schema-rules
+===================================================================
+--- build/gconf-schema-rules	(revision 1979)
++++ build/gconf-schema-rules	(working copy)
+@@ -4,7 +4,7 @@
+ 
+ $(srcdir)/$(ASSEMBLY_GCONF_SCHEMA): $(ASSEMBLY)
+ 	if test -w $@ -o \( ! -e $@ -a -w $(srcdir) \); then \
+-		MONO_PATH=$(MONO_BASE_PATH) $(MONO) $(top_builddir)/build/gconf-schema-extractor.exe $< $(srcdir)/$@; \
++		BANSHEE_DISABLE_GCONF=1 MONO_PATH=$(MONO_BASE_PATH) $(MONO) $(top_builddir)/build/gconf-schema-extractor.exe $< $(srcdir)/$@; \
+ 	fi
+ 
+ @INTLTOOL_SCHEMAS_RULE@
+
+

Modified: non-group/banshee/tags/0.11.4+dfsg-1/debian/rules
===================================================================
--- non-group/banshee/trunk/debian/rules	2007-01-15 14:12:03 UTC (rev 2907)
+++ non-group/banshee/tags/0.11.4+dfsg-1/debian/rules	2007-01-15 20:03:16 UTC (rev 2908)
@@ -7,6 +7,7 @@
 
 common-binary-post-install-arch:: list-missing
 
+export BANSHEE_DISABLE_GCONF=1
 export MONO_SHARED_DIR=$(CURDIR)
 DEB_CONFIGURE_EXTRA_FLAGS=--disable-static --disable-helix --disable-vlc \
                           --disable-xing --disable-mtp --disable-docs \

Modified: non-group/banshee/trunk/debian/changelog
===================================================================
--- non-group/banshee/trunk/debian/changelog	2007-01-15 14:12:03 UTC (rev 2907)
+++ non-group/banshee/trunk/debian/changelog	2007-01-15 20:03:16 UTC (rev 2908)
@@ -13,6 +13,9 @@
   * debian/Banshee.Plugins.Radio.dll.config,
     debian/banshee.install:
     + Add missing dllmap
+  * debian/patches/02_no-gconfd.patch,
+    debian/rules:
+    + Don't require a running gconfd-2
 
  -- Sebastian Dröge <slomo at debian.org>  Mon, 15 Jan 2007 13:58:24 +0100
 

Added: non-group/banshee/trunk/debian/patches/02_no-gconfd.patch
===================================================================
--- non-group/banshee/trunk/debian/patches/02_no-gconfd.patch	2007-01-15 14:12:03 UTC (rev 2907)
+++ non-group/banshee/trunk/debian/patches/02_no-gconfd.patch	2007-01-15 20:03:16 UTC (rev 2908)
@@ -0,0 +1,70 @@
+Index: src/Core/Banshee.Base/Banshee.Configuration/GConfConfigurationClient.cs
+===================================================================
+--- src/Core/Banshee.Base/Banshee.Configuration/GConfConfigurationClient.cs	(revision 1980)
++++ src/Core/Banshee.Base/Banshee.Configuration/GConfConfigurationClient.cs	(working copy)
+@@ -42,6 +42,20 @@
+         private GConf.Client client;
+         private Dictionary<string, string> key_table = new Dictionary<string, string>();
+         
++        private static bool disable_gconf_checked = false;
++        private static bool disable_gconf = false;
++        
++        private static bool DisableGConf {
++            get { 
++                if(!disable_gconf_checked) {
++                    disable_gconf = Globals.EnvironmentIsSet("BANSHEE_DISABLE_GCONF");
++                    disable_gconf_checked = true;
++                }
++                
++                return disable_gconf;
++            }
++        }
++        
+         public static string BaseKey {
+             get { return base_key; }
+         }
+@@ -81,13 +95,17 @@
+         
+         public T Get<T>(string namespce, string key, T fallback)
+         {
++            if(DisableGConf) {
++                return fallback;
++            }
++            
+             if(client == null) {
+                 client = new GConf.Client();
+             }
+             
+             try {
+                 return (T)client.Get(CreateKey(namespce, key));
+-            } catch(GConf.NoSuchKeyException) {
++            } catch {
+                 return fallback;
+             }
+         }
+@@ -104,6 +122,10 @@
+         
+         public void Set<T>(string namespce, string key, T value)
+         {
++            if(DisableGConf) {
++                return;
++            }
++            
+             if(client == null) {
+                 client = new GConf.Client();
+             }
+Index: build/gconf-schema-rules
+===================================================================
+--- build/gconf-schema-rules	(revision 1979)
++++ build/gconf-schema-rules	(working copy)
+@@ -4,7 +4,7 @@
+ 
+ $(srcdir)/$(ASSEMBLY_GCONF_SCHEMA): $(ASSEMBLY)
+ 	if test -w $@ -o \( ! -e $@ -a -w $(srcdir) \); then \
+-		MONO_PATH=$(MONO_BASE_PATH) $(MONO) $(top_builddir)/build/gconf-schema-extractor.exe $< $(srcdir)/$@; \
++		BANSHEE_DISABLE_GCONF=1 MONO_PATH=$(MONO_BASE_PATH) $(MONO) $(top_builddir)/build/gconf-schema-extractor.exe $< $(srcdir)/$@; \
+ 	fi
+ 
+ @INTLTOOL_SCHEMAS_RULE@
+
+

Modified: non-group/banshee/trunk/debian/rules
===================================================================
--- non-group/banshee/trunk/debian/rules	2007-01-15 14:12:03 UTC (rev 2907)
+++ non-group/banshee/trunk/debian/rules	2007-01-15 20:03:16 UTC (rev 2908)
@@ -7,6 +7,7 @@
 
 common-binary-post-install-arch:: list-missing
 
+export BANSHEE_DISABLE_GCONF=1
 export MONO_SHARED_DIR=$(CURDIR)
 DEB_CONFIGURE_EXTRA_FLAGS=--disable-static --disable-helix --disable-vlc \
                           --disable-xing --disable-mtp --disable-docs \




More information about the Pkg-mono-svn-commits mailing list