[Pkg-mono-svn-commits] rev 2134 - mono/trunk/debian

[Mirco Bauer]

Author: meebey-guest
Date: 2005-12-27 21:33:44 +0000 (Tue, 27 Dec 2005)
New Revision: 2134

Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/rules
Log:
- give kfreebsd a chance, added libx11-dev build-dep




Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2005-12-27 17:40:50 UTC (rev 2133)
+++ mono/trunk/debian/changelog	2005-12-27 21:33:44 UTC (rev 2134)
@@ -1,6 +1,13 @@
 mono (1.1.12.1-1) unstable; urgency=low
 
+  * New upstream release (Closes: #344531)
   * Mirco 'meebey' Bauer
+    + debian/control:
+       - Added libx11-dev to build-deps.
+       - Added libgc-dev [kfreebsd-i386] to build-deps. (Closes: #322599)
+    + debian/rules:
+       - Added kfreebsd check for configure call.
+       - Added --with-libgdiplus=installed and --with-x=yes to configure call.
     + debian/compat:
        - Changed to 5.
     + debian/mono-classlib-1.0.install:

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2005-12-27 17:40:50 UTC (rev 2133)
+++ mono/trunk/debian/control	2005-12-27 21:33:44 UTC (rev 2134)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Eduard Bloch <blade at debian.org>, Mirco Bauer <meebey at meebey.net>
-Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev (>= 2.4), bison, libtool, dpatch, libxslt1-dev, dc, chrpath
+Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev (>= 2.4), bison, libtool, dpatch, libxslt1-dev, dc, chrpath, libx11-dev, libgc-dev [kfreebsd-i386]
 Build-Conflicts: pnet-compiler
 Standards-Version: 3.6.2.1
 

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2005-12-27 17:40:50 UTC (rev 2133)
+++ mono/trunk/debian/rules	2005-12-27 21:33:44 UTC (rev 2134)
@@ -24,6 +24,12 @@
 	confflags += --with-tls=pthread
 endif
 
+ifeq ($(DEB_BUILD_ARCH_OS), kfreebsd)
+	GC = --with-gc=boehm
+else
+	GC = --with-gc=included
+endif
+
 # Include dpatch stuff.
 include /usr/share/dpatch/dpatch.make
 
@@ -36,8 +42,9 @@
 	./configure $(confflags) --prefix=/usr \
 	  --mandir=\$${prefix}/share/man \
 	  --infodir=\$${prefix}/share/info --sysconfdir=/etc \
-	  --with-sigaltstack=no --with-gc=included \
-	  --with-jit=yes --with-ikvm-native=no --with-preview=yes
+	  --with-sigaltstack=no $(GC) \
+	  --with-jit=yes --with-ikvm-native=no --with-preview=yes \
+	  --with-libgdiplus=installed --with-x=yes
 	$(MAKE)
 	chmod +x debian/dh_makeclilibs debian/dh_clideps
 	touch build-stamp