[Pkg-cli-apps-commits] [SCM] mistelix branch, master, updated. debian/0.33-1-6-g06ac638

[Jo Shields]

The following commit has been merged in the master branch:
commit 06ac63805dbbb601c2f6c5648e15deaebce77ff9
Author: Jo Shields <directhex at apebox.org>
Date:   Sun Jul 10 15:16:46 2011 +0100

    Fix dllmaps and usage thereof (Closes: #627289).

diff --git a/debian/control b/debian/control
index dc9c11f..b025c75 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends: debhelper (>= 7),
  libgnome2-dev (>= 2.2),
  libgnome2.0-cil-dev,
  libgnomeui-dev (>= 2.2),
+ libgnome-desktop-dev,
  libgtk2.0-cil-dev,
  libgtk2.0-dev (>= 2.8),
  libmono-addins-cil-dev,
diff --git a/debian/patches/fix_dllmap.patch b/debian/patches/fix_dllmap.patch
new file mode 100644
index 0000000..be22616
--- /dev/null
+++ b/debian/patches/fix_dllmap.patch
@@ -0,0 +1,14 @@
+Index: mistelix/data/mistelix.exe.config.in
+===================================================================
+--- mistelix.orig/data/mistelix.exe.config.in	2011-07-10 14:57:16.071425097 +0100
++++ mistelix/data/mistelix.exe.config.in	2011-07-10 15:02:13.611578056 +0100
+@@ -1,5 +1,9 @@
+ <configuration>
+ 	<dllmap dll="libgnome-desktop-2" target="@LIBGNOME_DESKOP_SO_MAP@" />
+ 	<dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so.0"/>
++	<dllmap dll="rsvg-2" target="librsvg-2.so.2"/>
++	<dllmap dll="libglib-2.0" target="libglib-2.0.so.0"/>
++	<dllmap dll="libgio-2.0" target="libgio-2.0.so.0"/>
++	<dllmap dll="libgobject-2.0" target="libgobject-2.0.so.0"/>
+ </configuration>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 4bb1de5..86d0a61 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+fix_dllmap.patch
 use_ac_path_prog_for_csc_not_mcs.patch
diff --git a/debian/rules b/debian/rules
index 64c25ab..d1c82b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ binary-install/mistelix::
 
 common-binary-predeb-arch common-binary-predeb-indep::
 	dh_clifixperms
-	dh_clideps -d
+	dh_clideps -d --exclude-moduleref=libmistelix
 
 clean::
 	rm -rf	$(MONO_SHARED_DIR)/.wapi

-- 
mistelix