[Pkg-mono-svn-commits] rev 2909 - in
non-group/banshee/trunk/debian: . patches
Sebastian Dröge
slomo at alioth.debian.org
Mon Jan 22 12:37:51 CET 2007
Author: slomo
Date: 2007-01-22 12:37:50 +0100 (Mon, 22 Jan 2007)
New Revision: 2909
Removed:
non-group/banshee/trunk/debian/patches/02_no-gconfd.patch
Modified:
non-group/banshee/trunk/debian/changelog
non-group/banshee/trunk/debian/rules
Log:
* update banshee to 0.11.5
Modified: non-group/banshee/trunk/debian/changelog
===================================================================
--- non-group/banshee/trunk/debian/changelog 2007-01-15 20:03:16 UTC (rev 2908)
+++ non-group/banshee/trunk/debian/changelog 2007-01-22 11:37:50 UTC (rev 2909)
@@ -1,3 +1,13 @@
+banshee (0.11.5+dfsg-1) experimental; urgency=low
+
+ * New upstream release
+ * debian/patches/02_no-gconfd.patch:
+ + Dropped, merged upstream
+ * debian/rules:
+ + GConf workaround not necessary anymore
+
+ -- Sebastian Dröge <slomo at debian.org> Mon, 22 Jan 2007 12:02:35 +0100
+
banshee (0.11.4+dfsg-1) experimental; urgency=low
* New upstream release
Deleted: non-group/banshee/trunk/debian/patches/02_no-gconfd.patch
===================================================================
--- non-group/banshee/trunk/debian/patches/02_no-gconfd.patch 2007-01-15 20:03:16 UTC (rev 2908)
+++ non-group/banshee/trunk/debian/patches/02_no-gconfd.patch 2007-01-22 11:37:50 UTC (rev 2909)
@@ -1,70 +0,0 @@
-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 20:03:16 UTC (rev 2908)
+++ non-group/banshee/trunk/debian/rules 2007-01-22 11:37:50 UTC (rev 2909)
@@ -7,8 +7,8 @@
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 \
--enable-gstreamer=0.10 --enable-avahi \
More information about the Pkg-mono-svn-commits
mailing list