[Pkg-mono-svn-commits] [SCM] moon branch, master, updated. upstream/2.3-47-g8f32d36
Jo Shields
directhex at apebox.org
Fri Nov 5 00:58:18 UTC 2010
The following commit has been merged in the master branch:
commit b6f6c0544b40dc10c57120fcb2f294b9458bbb2e
Author: Jo Shields <directhex at apebox.org>
Date: Thu Nov 4 23:30:11 2010 +0000
plugin support (actual workingness TBD)
(Historic bzr commit from Wed 2010-02-03 00:45:44 +0000)
diff --git a/debian/control b/debian/control
index 7fe3aa9..004b1f7 100644
--- a/debian/control
+++ b/debian/control
@@ -29,44 +29,44 @@ Build-Depends: debhelper (>= 7),
libmono-cil-dev,
libtool
-#Package: moonlight-plugin-core
-#Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
-#Depends: ${shlibs:Depends}
-#Conflicts: moonlight
-#Description: Free Software clone of Silverlight 1.0 - plugin core components
-# Moonlight is a free Silverlight clone, allowing Free Software systems to
-# run embedded web-browser objects or standalone code targetting Microsoft
-# Silverlight.
-# .
-# About Microsoft Silverlight
-# Microsoft Silverlight is a cross-browser, cross-platform, and cross-device
-# plug-in for delivering the next generation of .NET based media experiences
-# and rich interactive applications for the Web.
-# .
-# This package contains the core plugin components (for any browser)
+Package: moonlight-plugin-core
+Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: moonlight
+Description: Free Software clone of Silverlight 2.0 - plugin core components
+ Moonlight is a free Silverlight clone, allowing Free Software systems to
+ run embedded web-browser objects or standalone code targetting Microsoft
+ Silverlight.
+ .
+ About Microsoft Silverlight
+ Microsoft Silverlight is a cross-browser, cross-platform, and cross-device
+ plug-in for delivering the next generation of .NET based media experiences
+ and rich interactive applications for the Web.
+ .
+ This package contains the core plugin components (for any browser)
-#Package: moonlight-plugin-mozilla
-#Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
-#Depends: ${shlibs:Depends}, moonlight-plugin-core (= ${binary:Version}), xulrunner-1.9 | xulrunner-1.9.1
-#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
-#Xb-Npp-Name: Novell Moonlight
-#Xb-Npp-File: libmoonloader.so
-#Xb-Npp-Description: Browser plugin for Silverlight 1.0 (http://www.mono-project.com/Moonlight)
-#Description: Free Software clone of Silverlight 1.0 - Xulrunner 1.9 plugin
-# Moonlight is a free Silverlight clone, allowing Free Software systems to
-# run embedded web-browser objects or standalone code targetting Microsoft
-# Silverlight.
-# .
-# About Microsoft Silverlight
-# Microsoft Silverlight is a cross-browser, cross-platform, and cross-device
-# plug-in for delivering the next generation of .NET based media experiences
-# and rich interactive applications for the Web.
-# .
-# This package contains the Xulrunner 1.9 plugin bridge, for full use with
-# Xulrunner 1.9 browsers such as Firefox/Iceweasel 3, Epiphany-Gecko, HulaHop,
-# and others.
+Package: moonlight-plugin-mozilla
+Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Depends: ${shlibs:Depends}, moonlight-plugin-core (= ${binary:Version}), firefox | abrowser | , ${misc:Depends}
+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,application/x-silverlight-2
+Xb-Npp-Name: Novell Moonlight
+Xb-Npp-File: libmoonloader.so
+Xb-Npp-Description: Browser plugin for Silverlight 2.0 (http://www.mono-project.com/Moonlight)
+Description: Free Software clone of Silverlight 2.0 - Xulrunner 1.9 plugin
+ Moonlight is a free Silverlight clone, allowing Free Software systems to
+ run embedded web-browser objects or standalone code targetting Microsoft
+ Silverlight.
+ .
+ About Microsoft Silverlight
+ Microsoft Silverlight is a cross-browser, cross-platform, and cross-device
+ plug-in for delivering the next generation of .NET based media experiences
+ and rich interactive applications for the Web.
+ .
+ This package contains the Xulrunner 1.9 plugin bridge, for full use with
+ Xulrunner 1.9 browsers such as Firefox/Iceweasel 3, Epiphany-Gecko, HulaHop,
+ and others.
Package: libmoon
Section: libs
diff --git a/debian/libmoon-windows-desktop3.0-cil.installcligac b/debian/libmoon-windows-desktop3.0-cil.installcligac
deleted file mode 100644
index a6c9835..0000000
--- a/debian/libmoon-windows-desktop3.0-cil.installcligac
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/cli/Moon.Windows.Desktop-3.0/Moon.Windows.Desktop.dll
diff --git a/debian/libmoonlight-gtk3.0-cil.installcligac b/debian/libmoonlight-gtk3.0-cil.installcligac
deleted file mode 100644
index 105da54..0000000
--- a/debian/libmoonlight-gtk3.0-cil.installcligac
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/cli/Moonlight.Gtk-3.0/Moonlight.Gtk.dll
diff --git a/debian/moonlight-plugin-core.install b/debian/moonlight-plugin-core.install
index 941af9f..16d273d 100644
--- a/debian/moonlight-plugin-core.install
+++ b/debian/moonlight-plugin-core.install
@@ -1,3 +1,3 @@
-usr/lib/moon/plugin/libmoonplugin.so
-usr/lib/moon/plugin/libmoonloader.so
-
+usr/lib/moonlight/plugin/libmoonplugin.so
+usr/lib/moonlight/plugin/libmoonloader.so
+usr/lib/moonlight/plugin/*.dll*
diff --git a/debian/moonlight-plugin-mozilla.install b/debian/moonlight-plugin-mozilla.install
index 7cdd2da..df2b592 100644
--- a/debian/moonlight-plugin-mozilla.install
+++ b/debian/moonlight-plugin-mozilla.install
@@ -1 +1 @@
-usr/lib/moon/plugin/libmoonplugin-ff3bridge.so
+usr/lib/moonlight/plugin/libmoonplugin-ff3bridge.so
diff --git a/debian/rules b/debian/rules
index eefed3a..fd18e2c 100644
--- a/debian/rules
+++ b/debian/rules
@@ -18,13 +18,12 @@ 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/xulrunner-addons/plugins"
+XULRUNNER_19_PLUGDIR = "usr/lib/firefox-addons/plugins"
endif
clean:
@@ -88,8 +87,8 @@ install-stamp: moonlight-build-stamp
install -m 644 monoprefix/lib/libmono.so.0 debian/tmp/usr/lib/
install -m 755 monoprefix/bin/mono debian/tmp/usr/lib/moonlight/
chrpath -r /usr/lib/moonlight/ $(MONO_SHARED_DIR)/debian/tmp/usr/lib/libmoon.so.0.0.0
+ chrpath -r /usr/lib/moonlight/ $(MONO_SHARED_DIR)/debian/tmp/usr/lib/moonlight/plugin/libmoonplugin.so
dh_install --list-missing
-
touch install-stamp
mono-install-stamp: mono-build-stamp
@@ -144,6 +143,10 @@ override_dh_makeshlibs:
override_dh_makeclilibs:
dh_makeclilibs -V
+override_dh_link:
+ dh_link -pmoonlight-plugin-mozilla \
+ usr/lib/moonlight/plugin/libmoonloader.so $(XULRUNNER_19_PLUGDIR)/libmoonloader.so
+
%:
dh $@
--
moon
More information about the Pkg-mono-svn-commits
mailing list