[Pkg-mono-svn-commits] rev 1013 - xsp/trunk/debian

[Pablo Fischer]

Author: pabl0-guest
Date: 2004-06-14 23:34:36 -0600 (Mon, 14 Jun 2004)
New Revision: 1013

Modified:
   xsp/trunk/debian/changelog
   xsp/trunk/debian/rules
Log:
New prerelease and added mono-utils stuff to rules, some fixes and bla bla 


Modified: xsp/trunk/debian/changelog
===================================================================
--- xsp/trunk/debian/changelog	2004-06-15 05:30:28 UTC (rev 1012)
+++ xsp/trunk/debian/changelog	2004-06-15 05:34:36 UTC (rev 1013)
@@ -1,3 +1,22 @@
+xsp (0.14-7) unstable; urgency=low
+	
+  * NOT RELEASED
+  * Rewrited README.Debian files	
+  * Added more docs to packages 
+  * dlls of asp.net-examples should be in a bin/ directory, inside asp
+  * Added manpages of {package}-update.conf
+  * Added debconf dependency to mono-xsp and mono-server	
+
+ -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>  Mon, 14 Jun 2004 21:41:43 -0600
+	
+xsp (0.14-6) unstable; urgency=low
+
+  * Compiled with mono-utils to prevent dependency problems
+  * Fixed a bug in scripts of mono-xsp, we are not using reader.conf anymore
+  * Fixed some bugs reading an old .conf file	
+
+ -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>  Mon, 14 Jun 2004 19:19:32 -0600
+	
 xsp (0.14-5) unstable; urgency=low 
 
   * Fixed dependency problem, should use dependency less strict (all beta2)

Modified: xsp/trunk/debian/rules
===================================================================
--- xsp/trunk/debian/rules	2004-06-15 05:30:28 UTC (rev 1012)
+++ xsp/trunk/debian/rules	2004-06-15 05:34:36 UTC (rev 1013)
@@ -9,11 +9,13 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+export MONO_SHARED_DIR=$(CURDIR)/.wabi
 
 CFLAGS = -Wall -g
 
 config.status: configure
 	dh_testdir
+	mkdir -p $$MONO_SHARED_DIR
 	# Add here commands to configure the package.
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
@@ -26,9 +28,10 @@
 	# Add here commands to compile the package.
 	$(MAKE)
 	#/usr/bin/docbook-to-man debian/xsp.sgml > xsp.1
-	pod2man $(CURDIR)/debian/mono-server-admin.conf > $(CURDIR)/debian/mono-server-admin.conf.1
-	pod2man $(CURDIR)/debian/mono-xsp-admin.conf > $(CURDIR)/debian/mono-xsp-admin.conf.1
-
+	pod2man --section=8 $(CURDIR)/debian/mono-server-admin.conf > $(CURDIR)/debian/mono-server-admin.conf.8
+	pod2man --section=8 $(CURDIR)/debian/mono-xsp-admin.conf > $(CURDIR)/debian/mono-xsp-admin.conf.8
+	pod2man --section=8 $(CURDIR)/debian/mono-server-update.conf > $(CURDIR)/debian/mono-server-update.conf.8
+	pod2man --section=8 $(CURDIR)/debian/mono-xsp-update.conf > $(CURDIR)/debian/mono-xsp-update.conf.8
 	touch build-stamp
 
 clean:
@@ -38,6 +41,7 @@
 
 	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
+	rm -rf $$MONO_SHARED_DIR
 #ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 #	cp -f /usr/share/misc/config.sub config.sub
 #endif
@@ -83,9 +87,10 @@
 	dh_install 
 	cd test && cp ServiceClient.exe *.aspx *.ascx *.asmx *.ashx *.config *.asax *.xml *.png *.inc *.xsl *.cs $(CURDIR)/debian/asp.net-examples/usr/share/asp.net-demos/asp
 	cp debian/web.config $(CURDIR)/debian/asp.net-examples/usr/share/asp.net-demos/asp
-	cd test && cp *.dll $(CURDIR)/debian/asp.net-examples/usr/share/asp.net-demos/dll
+	cd test && cp *.dll $(CURDIR)/debian/asp.net-examples/usr/share/asp.net-demos/asp/bin
 	rm -Rf $(CURDIR)/debian/asp.net-examples/usr/share/asp.net-demos/asp/monodoc.ashx
 	chmod -x $(CURDIR)/debian/asp.net-examples/usr/share/asp.net-demos/*/*
+	chmod +x $(CURDIR)/debian/asp.net-examples/usr/share/asp.net-demos/asp/bin
 
 #	cp $(CURDIR)/debian/mono-xsp-reader.conf debian/mono-xsp/usr/share/dotnet/xsp/
 	cp $(CURDIR)/debian/mono-xsp-update.conf debian/mono-xsp/usr/share/dotnet/xsp/
@@ -118,12 +123,8 @@
 	dh_installinit
 #	dh_installcron
 #	dh_installinfo
-	if [ -x /usr/bin/dh_installxsp ]; then \
-		dh_installxsp;	\
-	elif [ -x $(CURDIR)/debian/dh_installxsp ]; then \
-		$(CURDIR)/debian/dh_installxsp; \
-	fi;		
-	dh_installman 
+	dh_installxsp
+	dh_installman	 
 	dh_link
 	dh_strip
 	dh_compress
@@ -133,6 +134,7 @@
 #	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
+	dh_netdeps -d
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb