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

[Mirco Bauer]

Author: meebey-guest
Date: 2004-06-30 12:42:59 -0600 (Wed, 30 Jun 2004)
New Revision: 1164

Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/mono-utils.install
   mono/trunk/debian/rules
Log:
- cleanups



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2004-06-30 16:52:08 UTC (rev 1163)
+++ mono/trunk/debian/changelog	2004-06-30 18:42:59 UTC (rev 1164)
@@ -1,8 +1,10 @@
-mono (1.0-0pre1) unstable; urgency=low
+mono (1.0-0pre1v1) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release (1.0 final)
+  * Mirco 'meebey' Bauer
+    + debian/rules: cleanup
 
- -- Eduard Bloch <blade@debian.org>  Mon, 28 Jun 2004 20:18:23 +0200
+ -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>  Mon, 30 Jun 2004 18:41:27 +0200
 
 mono (0.97-1) unstable; urgency=medium
 

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2004-06-30 16:52:08 UTC (rev 1163)
+++ mono/trunk/debian/control	2004-06-30 18:42:59 UTC (rev 1164)
@@ -2,7 +2,7 @@
 Section: interpreters
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>
-Uploaders: Eduard Bloch <blade@debian.org>, Teófilo Ruiz Suárez <teo@debian.org>, Mirco 'meebey' Bauer <mail@meebey.net>
+Uploaders: Eduard Bloch <blade@debian.org>, Teófilo Ruiz Suárez <teo@debian.org>, Mirco Bauer <meebey@meebey.net>
 Build-Depends: debhelper (>> 3.0.0), libglib2.0-dev, bison, automake1.7 | automake, libtool, dpatch, libicu28-dev [!arm]
 Build-Conflicts: libmint-dev
 Standards-Version: 3.6.1

Modified: mono/trunk/debian/mono-utils.install
===================================================================
--- mono/trunk/debian/mono-utils.install	2004-06-30 16:52:08 UTC (rev 1163)
+++ mono/trunk/debian/mono-utils.install	2004-06-30 18:42:59 UTC (rev 1164)
@@ -1,5 +1,8 @@
-debian/dh_makenetlibs debian/dh_netdeps debian/dh_installxsp /usr/bin
-debian/postrm-monoxsp debian/postinst-monoxsp /usr/share/debhelper/autoscripts/
+debian/dh_makenetlibs		/usr/bin
+debian/dh_netdeps		/usr/bin
+debian/dh_installxsp		/usr/bin
+debian/postrm-monoxsp		/usr/share/debhelper/autoscripts
+debian/postinst-monoxsp		/usr/share/debhelper/autoscripts
 debian/tmp/usr/bin/pedump
 debian/tmp/usr/bin/monodis
 debian/tmp/usr/bin/monograph

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2004-06-30 16:52:08 UTC (rev 1163)
+++ mono/trunk/debian/rules	2004-06-30 18:42:59 UTC (rev 1164)
@@ -2,7 +2,7 @@
 
 #export DH_VERBOSE=1
 export DH_COMPAT=3
-export MONO_SHARED_DIR=$(CURDIR)/.wabi
+export MONO_SHARED_DIR=$(CURDIR)
 
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
@@ -10,10 +10,11 @@
 JIT="--with-jit=no"
 endif
 
-include /usr/share/dpatch/dpatch.make
 VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
 UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,')
 
+include /usr/share/dpatch/dpatch.make
+
 cli-wrapper: debian/cli-wrapper.c
 	$(CC) -o cli-wrapper debian/cli-wrapper.c `pkg-config glib-2.0 --cflags --libs`
 
@@ -21,18 +22,14 @@
 #build: build-stamp
 build-stamp: cli-wrapper
 	dh_testdir
-	# using a better dllmap
-	cp $(CURDIR)/debian/config.in $(CURDIR)/data/config.in
-	# refresh autotools crap
-	#install -m755 debian/autogen.sh .
-	#NOCONFIGURE=yes ./autogen.sh
-	#./autogen.sh --prefix=/usr --with-gc=included
+	# using a better dllmap (should be fixed since beta1)
+	#cp $(CURDIR)/debian/config.in $(CURDIR)/data/config.in
 	./configure --prefix=/usr --with-gc=included \
 	  --mandir=\$${prefix}/share/man \
 	  --infodir=\$${prefix}/share/info \
 	  --sysconfdir=/etc --with-sigaltstack=no $(JIT) \
 	  --with-preview=yes
-# we don't touch precompiled stuff
+	# we don't touch precompiled stuff
 	perl -pe 's,\ runtime\ ,  ,' -i Makefile
 	$(MAKE)
 	( cat debian/mono-jit.postinst.head; ARCH= ; case `dpkg-architecture -qDEB_HOST_ARCH` in i386|powerpc|s390) cat debian/mono-jit.postinst.mono-setup ;; *) cat debian/mono-jit.postinst.mint-setup ;; esac ) > debian/mono-jit.postinst
@@ -42,7 +39,7 @@
 #clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp autogen.sh
+	rm -f build-stamp
 	# Use the right clean target depending if we ran ./autogen.sh or not
 	-if [ -e "needs-maintclean" ]; then	\
 	  rm -f needs-maintclean;		\
@@ -65,8 +62,6 @@
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	cd debian ; for x in dh_netdeps dh_makenetlibs dh_installxsp ; \
 		do chmod +x $$x; pod2man $$x > $$x.1 ; done
-#	# this is no longer installed by the build system, why?
-#	cp -a ./mono/metadata/monosn $(CURDIR)/debian/tmp/usr/bin
 	# removing trash (real assemblies/libs get build by the mcs source package)
 	rm -f $(CURDIR)/debian/tmp/usr/lib/mscorlib.dll
 	rm -rf $(CURDIR)/debian/tmp/usr/lib/mono
@@ -79,7 +74,7 @@
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
-	dh_install -i
+	dh_install -i --list-missing
 	dh_link -i
 	dh_installchangelogs -i ChangeLog
 	dh_installdocs -i
@@ -99,15 +94,9 @@
 binary-arch: build install
 	dh_testdir -s
 	dh_testroot -s
-	dh_install -s
+	dh_install -s --list-missing
 	dh_link -s
 	install -m644 -D debian/lintian debian/mono/usr/share/lintian/overrides/mono
-	# the SONAMEs fix, done via dpatch now
-#	perl -pe 's/-0.dll(.*)\.so/-0.dll$$1.so.0/; s/libgstreamer-0.6.so/libgstreamer-0.6.so.0/;' -i debian/mono-common/etc/mono/config
-	# gnomeui soname fix, it sucks
-	# perl -pe 's!<configuration>!<configuration>\n<dllmap dll="gnomeui-2" target="libgnomeui-2.so.0" />!' -i debian/mono-common/etc/mono/config
-#	cd debian; for s in *.shlibs.in ; do sed -e "s/_VERSION_/$(VERSION)/g" < $$s | tee $${s%%.in} | tee $${s%%.shlibs.in}/DEBIAN/shlibs >> shlibs.local ; done
-#	cd debian; for s in *.shlibs.in ; do sed -e "s/_VERSION_/$(VERSION)/g" < $$s | tee $${s%%.in} >> shlibs.local ; done
 	dh_installchangelogs -s
 	dh_installdocs -s
 	dh_installexamples -s