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

Fri Nov 5 00:58:09 UTC 2010

The following commit has been merged in the master branch:
commit 153192e4d96411975071f7c1f33c12c00cf8bae3
Author: Jo Shields <directhex at apebox.org>
Date:   Thu Nov 4 23:24:28 2010 +0000

    Buildable - time to triage debian/tmp into packages.
    NOTE: build-deps assume Sid (eventually this will match Lucid, but pre-lucid needs some slight branching)
    (Historic bzr commit from Thu 2010-01-28 00:41:46 +0000)

diff --git a/debian/changelog b/debian/changelog
index 213bf87..104c6a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 moon (2.0-0ubuntu1~ppa1) UNRELEASED; urgency=low
 
-  [ Jo Shields ]
   * New upstream release
   * debian/control:
     + Bump to Standards 3.8.3
@@ -9,6 +8,10 @@ moon (2.0-0ubuntu1~ppa1) UNRELEASED; urgency=low
       than Arch:any
   * debian/rules:
     + Rewrite, port to fully DH7 format
+  * debian/monodoc-moonlight-manual.install:
+    + Create manual package for GTK# widget assembly
+  * debian/patches/fix_monodoc_basefile.patch:
+    + Fix misnamed root entry in documentation file
 
  -- Jo Shields <directhex at apebox.org>  Sat, 19 Dec 2009 13:46:40 +0000
 
diff --git a/debian/control b/debian/control
index 3ca589c..dc8df5d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,16 +4,18 @@ Priority: optional
 Maintainer: Moonlight packaging team <moonlight-team at lists.launchpad.net>
 Uploaders: Jo Shields <directhex at apebox.org>
 Homepage: http://www.mono-project.com/Moonlight
-Vcs-Git: git://git.debian.org/pkg-mono/packages/moon.git
-Vcs-Browser: http://git.debian.org/?p=pkg-mono/packages/moon.git
+Vcs-Bzr: https://code.launchpad.net/~moonlight-team/+junk/master
+Vcs-Browser: http://bazaar.launchpad.net/~moonlight-team/+junk/master/files
 Standards-Version: 3.8.3
 Build-Depends: debhelper (>= 7), 
  xulrunner-dev (>= 1.9), 
  libavcodec-dev, 
+ cli-common-dev,
  libgtk2.0-dev, 
  libasound2-dev, 
  chrpath, 
  bison,
+ zip,
  lsb-release, 
  libpulse-dev, 
  libcairo2-dev (>= 1.8),
@@ -21,6 +23,10 @@ Build-Depends: debhelper (>= 7),
  automake,
  autotools-dev,
  libgtk2.0-cil-dev,
+ libglade2.0-cil-dev,
+ libglib2.0-cil-dev,
+ libwnck1.0-cil-dev,
+ libmono-cil-dev,
  libtool
 
 #Package: moonlight-plugin-core
diff --git a/debian/libmoon-windows-desktop3.0-cil.install b/debian/libmoon-windows-desktop3.0-cil.install
new file mode 100644
index 0000000..2e3f816
--- /dev/null
+++ b/debian/libmoon-windows-desktop3.0-cil.install
@@ -0,0 +1 @@
+usr/lib/mono/gac/Moon.Windows.Desktop/*/Moon.Windows.Desktop.dll*	/usr/lib/cli/Moon.Windows.Desktop-3.0/
diff --git a/debian/libmoon-windows-desktop3.0-cil.installcligac b/debian/libmoon-windows-desktop3.0-cil.installcligac
new file mode 100644
index 0000000..a6c9835
--- /dev/null
+++ b/debian/libmoon-windows-desktop3.0-cil.installcligac
@@ -0,0 +1 @@
+/usr/lib/cli/Moon.Windows.Desktop-3.0/Moon.Windows.Desktop.dll
diff --git a/debian/libmoon.install b/debian/libmoon.install
index 6dcfd88..6eff51d 100644
--- a/debian/libmoon.install
+++ b/debian/libmoon.install
@@ -1,4 +1,4 @@
 usr/lib/libmoon.so.0		/usr/lib/
 usr/lib/libmoon.so.0.0.0	/usr/lib/
-monoprefix/lib/libmono.so.0	/usr/lib/moonlight/
-monoprefix/lib/libmono.so.0.0.0	/usr/lib/moonlight/
+usr/lib/libmono.so.0		/usr/lib/moonlight/
+usr/lib/libmono.so.0.0.0	/usr/lib/moonlight/
diff --git a/debian/libmoonlight-gtk3.0-cil.install b/debian/libmoonlight-gtk3.0-cil.install
new file mode 100644
index 0000000..d679946
--- /dev/null
+++ b/debian/libmoonlight-gtk3.0-cil.install
@@ -0,0 +1 @@
+usr/lib/mono/gac/Moonlight.Gtk/*/Moonlight.Gtk.dll*	/usr/lib/cli/Moonlight.Gtk-3.0/
diff --git a/debian/libmoonlight-gtk3.0-cil.installcligac b/debian/libmoonlight-gtk3.0-cil.installcligac
new file mode 100644
index 0000000..105da54
--- /dev/null
+++ b/debian/libmoonlight-gtk3.0-cil.installcligac
@@ -0,0 +1 @@
+/usr/lib/cli/Moonlight.Gtk-3.0/Moonlight.Gtk.dll
diff --git a/debian/patches/.dpkg-source-applied b/debian/patches/.dpkg-source-applied
deleted file mode 100644
index 77b5002..0000000
--- a/debian/patches/.dpkg-source-applied
+++ /dev/null
@@ -1 +0,0 @@
-fix_monodoc_basefile.patch
diff --git a/debian/rules b/debian/rules
index 77ebe33..31d8299 100644
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,14 @@
 export MONO_SHARED_DIR=$(CURDIR)
 DEB_CLI_API_VERSION = 2.0
 
