[Pkg-mono-svn-commits] rev 1180 - monodoc/trunk/debian

[Mirco Bauer]

Author: meebey-guest
Date: 2004-07-02 18:49:21 -0600 (Fri, 02 Jul 2004)
New Revision: 1180

Modified:
   monodoc/trunk/debian/changelog
   monodoc/trunk/debian/rules
Log:
- fixes/updates



Modified: monodoc/trunk/debian/changelog
===================================================================
--- monodoc/trunk/debian/changelog	2004-07-03 00:21:08 UTC (rev 1179)
+++ monodoc/trunk/debian/changelog	2004-07-03 00:49:21 UTC (rev 1180)
@@ -6,6 +6,7 @@
     + FTBFS: added libmono-dev, pkg-config, mono-gac, libgtk-cil and
       libglade-cil to Build-Depends
     + changed libgnome-cil version dep to >= 0.91
+    + debian/rules: fixed .wapi path
 
  -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>  Wed, 30 Jun 2004 01:06:54 +0200
 

Modified: monodoc/trunk/debian/rules
===================================================================
--- monodoc/trunk/debian/rules	2004-07-03 00:21:08 UTC (rev 1179)
+++ monodoc/trunk/debian/rules	2004-07-03 00:49:21 UTC (rev 1180)
@@ -1,12 +1,12 @@
 #!/usr/bin/make -f
 
 #export DH_VERBOSE=1
-export MONO_SHARED_DIR=$(CURDIR)/.wabi
+export MONO_SHARED_DIR=$(CURDIR)
 
 build: build-stamp
 build-stamp:
 	dh_testdir
-	mkdir -p $$MONO_SHARED_DIR
+	mkdir -p $$MONO_SHARED_DIR/.wapi
 	./configure --prefix=/usr
 	$(MAKE)
 	touch build-stamp
@@ -16,7 +16,7 @@
 	dh_testroot
 	rm -f build-stamp
 	-$(MAKE) clean
-	rm -rf $$MONO_SHARED_DIR
+	rm -rf $$MONO_SHARED_DIR/.wapi
 	# remove our shipped files
 	-cd $(CURDIR)/browser/web && \
 	  rm -f common.css
@@ -30,11 +30,11 @@
 	dh_clean -k
 	dh_installdirs
 	# fix, upstream forgot some files (should be fixed in 0.11)
-	cd $(CURDIR)/debian && \
-	  uudecode -o - missing-files.tar.uu | tar x
-	cd $(CURDIR)/debian/missing-files && \
-	  cp common.css mono-new.png \
-	    $(CURDIR)/browser/web
+	#cd $(CURDIR)/debian && \
+	#  uudecode -o - missing-files.tar.uu | tar x
+	#cd $(CURDIR)/debian/missing-files && \
+	#  cp common.css mono-new.png \
+	#    $(CURDIR)/browser/web
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 ALIAS_PATHS = usr/share/dotnet/mono/monodoc usr/share/dotnet/mono/gtk-sharp
@@ -56,15 +56,9 @@
 	find $(CURDIR)/debian/monodoc-http/usr/share/dotnet/monodoc/web -type f -exec chmod 644 {} \;
 	find $(CURDIR)/debian/monodoc-http/usr/share/dotnet/monodoc/web -type d -exec chmod 755 {} \;
 	perl -pe 's,/usr/lib/monodoc,/usr/share/dotnet/monodoc,;' \
-	  -i $(CURDIR)/debian/monodoc-base/usr/share/dotnet/mono/gac/monodoc/1.0.0.0__0738eb9f132ed756/monodoc.dll.config
+	  -i $(CURDIR)/debian/monodoc-base/usr/share/dotnet/mono/gac/monodoc/*/monodoc.dll.config
 	perl -pe 's,^prefix=.*,prefix=/usr/share/dotnet\n,;s,^monodocdir=.*,monodocdir=/usr/share/dotnet/monodoc\n,;s,mono --debug,/usr/bin/cli,; s,/usr/lib/monodoc,/usr/share/dotnet/monodoc,; s,mono ,/usr/bin/cli ,;' \
 	  -i $(CURDIR)/debian/monodoc-base/usr/share/dotnet/monodoc/monodoc
-	perl -ne ' \
-	   next if m/monohb/; \
-	   next if m/classlib-gtkmozembed/; \
-	   next if m/classlib-diacanvas/; \
-	   next if m/various/; print \
-	   ' -i $(CURDIR)/debian/monodoc-manual/usr/share/dotnet/monodoc/monodoc.xml
 	perl -pe 's,\$${exec_prefix}/lib,/usr/share/dotnet,;' \
 	  -i $(CURDIR)/debian/monodoc-base/usr/lib/pkgconfig/monodoc.pc
 	for x in $(ALIAS_PATHS) ; do cd $(CURDIR)/debian/monodoc-base/$$x && ln -sf `find ../gac -name "*.dll"` .; done