[Pkg-cli-libs-commits] r4039 - in /packages/db4o/trunk/debian: changelog control patches/00_configurable_compiler.dpatch patches/00list rules

[laney-guest at users.alioth.debian.org]

Author: laney-guest
Date: Sat Feb 28 18:44:32 2009
New Revision: 4039

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=4039
Log:
debian/control, debian/rules,
debian/patches/00_configurable_compiler.dpatch: Update build-deps, patch
the build system to allow compiler configuration and pass MCS=/usr/bin/csc
for Mono 2.0 transition.

Added:
    packages/db4o/trunk/debian/patches/00_configurable_compiler.dpatch   (with props)
Modified:
    packages/db4o/trunk/debian/changelog
    packages/db4o/trunk/debian/control
    packages/db4o/trunk/debian/patches/00list
    packages/db4o/trunk/debian/rules

Modified: packages/db4o/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/changelog?rev=4039&op=diff
==============================================================================
--- packages/db4o/trunk/debian/changelog (original)
+++ packages/db4o/trunk/debian/changelog Sat Feb 28 18:44:32 2009
@@ -1,3 +1,12 @@
+db4o (6.1.604+dfsg-3) UNRELEASED; urgency=low
+
+  * debian/control, debian/rules,
+    debian/patches/00_configurable_compiler.dpatch: Update build-deps, patch
+    the build system to allow compiler configuration and pass MCS=/usr/bin/csc
+    for Mono 2.0 transition.
+
+ -- Iain Lane <laney at ubuntu.com>  Sat, 28 Feb 2009 18:23:10 +0000
+
 db4o (6.1.604+dfsg-2) unstable; urgency=low
 
   * debian/rules:

Modified: packages/db4o/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/control?rev=4039&op=diff
==============================================================================
--- packages/db4o/trunk/debian/control (original)
+++ packages/db4o/trunk/debian/control Sat Feb 28 18:44:32 2009
@@ -5,8 +5,7 @@
 Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>, Mirco Bauer <meebey at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: debhelper (>= 5), dpatch
 Build-Depends-Indep: cli-common-dev (>= 0.5.4),
- mono-gmcs (>= 1.1.6),
- mono-gac,
+ mono-devel (>= 2.0),
  libmono-cecil0.5-cil,
  libmono-cecil-flowanalysis0.1-cil,
  pkg-config,

Added: packages/db4o/trunk/debian/patches/00_configurable_compiler.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/patches/00_configurable_compiler.dpatch?rev=4039&op=file
==============================================================================
--- packages/db4o/trunk/debian/patches/00_configurable_compiler.dpatch (added)
+++ packages/db4o/trunk/debian/patches/00_configurable_compiler.dpatch Sat Feb 28 18:44:32 2009
@@ -1,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_configurable_compiler.dpatch by Iain Lane <laney at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad db4o-6.1.604+dfsg~/src/include.mk db4o-6.1.604+dfsg/src/include.mk
+--- db4o-6.1.604+dfsg~/src/include.mk	2007-07-31 15:29:02.000000000 +0100
++++ db4o-6.1.604+dfsg/src/include.mk	2009-02-28 18:22:10.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ MONO = mono
+-MCS = gmcs
++MCS ?= gmcs
+ KEY_FILE = ../db4objects.snk
+ MCS_FLAGS = -keyfile:$(KEY_FILE) -define:NET_2_0,MONO,EMBEDDED
+ OUTDIR = ../bin

Propchange: packages/db4o/trunk/debian/patches/00_configurable_compiler.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/db4o/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/patches/00list?rev=4039&op=diff
==============================================================================
--- packages/db4o/trunk/debian/patches/00list (original)
+++ packages/db4o/trunk/debian/patches/00list Sat Feb 28 18:44:32 2009
@@ -1,3 +1,4 @@
+00_configurable_compiler
 01_dos2unix
 02_link_system_libs
 03_generate_xml_doc

Modified: packages/db4o/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/rules?rev=4039&op=diff
==============================================================================
--- packages/db4o/trunk/debian/rules (original)
+++ packages/db4o/trunk/debian/rules Sat Feb 28 18:44:32 2009
@@ -16,7 +16,7 @@
 build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
-	cd src && $(MAKE) core admin
+	cd src && MCS=/usr/bin/csc $(MAKE) core admin
 	monodocer \
 	  -importslashdoc:$(CURDIR)/src/bin/Db4objects.Db4o.dll.xml \
 	  --assembly:$(CURDIR)/src/bin/Db4objects.Db4o.dll \