[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 be4d3b91721d7910784cb3770e1a9f03e0bf728a
Author: Jo Shields <directhex at apebox.org>
Date:   Thu Nov 4 23:37:09 2010 +0000

    debian & ubuntu are just going with /usr/lib/mozilla/plugins apparently. so go with it.
    (Historic bzr commit from Fri 2010-02-05 00:40:03 +0000)

diff --git a/debian/moonlight-plugin-mozilla.links b/debian/moonlight-plugin-mozilla.links
new file mode 100644
index 0000000..547413e
--- /dev/null
+++ b/debian/moonlight-plugin-mozilla.links
@@ -0,0 +1 @@
+usr/lib/moonlight/plugin/libmoonloader.so	usr/lib/mozilla/plugins/libmoonloader.so
diff --git a/debian/rules b/debian/rules
index dd60ef0..c9a5e57 100644
--- a/debian/rules
+++ b/debian/rules
@@ -12,20 +12,8 @@ DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Vers
 DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2)
 VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
 
-
-
 include /usr/share/cli-common/cli.make
 
-
-
-# Mangle environment variables which differ between Debian & Ubuntu.
-# Assume Debian behaviour by default.
-DISTRO = "$(shell lsb_release -si)"
-XULRUNNER_19_PLUGDIR = "usr/lib/mozilla/plugins"
-ifeq ($(DISTRO),"Ubuntu")
-XULRUNNER_19_PLUGDIR = "usr/lib/firefox-addons/plugins"
-endif
-
 clean:
 	[ ! -f mono-2-6/Makefile ] || $(MAKE) -C mono-2-6 distclean
 	[ ! -f mono-basic-2-6/Makefile ] || $(MAKE) -C mono-basic-2-6 clean
@@ -142,11 +130,6 @@ override_dh_makeshlibs:
 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
-
 %:
 	dh $@
 

-- 
moon