[Pkg-mono-svn-commits] rev 1505 - mcs/trunk/debian
Mirco Bauer
meebey-guest@costa.debian.org
Sun, 30 Jan 2005 20:51:20 +0100
Author: meebey-guest
Date: 2005-01-30 20:51:19 +0100 (Sun, 30 Jan 2005)
New Revision: 1505
Modified:
mcs/trunk/debian/changelog
mcs/trunk/debian/lintian
mcs/trunk/debian/mono-assemblies-base.install
mcs/trunk/debian/mono-assemblies-base.links
mcs/trunk/debian/mono-gac.install
mcs/trunk/debian/mono-gac.links
mcs/trunk/debian/mono-jay.docs
mcs/trunk/debian/mono-mcs.install
mcs/trunk/debian/mono-mcs.links
mcs/trunk/debian/rules
Log:
- disabled building .NET 2.0 classlib.
- big cleanup.
Modified: mcs/trunk/debian/changelog
===================================================================
--- mcs/trunk/debian/changelog 2005-01-30 17:27:35 UTC (rev 1504)
+++ mcs/trunk/debian/changelog 2005-01-30 19:51:19 UTC (rev 1505)
@@ -1,3 +1,15 @@
+mcs (1.0.5-0pre1) unstable; urgency=high
+
+ * New upstream release
+ * Mirco 'meebey' Bauer
+ + urgency set to high because of FTBFS fix for ppc and s390
+ + disabled building of .NET 2.0 classlib, because it breaks too much.
+ Upstream said it should not be used, even Novell does not ship it.
+ (Closes: #290234 FTBFS)
+ + cleanups in debian/rules
+
+ -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org> Sun, 30 Jan 2004 02:09:07 +0200
+
mcs (1.0.4-1) unstable; urgency=high
* New upstream release
Modified: mcs/trunk/debian/lintian
===================================================================
--- mcs/trunk/debian/lintian 2005-01-30 17:27:35 UTC (rev 1504)
+++ mcs/trunk/debian/lintian 2005-01-30 19:51:19 UTC (rev 1505)
@@ -2,28 +2,11 @@
mono-mcs: binary-without-manpage EnumCheck
mono-mcs: binary-without-manpage GenerateDelegate
mono-mcs: binary-without-manpage IFaceDisco
-mono-mcs: binary-without-manpage MakeCert
mono-mcs: binary-without-manpage browsercaps-updater
-mono-mcs: binary-without-manpage cert2spc
-mono-mcs: binary-without-manpage chktrust
-mono-mcs: binary-without-manpage cilc
-mono-mcs: binary-without-manpage disco
-mono-mcs: binary-without-manpage genxs
mono-mcs: binary-without-manpage ictool
-mono-mcs: binary-without-manpage ilasm
-mono-mcs: binary-without-manpage jay
mono-mcs: binary-without-manpage mbas
-mono-mcs: binary-without-manpage mcs
mono-mcs: binary-without-manpage mddump
mono-mcs: binary-without-manpage mono-api-diff
mono-mcs: binary-without-manpage mono-api-info
mono-mcs: binary-without-manpage monoresgen
-mono-mcs: binary-without-manpage monostyle
mono-mcs: binary-without-manpage nunit-console
-mono-mcs: binary-without-manpage secutil
-mono-mcs: binary-without-manpage signcode
-mono-mcs: binary-without-manpage sn
-mono-mcs: binary-without-manpage soapsuds
-mono-mcs: binary-without-manpage sqlsharp
-mono-mcs: binary-without-manpage wsdl
-mono-mcs: binary-without-manpage xsd
Modified: mcs/trunk/debian/mono-assemblies-base.install
===================================================================
--- mcs/trunk/debian/mono-assemblies-base.install 2005-01-30 17:27:35 UTC (rev 1504)
+++ mcs/trunk/debian/mono-assemblies-base.install 2005-01-30 19:51:19 UTC (rev 1505)
@@ -1,2 +1,2 @@
-debian/tmp1/usr/lib/*.dll /usr/lib
-debian/tmp2/usr/lib/mono/* debian/tmp1/usr/lib/mono/* /usr/share/dotnet/mono/
+debian/tmp1/usr/lib/*.dll /usr/lib/
+debian/tmp1/usr/lib/mono/* /usr/share/dotnet/mono/
Modified: mcs/trunk/debian/mono-assemblies-base.links
===================================================================
--- mcs/trunk/debian/mono-assemblies-base.links 2005-01-30 17:27:35 UTC (rev 1504)
+++ mcs/trunk/debian/mono-assemblies-base.links 2005-01-30 19:51:19 UTC (rev 1505)
@@ -1 +1 @@
-usr/share/dotnet/mono usr/lib/mono
+/usr/share/dotnet/mono /usr/lib/mono
Modified: mcs/trunk/debian/mono-gac.install
===================================================================
--- mcs/trunk/debian/mono-gac.install 2005-01-30 17:27:35 UTC (rev 1504)
+++ mcs/trunk/debian/mono-gac.install 2005-01-30 19:51:19 UTC (rev 1505)
@@ -1 +1 @@
-debian/tmp2/usr/bin/gacutil.exe usr/share/dotnet/bin/
+debian/tmp1/usr/bin/gacutil.exe /usr/share/dotnet/bin/
Modified: mcs/trunk/debian/mono-gac.links
===================================================================
--- mcs/trunk/debian/mono-gac.links 2005-01-30 17:27:35 UTC (rev 1504)
+++ mcs/trunk/debian/mono-gac.links 2005-01-30 19:51:19 UTC (rev 1505)
@@ -1 +1 @@
-usr/bin/cli-wrapper usr/bin/gacutil
+/usr/bin/cli-wrapper /usr/bin/gacutil
Modified: mcs/trunk/debian/mono-jay.docs
===================================================================
--- mcs/trunk/debian/mono-jay.docs 2005-01-30 17:27:35 UTC (rev 1504)
+++ mcs/trunk/debian/mono-jay.docs 2005-01-30 19:51:19 UTC (rev 1505)
@@ -1,6 +1,5 @@
-jay/ACKNOWLEDGEMENTS
-jay/NEW_FEATURES
-jay/NOTES
-jay/README
-jay/README.jay
-
+debian/tmp2/usr/share/jay/ACKNOWLEDGEMENTS
+debian/tmp2/usr/share/jay/NEW_FEATURES
+debian/tmp2/usr/share/jay/NOTES
+debian/tmp2/usr/share/jay/README
+debian/tmp2/usr/share/jay/README.jay
Modified: mcs/trunk/debian/mono-mcs.install
===================================================================
--- mcs/trunk/debian/mono-mcs.install 2005-01-30 17:27:35 UTC (rev 1504)
+++ mcs/trunk/debian/mono-mcs.install 2005-01-30 19:51:19 UTC (rev 1505)
@@ -1,3 +1,2 @@
-debian/tmp2/usr/bin/*.exe /usr/share/dotnet/bin/
-gmcs/gmcs.exe /usr/share/dotnet/mono/2.0/
-debian/tmp1/usr/lib/mono/1.0/*.exe /usr/share/dotnet/mono/1.0/
+debian/tmp1/usr/bin/*.exe /usr/share/dotnet/bin/
+debian/tmp1/usr/lib/mono/1.0/*.exe /usr/share/dotnet/mono/1.0/
Modified: mcs/trunk/debian/mono-mcs.links
===================================================================
--- mcs/trunk/debian/mono-mcs.links 2005-01-30 17:27:35 UTC (rev 1504)
+++ mcs/trunk/debian/mono-mcs.links 2005-01-30 19:51:19 UTC (rev 1505)
@@ -1,3 +1,2 @@
/usr/share/dotnet/mono/1.0 /usr/share/dotnet/bin/mcs
-/usr/share/dotnet/mono/2.0 /usr/share/dotnet/bin/gmcs
/usr/share/dotnet/mono/1.0 /usr/share/dotnet/bin/mbas
Modified: mcs/trunk/debian/rules
===================================================================
--- mcs/trunk/debian/rules 2005-01-30 17:27:35 UTC (rev 1504)
+++ mcs/trunk/debian/rules 2005-01-30 19:51:19 UTC (rev 1505)
@@ -1,54 +1,44 @@
#!/usr/bin/make -f
#export DH_VERBOSE=1
-#export DH_COMPAT=3
export MONO_SHARED_DIR=$(CURDIR)
+
UPVERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\ -f2 | sed 's,-.*,,')
NEXT_UPVERSION = $(shell perl -e '$$_=pop; s/(\d+)$$/$$1+1/e; print' $(UPVERSION))
+
DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
# since s390 has problems building the indep part (compiler, classlib) we only build arch
-TARGETS := build-arch
-ifneq ($(DEB_BUILD_ARCH), s390)
- TARGETS := $(TARGETS) build-indep
+TARGETS := binary-arch binary-indep
+ifeq ($(DEB_BUILD_ARCH), s390)
+ TARGETS := binary-arch
endif
# Include dpatch stuff.
include /usr/share/dpatch/dpatch.make
-build: $(TARGETS)
+build: build-indep build-arch
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-indep: build-indep-stamp
build-indep-stamp: patch-stamp
dh_testdir
dh_clean -k
- #perl -pe 's/RUNTIME.=.mono/RUNTIME = cli/;' -i $(CURDIR)/build/config-default.make
- # gacutil bug, he ignores the /root parameter
- #perl -pe 's,/root \$$\(DESTDIR\)\$$\(prefix\)/lib /package \$$\(PACKAGE\),/package \$$\(PACKAGE\) /root \$$\(DESTDIR\)\$$\(prefix\)/lib,' \
- -i $(CURDIR)/build/library.make
./configure --prefix=/usr
$(MAKE) RUNTIME=/usr/bin/cli
- # tmp1 for net_1_0 and tmp2 for net_2_0
+ # tmp1 for net_1_0 and tmp2 for jay
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp1 RUNTIME=/usr/bin/cli
+ # creating relative symlinks
cd $(CURDIR)/debian/tmp1/usr/lib/mono/1.0 && ln -sf ../gac/*/*/*.dll .
- make clean
- ./configure --prefix=/usr --profile=net_2_0
- $(MAKE) RUNTIME=/usr/bin/cli
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp2 RUNTIME=/usr/bin/cli
- cd $(CURDIR)/debian/tmp2/usr/lib/mono/2.0 && ln -sf ../gac/*/*/*.dll .
- # both dirs are merged with dh_install for the each package later
touch build-indep-stamp
clean: unpatch
@@ -75,10 +65,17 @@
dh_installdirs
dh_install
dh_link
+ # delete compiler/programs from mono-assemblies-base (has it's own package)
rm -f debian/mono-assemblies-base/usr/share/dotnet/mono/1.0/*.exe
- rm -f debian/mono-mcs/usr/share/dotnet/bin/gacutil*
+ # delete gacutil from mono-mcs (has it's own package)
+ rm -f debian/mono-mcs/usr/share/dotnet/bin/gacutil.exe
+ # MonoConventions: create cli-wrapper symlinks for the .exes
for x in $(CURDIR)/debian/*/usr/bin ; do cd $$x ; for y in `find ../share/dotnet -name '*.exe' 2>/dev/null` ; do ln -sf cli-wrapper `basename $$y .exe` ; done ; done
- find $(CURDIR)/debian/mono-assemblies-base/usr/lib $(CURDIR)/debian/mono-assemblies-base/usr/share/dotnet/mono -type f -name "*.dll" -exec chmod -x {} \;
+ # MonoConventions: removing executable flag from .dlls
+ find $(CURDIR)/debian -type f -name "*.dll" -or name "*.cs" | xargs chmod -x
+ # MonoConventions: adding executable flag to .exes
+ find $(CURDIR)/debian -type f -name "*.exe" | xargs chmod +x
+ # missing sqlite dll map
DIR=$$(echo $(CURDIR)/debian/mono-assemblies-base/usr/share/dotnet/mono/gac/Mono.Data.SqliteClient/1.0.*); \
echo '<dllmap dll="sqlite" target="libsqlite.so.0" />' > $$DIR/Mono.Data.SqliteClient.dll.config
@@ -88,10 +85,7 @@
dh_installchangelogs -i ChangeLog
dh_installdocs -i
install -D -m644 $(CURDIR)/debian/lintian $(CURDIR)/debian/mono-mcs/usr/share/lintian/overrides/mono-mcs
-# dh_installexamples
-# dh_installdebconf
dh_installman -i
-# dh_undocumented
dh_compress -i
dh_fixperms -i
dh_installdeb -i
@@ -105,15 +99,14 @@
dh_testdir -s
dh_testroot -s
dh_installchangelogs -s ChangeLog
+ dh_installchangelogs -pmono-jay $(CURDIR)/jay/ChangeLog
dh_installdocs -s
dh_installman -s
- dh_installexamples -pmono-jay jay/skeleton.cs
-# dh_installdebconf
-# dh_undocumented
+ dh_installexamples -pmono-jay $(CURDIR)/jay/skeleton.cs
dh_strip -s
if [ $(DEB_HOST_ARCH) = i386 -o $(DEB_HOST_ARCH) = powerpc ] ; then echo "gdi:Depends=libgdiplus" >> $(CURDIR)/debian/mono-assemblies-arch.substvars ; fi
# winelib not ready yet
-# if [ $(DEB_HOST_ARCH) = i386 ] ; then echo "wine:Depends=libwine-cil" >> $(CURDIR)/debian/mono-assemblies-arch.substvars ; fi
+ #if [ $(DEB_HOST_ARCH) = i386 ] ; then echo "wine:Depends=libwine-cil" >> $(CURDIR)/debian/mono-assemblies-arch.substvars ; fi
dh_shlibdeps -s -Xlibgdiplus.dll.so
dh_compress -s -Xskeleton.cs
dh_fixperms -s
@@ -122,6 +115,6 @@
dh_md5sums -s
dh_builddeb -s
-binary: binary-indep binary-arch
+binary: $(TARGETS)
.PHONY: clean build build-indep build-arch binary binary-indep binary-arch \
install install-indep install-arch patch unpatch