[Pkg-mono-svn-commits] [SCM] xsp branch, master, updated. debian/2.6.5-3-42-g87885a0

[Jo Shields]

The following commit has been merged in the master branch:
commit b4f77317be1bb7543a0bc48768a61f7bab936468
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Mar 28 01:40:05 2011 +0100

    Port packaging to Debhelper 7, clean up significantly, and update to build 2.10 (in theory)

diff --git a/debian/asp.net-examples.install b/debian/asp.net-examples.install
index 6c83df6..1526a6f 100644
--- a/debian/asp.net-examples.install
+++ b/debian/asp.net-examples.install
@@ -1 +1 @@
-debian/tmp/usr/share/asp.net-demos
+debian/tmp/usr/lib/xsp/test/*	/usr/share/asp.net-demos
diff --git a/debian/rules b/debian/rules
index 9e06301..2890970 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,19 +18,10 @@ UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,' | sed 's,+dfsg.*,,')
 NEXT_UPVERSION = $(shell perl -e '$$_=pop; s/(\d+)$$/$$1+1/e; print' $(UPVERSION))
 DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2)
 
-configure: configure-stamp templates.pot
-configure-stamp: 
-	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-	  --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	# Add here commands to compile the package.
-	$(MAKE)
-	#/usr/bin/docbook-to-man debian/xsp.sgml > xsp.1
+include /usr/share/cli-common/cli.make
+
+override_dh_auto_build:
+	dh_auto_build
 	pod2man --section=8 \
 		$(CURDIR)/debian/mono-server-admin \
 		> $(CURDIR)/debian/mono-server-admin.8
@@ -50,6 +41,9 @@ build-stamp: configure-stamp
 	pod2man --section=8 $(CURDIR)/debian/mono-xsp2-update \
 		> $(CURDIR)/debian/mono-xsp2-update.8
 
+	pod2man --section=1 $(CURDIR)/debian/dh_installxsp \
+		> $(CURDIR)/debian/dh_installxsp.1
+
 	cp $(CURDIR)/debian/mono-server-update.8 \
 		$(CURDIR)/debian/update-mono-server.8
 	cp $(CURDIR)/debian/mono-server2-update.8 \
@@ -61,104 +55,61 @@ build-stamp: configure-stamp
 
 	touch build-stamp
 
-templates.pot: $(wildcard debian/*.templates)
-	debconf-updatepo
-
-clean: clean-patched
-clean-patched:
-	dh_testdir
-	dh_testroot
-	rm -f config.log
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -rf server
-	# moved below the clean so the configured-stuff cleans properly
-	rm -rf $$MONO_SHARED_DIR/.wapi
+override_dh_clean:
 	rm -f $(CURDIR)/debian/*.8 $(CURDIR)/debian/*.1
-	debconf-updatepo
-	rm -f build-stamp configure-stamp config.status
-	find . -name "*.exe" -exec rm {} \;
-	find . -name "*.exe.mdb" -exec rm {} \;
-	find . -name "*.dll" -exec rm {} \;
-	find . -name "*.dll.mdb" -exec rm {} \;
 	dh_clean 
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-#	Fix permissions
-	find debian/tmp -name "*.config" -or -name "*.gif" \
-		| xargs chmod a-x
-
-#	Move things into Debian-specific places
-	cp -r debian/tmp/usr/lib/xsp/test \
-		debian/tmp/usr/share/asp.net2-demos
-	mv debian/tmp/usr/lib/xsp/test \
-		debian/tmp/usr/share/asp.net-demos
-	rm -rf debian/tmp/usr/share/asp.net-demos/2.0
-
-	# Make version two variants on the manpages
+override_dh_installmanpages:
+	# Make version three variants on the manpages
 	cat debian/tmp/usr/share/man/man1/xsp.1 \
 		| sed 's/xsp/xsp2/g' \
 		> debian/tmp/usr/share/man/man1/xsp2.1
-	cp debian/tmp/usr/share/man/man1/xsp.1 debian/tmp/usr/share/man/man1/xsp1.1
+	cat debian/tmp/usr/share/man/man1/xsp.1 \
+		| sed 's/xsp/xsp4/g' \
+		> debian/tmp/usr/share/man/man1/xsp4.1
 	cat debian/tmp/usr/share/man/man1/dbsessmgr.1 \
 		| sed 's/dbsessmgr/dbsessmgr2/g' \
 		> debian/tmp/usr/share/man/man1/dbsessmgr2.1
-	cp debian/tmp/usr/share/man/man1/dbsessmgr.1 debian/tmp/usr/share/man/man1/dbsessmgr1.1
+	cat debian/tmp/usr/share/man/man1/dbsessmgr.1 \
+		| sed 's/dbsessmgr/dbsessmgr4/g' \
+		> debian/tmp/usr/share/man/man1/dbsessmgr4.1
 	cat debian/tmp/usr/share/man/man1/asp-state.1 \
 		| sed 's/asp-state/asp-state2/g' \
 		> debian/tmp/usr/share/man/man1/asp-state2.1
-	cp debian/tmp/usr/share/man/man1/asp-state.1 debian/tmp/usr/share/man/man1/asp-state1.1
+	cat debian/tmp/usr/share/man/man1/asp-state.1 \
+		| sed 's/asp-state/asp-state4/g' \
+		> debian/tmp/usr/share/man/man1/asp-state4.1
 	cat debian/tmp/usr/share/man/man1/mod-mono-server.1 \
 		| sed 's/mono-server/mono-server2/g' \
 		> debian/tmp/usr/share/man/man1/mod-mono-server2.1
-	cp debian/tmp/usr/share/man/man1/mod-mono-server.1 debian/tmp/usr/share/man/man1/mod-mono-server1.1
+	cat debian/tmp/usr/share/man/man1/mod-mono-server.1 \
+		| sed 's/mono-server/mono-server4/g' \
+		> debian/tmp/usr/share/man/man1/mod-mono-server4.1
 	cat debian/tmp/usr/share/man/man1/fastcgi-mono-server.1 \
 		| sed 's/mono-server/mono-server2/g' \
 		> debian/tmp/usr/share/man/man1/fastcgi-mono-server2.1
-	cp debian/tmp/usr/share/man/man1/fastcgi-mono-server.1 debian/tmp/usr/share/man/man1/fastcgi-mono-server1.1
-
-#	Make dh_installxsp man pages
-	cd debian && \
-	  for x in dh_installxsp; \
-	    do chmod +x $$x; pod2man $$x > $$x.1 ; done
-
-binary: binary-arch binary-indep
-
-binary-arch:
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -i ChangeLog
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installdirs -i
-	dh_install -i
-	dh_installdebconf -i
-	# auto-start we handle ourself using debconf
-	dh_installinit -i --noscripts
+	cat debian/tmp/usr/share/man/man1/fastcgi-mono-server.1 \
+		| sed 's/mono-server/mono-server4/g' \
+		> debian/tmp/usr/share/man/man1/fastcgi-mono-server4.1
+	dh_installmanpages
+
+override_dh_installman:
 	# We are using our local version along with our local copies of the
 	# file to make sure asp.net gets the proper version.
-	DH_AUTOSCRIPTDIR=$(CURDIR)/debian/ debian/dh_installxsp -i -V 1,2
-	dh_installman -i
-	dh_link -i
-	dh_strip -i
-	dh_clistrip -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_clifixperms -i
-	dh_installdeb -i
-	dh_shlibdeps -i
-	dh_makeclilibs -i -V
-	dh_clideps -i -d
-	dh_gencontrol -i -- -Vmono-abi-comp-version=$(MONO_ABI_COMP_VERSION)
-	dh_md5sums -i
-	dh_builddeb -i
+	DH_AUTOSCRIPTDIR=$(CURDIR)/debian/ debian/dh_installxsp -i -V 4
+	dh_installman
+
+override_dh_makeclilibs:
+	dh_makeclilibs -V
+
+override_dh_clideps:
+	dh_clideps -d
+
+override_dh_gencontrol:
+	dh_gencontrol -- -Vmono-abi-comp-version=$(MONO_ABI_COMP_VERSION)
+
+%:
+	dh $@
 
 get-orig-source:
 	uscan \
@@ -169,5 +120,3 @@ get-orig-source:
 		--destdir . \
 		--force-download \
 		--rename
-
-.PHONY: build clean binary-arch binary-indep binary install

-- 
xsp