+
+
+
+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)"
@@ -13,9 +21,6 @@ ifeq ($(DISTRO),"Ubuntu")
 XULRUNNER_19_PLUGDIR = "usr/lib/xulrunner-addons/plugins"
 endif
 
-%:
-	dh $@
-
 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
@@ -68,7 +73,7 @@ build-indep: build-stamp
 
 build-arch: build-stamp
 
-install: moonlight-build-stamp
+install-stamp: moonlight-build-stamp
 	dh_testdir
 	dh_testroot
 	dh_installdirs
@@ -78,16 +83,18 @@ install: moonlight-build-stamp
 	chrpath -r /usr/lib/moonlight/ $(MONO_SHARED_DIR)/debian/tmp/usr/lib/libmoon.so.0.0.0
 	dh_install --list-missing
 
+	touch install-stamp
+
 mono-install-stamp: mono-build-stamp
 	cd mono-2-6 && $(MAKE) install
 
 	#manually insert GTK# into monoprefix GAC
 	$(MONO_SHARED_DIR)/monoprefix/bin/gacutil -i /usr/lib/cli/gtk-sharp-2.0/gtk-sharp.dll
-	$(MONO_SHARED_DIR)/monoprefix/bin/gacutil -i /usr/lib/cli/gtk-sharp-2.0/atk-sharp.dll
-	$(MONO_SHARED_DIR)/monoprefix/bin/gacutil -i /usr/lib/cli/gtk-sharp-2.0/gdk-sharp.dll
-	$(MONO_SHARED_DIR)/monoprefix/bin/gacutil -i /usr/lib/cli/gtk-sharp-2.0/glib-sharp.dll
-	$(MONO_SHARED_DIR)/monoprefix/bin/gacutil -i /usr/lib/cli/gtk-sharp-2.0/gtk-dotnet.dll
-	$(MONO_SHARED_DIR)/monoprefix/bin/gacutil -i /usr/lib/cli/gtk-sharp-2.0/pango-sharp.dll
+	$(MONO_SHARED_DIR)/monoprefix/bin/gacutil -i /usr/lib/cli/atk-sharp-2.0/atk-sharp.dll
+	$(MONO_SHARED_DIR)/monoprefix/bin/gacutil -i /usr/lib/cli/gdk-sharp-2.0/gdk-sharp.dll
+	$(MONO_SHARED_DIR)/monoprefix/bin/gacutil -i /usr/lib/cli/glib-sharp-2.0/glib-sharp.dll
+	$(MONO_SHARED_DIR)/monoprefix/bin/gacutil -i /usr/lib/cli/gtk-dotnet-2.0/gtk-dotnet.dll
+	$(MONO_SHARED_DIR)/monoprefix/bin/gacutil -i /usr/lib/cli/pango-sharp-2.0/pango-sharp.dll
 
 	touch mono-install-stamp
 
@@ -107,4 +114,9 @@ moonlight-configure-stamp: mono-install-stamp
 	PKG_CONFIG_PATH=$(MONO_SHARED_DIR)/monoprefix/lib/pkgconfig ./configure --with-mcspath=$(MONO_SHARED_DIR)/mono-2-6/mcs --with-mono-basic-path=$(MONO_SHARED_DIR)/mono-basic-2-6 --with-cairo=system --prefix=/usr
 	touch moonlight-configure-stamp
 
-.PHONY: install build build-arch build-indep
+binary: install-stamp
+
+%:
+	dh $@
+
+.PHONY: build build-arch build-indep

-- 
moon

