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

Mirco Bauer meebey at alioth.debian.org
Thu Jan 29 22:52:05 UTC 2009 

Author: meebey
Date: 2009-01-29 22:52:04 +0000 (Thu, 29 Jan 2009)
New Revision: 3896

Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/rules
Log:
  * debian/rules:
    + Pass the --internal-mono parameter via DH_OPTIONS instead of in every
      dh_*cli* command invocation.
    + Pass internal-mono instead of --internal-mono if the debhelper version
      is older than 7.1, as that one doesn't support custom parameters via
      init(). This ensures backwards compatibility with older debhelper
      versions, as found in Ubuntu.
  * debian/control:
    + Lowered debhelper build-dep to >= 5.



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2009-01-26 23:15:01 UTC (rev 3895)
+++ mono/trunk/debian/changelog	2009-01-29 22:52:04 UTC (rev 3896)
@@ -1,3 +1,17 @@
+mono (2.0.1-4) experimental; urgency=low
+
+  * debian/rules:
+    + Pass the --internal-mono parameter via DH_OPTIONS instead of in every
+      dh_*cli* command invocation.
+    + Pass internal-mono instead of --internal-mono if the debhelper version
+      is older than 7.1, as that one doesn't support custom parameters via
+      init(). This ensures backwards compatibility with older debhelper
+      versions, as found in Ubuntu.
+  * debian/control:
+    + Lowered debhelper build-dep to >= 5.
+
+ -- Mirco Bauer <meebey at debian.org>  Tue, 27 Jan 2009 00:15:04 +0100
+
 mono (2.0.1-3) experimental; urgency=low
 
   * Rebuilt against libc6 and glib from unstable.

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2009-01-26 23:15:01 UTC (rev 3895)
+++ mono/trunk/debian/control	2009-01-29 22:52:04 UTC (rev 3896)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Mirco Bauer <meebey at debian.org>, Sebastian Dröge <slomo at debian.org>, Jo Shields <directhex at apebox.org>
-Build-Depends: debhelper (>= 7.1), dpkg-dev (>= 1.13.19), libglib2.0-dev (>= 2.4), bison, libtool, dpatch, libxml-dom-perl, libxslt1-dev, dc, libx11-dev, libxt-dev, zlib1g-dev
+Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.13.19), libglib2.0-dev (>= 2.4), bison, libtool, dpatch, libxml-dom-perl, libxslt1-dev, dc, libx11-dev, libxt-dev, zlib1g-dev
 Build-Depends-Indep: libgamin-dev, libcups2-dev, librsvg2-dev, libgtk2.0-dev, libgnomeui-dev
 Standards-Version: 3.8.0
 Homepage: http://www.mono-project.com/

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2009-01-26 23:15:01 UTC (rev 3895)
+++ mono/trunk/debian/rules	2009-01-29 22:52:04 UTC (rev 3896)
@@ -8,6 +8,11 @@
 NEXT_UPVERSION = $(shell perl -e '$$_=pop; s/(\d+)$$/$$1+1/e; print' $(UPVERSION))
 
 RUN_MONO = LD_LIBRARY_PATH=debian/tmp/usr/lib MONO_PATH=debian/tmp/usr/lib/mono/1.0:debian/tmp/usr/lib/mono/2.0 debian/tmp/usr/bin/mono
+DH_OPTIONSINTERNAL_MONO_PARAM = --internal-mono
+ifeq ($(shell dpkg --compare-versions $$(dpkg-query -f '$${Version}' -W debhelper) lt 7.1; echo $$?), 0)
+	DH_INTERNAL_MONO_PARAM = internal-mono
+endif
+DH_OPTIONS += $(DH_INTERNAL_MONO_PARAM)
 
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -281,42 +286,42 @@
 	debian/dh_clifixperms -i
 	dh_installdeb -i
 	#DH_VERBOSE=1 DH_AUTOSCRIPTDIR=$(CURDIR)/debian debian/dh_monoaot -i
