[Pkg-mono-svn-commits] rev 3898 - mono/trunk/debian
Mirco Bauer
meebey at alioth.debian.org
Thu Jan 29 23:28:45 UTC 2009
Author: meebey
Date: 2009-01-29 23:28:45 +0000 (Thu, 29 Jan 2009)
New Revision: 3898
Modified:
mono/trunk/debian/changelog
mono/trunk/debian/rules
Log:
darn we can't abuse DH_OPTIONS because many dh_* tools handle unknown non-option arguments fatal!
Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog 2009-01-29 22:59:52 UTC (rev 3897)
+++ mono/trunk/debian/changelog 2009-01-29 23:28:45 UTC (rev 3898)
@@ -1,8 +1,6 @@
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
Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules 2009-01-29 22:59:52 UTC (rev 3897)
+++ mono/trunk/debian/rules 2009-01-29 23:28:45 UTC (rev 3898)
@@ -12,7 +12,6 @@
ifeq ($(shell dpkg --compare-versions $$(dpkg-query -f '$${Version}' -W debhelper) lt 7.1; echo $$?), 0)
DH_INTERNAL_MONO_PARAM = internal-mono
endif
-export DH_OPTIONS += $(DH_INTERNAL_MONO_PARAM)
DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -286,42 +285,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
- 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
+ debian/dh_makeclilibs -i -m 1.0 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono1.0-cil -m 2.0 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono2.0-cil -m 2.0 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-cairo1.0-cil -m 2.0 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-cairo2.0-cil -m 2.0 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-corlib1.0-cil -m 1.2.2.1 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-corlib2.0-cil -m 1.2.2.1 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-data-tds1.0-cil -m 2.0 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-data-tds2.0-cil -m 2.0 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-ldap1.0-cil -m 1.2.6 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-ldap2.0-cil -m 1.2.6 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-oracle2.0-cil -m 1.2.6 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-microsoft-build2.0-cil -m 1.2.6 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-system1.0-cil -m 1.2.6 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-system2.0-cil -m 2.0 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-system-data1.0-cil -m 1.2.6 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-system-data2.0-cil -m 1.2.6 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-system-ldap2.0-cil -m 1.2.6 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-system-runtime2.0-cil -m 2.0 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-system-web2.0-cil -m 1.9.1 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-security1.0-cil -m 2.0 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-security2.0-cil -m 2.0 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-sqlite1.0-cil -m 1.2.6 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-sqlite2.0-cil -m 1.2.6 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-web1.0-cil -m 1.9 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-web2.0-cil -m 2.0 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-winforms1.0-cil -m 1.2.6 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-winforms2.0-cil -m 2.0 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-relaxng1.0-cil -m 1.9 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_makeclilibs -p libmono-relaxng2.0-cil -m 1.9 $(DH_INTERNAL_MONO_PARAM)
# preview APIs get tighter clilibs
- 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
+ debian/dh_makeclilibs -p libmono-system2.1-cil -m 2.0 $(DH_INTERNAL_MONO_PARAM)
+ debian/dh_clideps -i -l debian/tmp $(DH_INTERNAL_MONO_PARAM)
+ #DH_VERBOSE=1 debian/dh_clideps -i -l debian/tmp $(DH_INTERNAL_MONO_PARAM)
# mono-gac needs special runtime dep, to prevent circular dep (mono-runtime <-> mono-gac)
- debian/dh_clideps -p mono-gac -r
+ debian/dh_clideps -p mono-gac -r $(DH_INTERNAL_MONO_PARAM)
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