[Pkg-mono-svn-commits] rev 971 - mcs/trunk/debian

[Eduard Bloch]

Author: blade
Date: 2004-06-12 12:56:06 -0600 (Sat, 12 Jun 2004)
New Revision: 971

Added:
   mcs/trunk/debian/compat
Modified:
   mcs/trunk/debian/changelog
   mcs/trunk/debian/control
   mcs/trunk/debian/rules
Log:
Changes to use dh stuff


Modified: mcs/trunk/debian/changelog
===================================================================
--- mcs/trunk/debian/changelog	2004-06-12 18:47:47 UTC (rev 970)
+++ mcs/trunk/debian/changelog	2004-06-12 18:56:06 UTC (rev 971)
@@ -1,10 +1,10 @@
-mcs (0.95-0pre1v2) unstable; urgency=low
+mcs (0.95-0pre1v3) unstable; urgency=low
 
   * Mirco 'meebey' Bauer
     + New upstream release
     + debian/rules: added workaround patch for gacutil bug
   * Eduard Bloch
-    + Added the virtual dependency packages (mono-assemblies-base-0.95)
+    + changed to the dh scripts to manage dependency information
     + Building additional net_2_0 profile, installed along with net_1_0.
       mscorlib.dll will still be from net_1_0
     + installation commands overhaul, away from dh_movefiles

Added: mcs/trunk/debian/compat
===================================================================
--- mcs/trunk/debian/compat	2004-06-12 18:47:47 UTC (rev 970)
+++ mcs/trunk/debian/compat	2004-06-12 18:56:06 UTC (rev 971)
@@ -0,0 +1 @@
+4

Modified: mcs/trunk/debian/control
===================================================================
--- mcs/trunk/debian/control	2004-06-12 18:47:47 UTC (rev 970)
+++ mcs/trunk/debian/control	2004-06-12 18:56:06 UTC (rev 971)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>
 Uploaders: Eduard Bloch <blade@debian.org>, Mirco 'meebey' Bauer <mail@meebey.net>
-Build-Depends: debhelper (>> 3.0.0), mono-mcs | c-sharp-compiler, libxslt1-dev, libicu28-dev
+Build-Depends: debhelper (>> 3.0.0), mono-mcs | c-sharp-compiler, libxslt1-dev, libicu28-dev, mono-utils (>= 0.95)
 Build-Conflicts: mono-assemblies-base (<< 0.95), mono-assemblies-base (>> 0.95.20)
 Standards-Version: 3.6.1
 
@@ -12,7 +12,6 @@
 Architecture: all
 Depends: libxslt1
 Recommends: mono-assemblies-arch
-Provides: mono-assemblies-base-${mono:upversion}
 Conflicts: mono-assemblies
 Description: the Mono .NET class libraries
  The Mono Project is an open development initiative sponsored by Ximian that is

Modified: mcs/trunk/debian/rules
===================================================================
--- mcs/trunk/debian/rules	2004-06-12 18:47:47 UTC (rev 970)
+++ mcs/trunk/debian/rules	2004-06-12 18:56:06 UTC (rev 971)
@@ -1,12 +1,24 @@
 #!/usr/bin/make -f
 
 #export DH_VERBOSE=1
-export DH_COMPAT=3
+#export DH_COMPAT=3
 export MONO_SHARED_DIR=$(CURDIR)/.wabi
 
 VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
 UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,')
+NEXTVERSION = $(UPVERSION).zzz
 
+build-arch: build-arch-stamp
+build-arch-stamp:
+	dh_testdir
+	dh_clean -k
+	./configure --prefix=/usr
+	mkdir -p $(CURDIR)/debian/tmp2
+	cd jay && $(MAKE)
+	cd jay && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp2
+	# both dirs are merged with dh_install for the each package later
+	touch build-arch-stamp
+
 build: build-stamp
 build-stamp:
 	dh_testdir
@@ -37,6 +49,14 @@
 	rm -rf $(CURDIR)/.wabi debian/tmp?
 	dh_clean
 
+install-arch:
+	dh_testdir -s
+	dh_testroot -s
+	dh_clean -k -s
+	dh_installdirs -s
+	dh_install -s
+	dh_link -s
+
 install: build
 	dh_testdir
 	dh_testroot
@@ -63,11 +83,13 @@
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
+	dh_makenetlibs -i -m $(UPVERSION) -l $(NEXTVERSION)
+	dh_netdeps -i
 	dh_gencontrol -i -- -Vmono:upversion=$(UPVERSION)
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary-arch: build install
+binary-arch: build-arch install-arch
 	dh_testdir -s
 	dh_testroot -s
 	dh_installchangelogs -s ChangeLog