-	debian/dh_makeclilibs -i -m 1.0 --internal-mono
-	debian/dh_makeclilibs -p libmono1.0-cil -m 2.0 --internal-mono
-	debian/dh_makeclilibs -p libmono2.0-cil -m 2.0 --internal-mono
-	debian/dh_makeclilibs -p libmono-cairo1.0-cil -m 2.0 --internal-mono
-	debian/dh_makeclilibs -p libmono-cairo2.0-cil -m 2.0 --internal-mono
-	debian/dh_makeclilibs -p libmono-corlib1.0-cil -m 1.2.2.1 --internal-mono
-	debian/dh_makeclilibs -p libmono-corlib2.0-cil -m 1.2.2.1 --internal-mono
-	debian/dh_makeclilibs -p libmono-data-tds1.0-cil -m 2.0 --internal-mono
-	debian/dh_makeclilibs -p libmono-data-tds2.0-cil -m 2.0 --internal-mono
-	debian/dh_makeclilibs -p libmono-ldap1.0-cil -m 1.2.6 --internal-mono
-	debian/dh_makeclilibs -p libmono-ldap2.0-cil -m 1.2.6 --internal-mono
-	debian/dh_makeclilibs -p libmono-oracle2.0-cil -m 1.2.6 --internal-mono
-	debian/dh_makeclilibs -p libmono-microsoft-build2.0-cil -m 1.2.6 --internal-mono
-	debian/dh_makeclilibs -p libmono-system1.0-cil -m 1.2.6 --internal-mono
-	debian/dh_makeclilibs -p libmono-system2.0-cil -m 2.0 --internal-mono
-	debian/dh_makeclilibs -p libmono-system-data1.0-cil -m 1.2.6 --internal-mono
-	debian/dh_makeclilibs -p libmono-system-data2.0-cil -m 1.2.6 --internal-mono
-	debian/dh_makeclilibs -p libmono-system-ldap2.0-cil -m 1.2.6 --internal-mono
-	debian/dh_makeclilibs -p libmono-system-runtime2.0-cil -m 2.0 --internal-mono
-	debian/dh_makeclilibs -p libmono-system-web2.0-cil -m 1.9.1 --internal-mono
-	debian/dh_makeclilibs -p libmono-security1.0-cil -m 2.0 --internal-mono
-	debian/dh_makeclilibs -p libmono-security2.0-cil -m 2.0 --internal-mono
-	debian/dh_makeclilibs -p libmono-sqlite1.0-cil -m 1.2.6 --internal-mono
-	debian/dh_makeclilibs -p libmono-sqlite2.0-cil -m 1.2.6 --internal-mono
-	debian/dh_makeclilibs -p libmono-web1.0-cil -m 1.9 --internal-mono
-	debian/dh_makeclilibs -p libmono-web2.0-cil -m 2.0 --internal-mono
-	debian/dh_makeclilibs -p libmono-winforms1.0-cil -m 1.2.6 --internal-mono
-	debian/dh_makeclilibs -p libmono-winforms2.0-cil -m 2.0 --internal-mono
-	debian/dh_makeclilibs -p libmono-relaxng1.0-cil -m 1.9 --internal-mono
-	debian/dh_makeclilibs -p libmono-relaxng2.0-cil -m 1.9 --internal-mono
+	debian/dh_makeclilibs -i -m 1.0
+	debian/dh_makeclilibs -p libmono1.0-cil -m 2.0
+	debian/dh_makeclilibs -p libmono2.0-cil -m 2.0
+	debian/dh_makeclilibs -p libmono-cairo1.0-cil -m 2.0
+	debian/dh_makeclilibs -p libmono-cairo2.0-cil -m 2.0
+	debian/dh_makeclilibs -p libmono-corlib1.0-cil -m 1.2.2.1
+	debian/dh_makeclilibs -p libmono-corlib2.0-cil -m 1.2.2.1
+	debian/dh_makeclilibs -p libmono-data-tds1.0-cil -m 2.0
+	debian/dh_makeclilibs -p libmono-data-tds2.0-cil -m 2.0
+	debian/dh_makeclilibs -p libmono-ldap1.0-cil -m 1.2.6
+	debian/dh_makeclilibs -p libmono-ldap2.0-cil -m 1.2.6
+	debian/dh_makeclilibs -p libmono-oracle2.0-cil -m 1.2.6
+	debian/dh_makeclilibs -p libmono-microsoft-build2.0-cil -m 1.2.6
+	debian/dh_makeclilibs -p libmono-system1.0-cil -m 1.2.6
+	debian/dh_makeclilibs -p libmono-system2.0-cil -m 2.0
+	debian/dh_makeclilibs -p libmono-system-data1.0-cil -m 1.2.6
+	debian/dh_makeclilibs -p libmono-system-data2.0-cil -m 1.2.6
+	debian/dh_makeclilibs -p libmono-system-ldap2.0-cil -m 1.2.6
+	debian/dh_makeclilibs -p libmono-system-runtime2.0-cil -m 2.0
+	debian/dh_makeclilibs -p libmono-system-web2.0-cil -m 1.9.1
+	debian/dh_makeclilibs -p libmono-security1.0-cil -m 2.0
+	debian/dh_makeclilibs -p libmono-security2.0-cil -m 2.0
+	debian/dh_makeclilibs -p libmono-sqlite1.0-cil -m 1.2.6
+	debian/dh_makeclilibs -p libmono-sqlite2.0-cil -m 1.2.6
+	debian/dh_makeclilibs -p libmono-web1.0-cil -m 1.9
+	debian/dh_makeclilibs -p libmono-web2.0-cil -m 2.0
+	debian/dh_makeclilibs -p libmono-winforms1.0-cil -m 1.2.6
+	debian/dh_makeclilibs -p libmono-winforms2.0-cil -m 2.0
+	debian/dh_makeclilibs -p libmono-relaxng1.0-cil -m 1.9
+	debian/dh_makeclilibs -p libmono-relaxng2.0-cil -m 1.9
 	# preview APIs get tighter clilibs
-	debian/dh_makeclilibs -p libmono-system2.1-cil -m 2.0 --internal-mono
-	debian/dh_clideps -i -l debian/tmp --internal-mono
-	#DH_VERBOSE=1 debian/dh_clideps -i -l debian/tmp --internal-mono
+	debian/dh_makeclilibs -p libmono-system2.1-cil -m 2.0
+	debian/dh_clideps -i -l debian/tmp
+	#DH_VERBOSE=1 debian/dh_clideps -i -l debian/tmp
 	# mono-gac needs special runtime dep, to prevent circular dep (mono-runtime <-> mono-gac)
-	debian/dh_clideps -p mono-gac -r --internal-mono
+	debian/dh_clideps -p mono-gac -r
 	dh_gencontrol -i -- -Vmono:upversion=$(UPVERSION) -Vmono:next-upversion=$(NEXT_UPVERSION)
 	dh_md5sums -i
 	dh_builddeb -i

More information about the Pkg-mono-svn-commits mailing list