[Pkg-mono-svn-commits] [SCM] moon branch, master, updated. upstream/2.3-47-g8f32d36

[Jo Shields]

The following commit has been merged in the master branch:
commit 896283bfbf4622c4fcdfe5dccf7a7744ac094468
Author: Jo Shields <directhex at apebox.org>
Date:   Thu Nov 4 23:33:53 2010 +0000

    fix libmoon to not bundle libmono twice
    (Historic bzr commit from Thu 2010-02-04 16:47:18 +0000)

diff --git a/debian/libmoon.install b/debian/libmoon.install
index 13e51b8..c3157d8 100644
--- a/debian/libmoon.install
+++ b/debian/libmoon.install
@@ -1,5 +1,4 @@
 usr/lib/libmoon.so.0		/usr/lib/
 usr/lib/libmoon.so.0.0.0	/usr/lib/
-usr/lib/libmono.so.0		/usr/lib/moonlight/
 usr/lib/libmono.so.0.0.0	/usr/lib/moonlight/
 
diff --git a/debian/libmoon.links b/debian/libmoon.links
new file mode 100644
index 0000000..261989d
--- /dev/null
+++ b/debian/libmoon.links
@@ -0,0 +1 @@
+usr/lib/moonlight/libmono.so.0.0.0	usr/lib/moonlight/libmono.so.0
diff --git a/debian/rules b/debian/rules
index 26e8136..7cd6ce1 100644
--- a/debian/rules
+++ b/debian/rules
@@ -144,6 +144,7 @@ override_dh_makeclilibs:
 	dh_makeclilibs -V
 
 override_dh_link:
+	dh_link
 	dh_link -pmoonlight-plugin-mozilla \
 		usr/lib/moonlight/plugin/libmoonloader.so	$(XULRUNNER_19_PLUGDIR)/libmoonloader.so
 

-- 
moon