[Pkg-mono-svn-commits] rev 3715 - moon/trunk/debian

[Jo Shields]

Author: directhex-guest
Date: 2008-10-09 15:20:22 +0000 (Thu, 09 Oct 2008)
New Revision: 3715

Removed:
   moon/trunk/debian/moonlight-plugin-core.links
   moon/trunk/debian/moonlight-plugin-mozilla.links
Modified:
   moon/trunk/debian/changelog
   moon/trunk/debian/control
   moon/trunk/debian/rules
Log:
The "Yay! Ubuntu" release. Now supports Ubuntu-specifics in debian/rules


Modified: moon/trunk/debian/changelog
===================================================================
--- moon/trunk/debian/changelog	2008-10-09 07:53:06 UTC (rev 3714)
+++ moon/trunk/debian/changelog	2008-10-09 15:20:22 UTC (rev 3715)
@@ -16,6 +16,8 @@
       debian-multimedia (no ccache et al)
     + More liberal dependencies, depend on underlying Xulrunner rather
       than specific Iceweasel
+    + Tighten inter-package dependencies to make it more NMU-safe
+    + Make more distro-agnostic use of dh_link, to help Ubuntu
 
   [ Christian Marillat ]
   * Initial packaging.
@@ -25,4 +27,4 @@
       - debian/control
       - debian/copyright
 
- -- Jo Shields <directhex at apebox.org>  Sun, 31 Aug 2008 10:54:22 +0100
+ -- Jo Shields <directhex at apebox.org>  Thu,  9 Oct 2008 16:04:22 +0100

Modified: moon/trunk/debian/control
===================================================================
--- moon/trunk/debian/control	2008-10-09 07:53:06 UTC (rev 3714)
+++ moon/trunk/debian/control	2008-10-09 15:20:22 UTC (rev 3715)
@@ -5,8 +5,7 @@
 Uploaders: Jo Shields <directhex at apebox.org>
 Homepage: http://www.mono-project.com/Moonlight
 Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 7), xulrunner-1.9-dev | xulrunner-dev (>= 1.9), libavcodec-dev, 
- libgtk2.0-dev, libasound2-dev, chrpath
+Build-Depends: debhelper (>= 7), xulrunner-1.9-dev | xulrunner-dev (>= 1.9), libavcodec-dev, libgtk2.0-dev, libasound2-dev, chrpath
 
 Package: moonlight-plugin-core
 Architecture: any
@@ -30,7 +29,7 @@
 
 Package: moonlight-plugin-mozilla
 Architecture: any
-Depends: ${shlibs:Depends}, moonlight-plugin-core (>= ${source:Version}), xulrunner-1.9
+Depends: ${shlibs:Depends}, moonlight-plugin-core (= ${binary:Version}), xulrunner-1.9
 Conflicts: moonlight
 Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384,92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a,aa5ca914-c309-495d-91cf-3141bbb04115
 Xb-Npp-MimeType: application/x-silverlight
@@ -76,7 +75,7 @@
 Package: libmoon-dev
 Section: libdevel
 Architecture: all
-Depends: libmoon0 (>= ${source:Version}), libavutil-dev, libavcodec-dev, libasound2-dev, libgtk2.0-dev
+Depends: libmoon0 (= ${binary:Version}), libavutil-dev, libavcodec-dev, libasound2-dev, libgtk2.0-dev
 Description: open source clone of Microsoft Silverlight - development files
  Moonlight is a free Silverlight clone, allowing Free Software systems to
  run embedded web-browser objects or standalone code targetting Microsoft

Deleted: moon/trunk/debian/moonlight-plugin-core.links
===================================================================
--- moon/trunk/debian/moonlight-plugin-core.links	2008-10-09 07:53:06 UTC (rev 3714)
+++ moon/trunk/debian/moonlight-plugin-core.links	2008-10-09 15:20:22 UTC (rev 3715)
@@ -1,2 +0,0 @@
-usr/lib/moon/plugin/libmoonplugin.so	usr/lib/mozilla/plugins/libmoonplugin.so
-usr/lib/moon/plugin/libmoonloader.so	usr/lib/mozilla/plugins/libmoonloader.so

Deleted: moon/trunk/debian/moonlight-plugin-mozilla.links
===================================================================
--- moon/trunk/debian/moonlight-plugin-mozilla.links	2008-10-09 07:53:06 UTC (rev 3714)
+++ moon/trunk/debian/moonlight-plugin-mozilla.links	2008-10-09 15:20:22 UTC (rev 3715)
@@ -1 +0,0 @@
-usr/lib/moon/plugin/libmoonplugin-ff3bridge.so	usr/lib/mozilla/plugins/libmoonplugin-ff3bridge.so

Modified: moon/trunk/debian/rules
===================================================================
--- moon/trunk/debian/rules	2008-10-09 07:53:06 UTC (rev 3714)
+++ moon/trunk/debian/rules	2008-10-09 15:20:22 UTC (rev 3715)
@@ -6,6 +6,14 @@
 #export MONO_SHARED_DIR=$(CURDIR)
 #DEB_CLI_API_VERSION = 1.9
 
+# 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/xulrunner-addons/plugins"
+endif
+
 config.status: configure
 	dh_testdir
 	./configure --prefix=/usr --with-cairo=system --with-ff3=yes
@@ -60,7 +68,13 @@
 	dh_testroot
 	dh_installchangelogs ChangeLog
 	dh_installdocs -A AUTHORS
-	dh_link
+
+	# Call dh_link manually, so we can change the plugin folder per-distro
+	dh_link -pmoonlight-plugin-mozilla \
+		usr/lib/moon/plugin/libmoonplugin-ff3bridge.so	$(XULRUNNER_19_PLUGDIR)/libmoonplugin-ff3bridge.so \
+		usr/lib/moon/plugin/libmoonplugin.so    $(XULRUNNER_19_PLUGDIR)/libmoonplugin.so \
+		usr/lib/moon/plugin/libmoonloader.so    $(XULRUNNER_19_PLUGDIR)/libmoonloader.so
+
 	dh_strip
 	dh_compress
 	dh_fixperms