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

    more build system fixes, working SDK
    (Historic bzr commit from Tue 2010-02-02 21:36:33 +0000)

diff --git a/debian/control b/debian/control
index e1452dd..7fe3aa9 100644
--- a/debian/control
+++ b/debian/control
@@ -185,9 +185,24 @@ Description: Moonlight SDK for desktop apps
  This package contains development files for writing desktop applications 
  with Moonlight, and should be used for compilation.
 
-Package: moonlight-web-devel
+Package: moonlight-tools
 Architecture: all
 Depends: ${cli:Depends}, ${misc:Depends}
+Description: Various tools for Moonlight SDK
+ 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 development tools for Moonlight.
+
+Package: moonlight-web-devel
+Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Depends: ${cli:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Recommends: moonlight-tools
 Description: Moonlight SDK for web apps
  Moonlight is a free Silverlight clone, allowing Free Software systems to
diff --git a/debian/libmoon.install b/debian/libmoon.install
index 6eff51d..13e51b8 100644
--- a/debian/libmoon.install
+++ b/debian/libmoon.install
@@ -2,3 +2,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/moonlight-tools.install b/debian/moonlight-tools.install
new file mode 100644
index 0000000..6223553
--- /dev/null
+++ b/debian/moonlight-tools.install
@@ -0,0 +1,16 @@
+usr/bin/mopen
+usr/bin/munxap
+usr/bin/mxap
+usr/bin/respack
+usr/bin/sockpol
+usr/bin/unrespack
+usr/bin/xaml2html
+usr/bin/xamlg      
+usr/lib/moonlight/mopen.exe*
+usr/lib/moonlight/munxap.exe*
+usr/lib/moonlight/sockpol.exe*
+usr/lib/moonlight/mxap.exe*
+usr/lib/moonlight/xaml2html.exe*
+usr/lib/moonlight/respack.exe*
+usr/lib/moonlight/xamlg.exe*
+
diff --git a/debian/moonlight-web-devel.install b/debian/moonlight-web-devel.install
index b711cf1..b61736d 100644
--- a/debian/moonlight-web-devel.install
+++ b/debian/moonlight-web-devel.install
@@ -1,4 +1,5 @@
 usr/share/pkgconfig/moonlight-web-2.0.pc	/usr/lib/pkgconfig/
 usr/lib/moonlight/2.0-redist
 usr/lib/moonlight/2.0
-usr/bin/smcs
+usr/lib/moonlight/mono				/usr/lib/moonlight/
+usr/bin/smcs					/usr/lib/moonlight/
diff --git a/debian/moonlight-web-devel.links b/debian/moonlight-web-devel.links
new file mode 100644
index 0000000..734860e
--- /dev/null
+++ b/debian/moonlight-web-devel.links
@@ -0,0 +1 @@
+/usr/lib/moonlight/smcs		/usr/bin/smcs
diff --git a/debian/patches/series b/debian/patches/series
index 77b5002..9c1622a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_monodoc_basefile.patch
+use_bundled_mono_runtime_for_smcs.patch
diff --git a/debian/patches/use_bundled_mono_runtime_for_smcs.patch b/debian/patches/use_bundled_mono_runtime_for_smcs.patch
new file mode 100644
index 0000000..bbf7da9
--- /dev/null
+++ b/debian/patches/use_bundled_mono_runtime_for_smcs.patch
@@ -0,0 +1,8 @@
+Index: moonlight-2.0/scripts/smcs.in
+===================================================================
+--- moonlight-2.0.orig/scripts/smcs.in	2010-02-02 18:38:08.000000000 +0000
++++ moonlight-2.0/scripts/smcs.in	2010-02-02 18:38:25.000000000 +0000
+@@ -1,2 +1,2 @@
+ #!/bin/sh
+-MONO_PATH=@prefix@/lib/moonlight/2.0:$MONO_PATH exec @prefix@/bin/mono $MONO_OPTIONS --runtime=moonlight --security=temporary-smcs-hack @prefix@/lib/moonlight/2.0/smcs.exe "$@"
++MONO_PATH=@prefix@/lib/moonlight/2.0:$MONO_PATH exec @prefix@/lib/moonlight/mono $MONO_OPTIONS --runtime=moonlight --security=temporary-smcs-hack @prefix@/lib/moonlight/2.0/smcs.exe "$@"
diff --git a/debian/rules b/debian/rules
index 8fa7026..eefed3a 100644
--- a/debian/rules
+++ b/debian/rules
@@ -86,6 +86,7 @@ install-stamp: moonlight-build-stamp
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 	install -m 644 monoprefix/lib/libmono.so.0.0.0  debian/tmp/usr/lib/
 	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
 	dh_install --list-missing
 
@@ -121,22 +122,28 @@ moonlight-configure-stamp: mono-install-stamp
 	touch moonlight-configure-stamp
 
 get-orig-source:
-	mkdir -p ../tarballs
 	uscan \
 		--package $(DEB_SOURCE_NAME) \
 		--watchfile $(DEBIAN_DIR)/watch \
 		--upstream-version $(VERSION) \
 		--download-version $(VERSION) \
-		--destdir ../tarballs \
+		--destdir . \
 		--force-download \
 		--rename
 	wget -c http://ftp.novell.com/pub/mono/sources/moon/$(VERSION)/mono-2.6.tar.bz2 
 	wget -c http://ftp.novell.com/pub/mono/sources/moon/$(VERSION)/mono-basic-2.6.tar.bz2 
-	mv mono-2.6.tar.bz2 ../tarballs/moon_2.0.orig-mono-2-6.tar.bz2
-	mv mono-basic-2.6.tar.bz2 ../tarballs/moon_2.0.orig-mono-basic-2-6.tar.bz2
+	mv mono-2.6.tar.bz2 ./moon_2.0.orig-mono-2-6.tar.bz2
+	mv mono-basic-2.6.tar.bz2 ./moon_2.0.orig-mono-basic-2-6.tar.bz2
 
 binary: install-stamp
 
+override_dh_makeshlibs:
+	dh_makeshlibs
+	dh_makeshlibs -p libmoon -V'libmoon (>= $(VERSION)), libmoon (<< $(VERSION).)'
+
+override_dh_makeclilibs:
+	dh_makeclilibs -V
+
 %:
 	dh $@
 

-- 
moon