[m-dev.] diff: update debian directory

[Tyson Dowd]

Hi,

These are updates from the 0.9.1-2 scripts, which are probably necessary
if you want to build a .deb on a recent system.

===================================================================

Estimated hours taken: 0.5

debian/README.debian:
debian/changelog:
debian/control:
debian/dirs:
debian/rules:
	Add the latest changes from the debian build rules.


Index: debian/README.debian
===================================================================
RCS file: /home/mercury1/repository/mercury/debian/README.debian,v
retrieving revision 1.3
diff -u -r1.3 README.debian
--- debian/README.debian	1999/11/15 02:05:45	1.3
+++ debian/README.debian	2000/11/05 09:54:35
@@ -1,7 +1,7 @@
 mercury for DEBIAN
 ------------------
 
-This is the Mercury compiler packaged for Debian.
+This is Mercury compiler packaged for Debian.
 
 Some remarks on compiling the source package:
 Mercury is written in Mercury.  It is normally shipped with pre-compiled
@@ -19,7 +19,11 @@
 mercury-compiler-(version).tar.gz
 
 This particular version can be compiled using a release of the day:
-ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/debian/mercury-compiler-rotd-1999-10-25.tar.gz
+ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/debian/mercury-compiler-rotd-1999-10-26.tar.gz
+
+Please note that if you want to rebuild Mercury, you have better have a 
+lot of disc space and a reasonably quick machine.  200Mb of disc,
+>= 64Mb of memory, and something faster than a Pentium2-266 would be good.
 
 -- Tyson Dowd <trd at cs.mu.oz.au>  Mon, 22 Mar 1999 16:33:10 +1100
 
Index: debian/changelog
===================================================================
RCS file: /home/mercury1/repository/mercury/debian/changelog,v
retrieving revision 1.2
diff -u -r1.2 changelog
--- debian/changelog	1999/11/01 12:45:00	1.2
+++ debian/changelog	2000/11/05 10:41:34
@@ -1,3 +1,54 @@
+mercury (0.9.1-2) unstable; urgency=low
+
+  * Fix a problem where we referenced "gmake" which is supposed to 
+    be "make".  This is caused by a bug in the upstream sources, and
+    a slightly screwy build environment.
+
+ -- Tyson Dowd <trd at cs.mu.oz.au>  Mon, 14 Aug 2000 08:25:59 +1000
+
+mercury (0.9.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Tyson Dowd <trd at cs.mu.oz.au>  Wed, 26 Jan 2000 16:00:54 +1100
+
+mercury (0.9-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Tyson Dowd <trd at cs.mu.oz.au>  Sun, 19 Dec 1999 15:24:15 +1100
+
+mercury (0.8.1.rotd19991116-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Tyson Dowd <trd at cs.mu.oz.au>  Sun,  5 Dec 1999 14:47:37 +1100
+
+mercury (0.8.1.rotd19991102-2) unstable; urgency=low
+
+  * Apply patch to allow building with Linux/SPARC
+    (Fixes: #49160)
+      
+ -- Tyson Dowd <trd at cs.mu.oz.au>  Sat,  4 Dec 1999 18:46:06 -0600
+
+mercury (0.8.1.rotd19991102-1) unstable; urgency=low
+
+  * New upstream release
+  
+ -- Tyson Dowd <trd at cs.mu.oz.au>  Sun, 14 Nov 1999 21:11:19 +1100
+
+mercury (0.8.1.rotd19991025-3) unstable; urgency=low
+
+  * Update documentation to mention new ROTD to build with. 
+
+ -- Tyson Dowd <trd at cs.mu.oz.au>  Mon,  1 Nov 1999 14:54:44 +1100
+
 mercury (0.8.1.rotd19991025-2) unstable; urgency=low
 
   * Modify path for bootstrapping from a local installation directory
Index: debian/control
===================================================================
RCS file: /home/mercury1/repository/mercury/debian/control,v
retrieving revision 1.1
diff -u -r1.1 control
--- debian/control	1999/03/22 06:45:55	1.1
+++ debian/control	2000/11/05 09:54:35
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Tyson Dowd <trd at cs.mu.oz.au>
-Standards-Version: 2.4.1
+Standards-Version: 3.1.0.0
 
 Package: mercury
 Architecture: any
Index: debian/dirs
===================================================================
RCS file: /home/mercury1/repository/mercury/debian/dirs,v
retrieving revision 1.1
diff -u -r1.1 dirs
--- debian/dirs	1999/03/22 06:45:56	1.1
+++ debian/dirs	2000/11/05 09:54:35
@@ -1,5 +1,5 @@
 usr/bin
-usr/info
-usr/doc/mercury
+usr/share/info
+usr/share/doc/mercury
 usr/lib
-usr/man/man1
+usr/share/man/man1
Index: debian/rules
===================================================================
RCS file: /home/mercury1/repository/mercury/debian/rules,v
retrieving revision 1.3
diff -u -r1.3 rules
--- debian/rules	1999/11/01 12:45:00	1.3
+++ debian/rules	2000/11/05 09:54:35
@@ -9,14 +9,18 @@
 
 package=mercury
 
-MERCURY_DOCS = 	BUGS HISTORY LIMITATIONS NEWS README RELEASE_NOTES \
-		README.Linux WORK_IN_PROGRESS
 MERCURY_MANS =	doc/c2init.1 doc/mmc.1 doc/mgnuc.1 doc/ml.1 \
 		doc/mprof.1 
-DEBIAN_DOCS =	debian/README.debian debian/copyright 
+#DEBIAN_DOCS =	debian/README.debian debian/copyright 
 
-PATH	    :=    $(PATH):/usr/local/mercury-DEV/bin:/home/tyson/install/bin
+	# A local installation of Mercury.  You might want to override
+	# this to be where you installed a Mercury compiler to bootstrap 
+	# with.  If you are building from an installed binary package in
+	# /usr/bin it shouldn't be a problem
+LOCAL_MERCURY_INSTALL = /home/tyson/install/bin
 
+PATH	    := $(PATH):/usr/local/mercury-DEV/bin:$(LOCAL_MERCURY_INSTALL)
+
 # To build, configure as if we are going to install in /usr,
 # then build the compiler. 
 build:
@@ -36,9 +40,9 @@
 	-mmake realclean
 	-rm -f config.status config.cache config.log configure.log
 	-rm -f runtime/mercury_conf.h boehm_gc/mercury_boehm_gc_conf.h
-	-rm -f bindist.build_vars bindist/bindist.build_vars
-	-rm -f Mmake.common
-	-rm -f configure
+	-rm -f bindist/bindist.build_vars
+	-rm -f make_all.log make_install.log mercury-compiler.spec
+	-rm -f Mmake.common configure
 	-rm -f `find . -name "*~"`
 	-rm -rf debian/tmp debian/files* core debian/substvars
 
@@ -51,6 +55,7 @@
 # are architecture independent. But that's not really worth worrying
 # about.
 
+
 # To build the binary package, we install into ./debian/tmp/usr
 # However, we have configured as if we are going to install into
 # /usr, so we need to convince the "make install" target to
@@ -58,38 +63,33 @@
 # We override INSTALL_PREFIX to tell it to install to ./debian/tmp/usr.
 # Hardcoded paths should be depending on FINAL_INSTALL_PREFIX instead,
 # which we leave configured for /usr.
-binary-arch: checkroot build
-	$(checkdir)
-	-rm -rf debian/tmp
-	install -d debian/tmp
-	cd debian/tmp;install -d `cat ../dirs`
+install: build 
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
 	make install INSTALL_PREFIX=`pwd`/debian/tmp/usr ;\
-	cp boehm_gc/README debian/tmp/usr/doc/mercury/README.boehm_gc
-# According to debian policy, samples go in examples
-	cp -r samples debian/tmp/usr/doc/mercury/examples
-# install the various information files into /usr/doc
-	install -m 644 $(MERCURY_DOCS) $(DEBIAN_DOCS) debian/tmp/usr/doc/mercury
-	install -m 644 debian/changelog \
-		debian/tmp/usr/doc/mercury/changelog.Debian
-# install the manpages
-	install -m 644 $(MERCURY_MANS) debian/tmp/usr/man/man1/
-# compress manpages, info pages, and html
-	-gzip -9 `find debian/tmp/usr/man -type f 2>/dev/null`
-	-gzip -9 `find debian/tmp/usr/info -type f`
-	-gzip -9 `find debian/tmp/usr/doc -type f -size +4k ! -name "*.htm*"`
-# strip all executables
-	strip `find debian/tmp -type f -perm +111 | xargs file | fgrep ELF | sed 's/^\([^:]*\):.*$$/\1/'`
-# create DEBIAN directory
-	install -d debian/tmp/DEBIAN
-# install necessary scrips into debian directory
-	install -m 755 debian/postinst debian/postrm debian/tmp/DEBIAN/
-	# XXX not entirely sure what to do about the shlibs
-	-dpkg-shlibdeps `find debian/tmp -type f -perm +111 | xargs file | fgrep ELF | sed 's/^\([^:]*\):.*$$/\1/'`
-	md5sum `find debian/tmp/* -type f ! -regex "debian/tmp/DEBIAN/.*"` >debian/tmp/DEBIAN/checksums
-	dpkg-gencontrol
-	chown -R root.root debian/tmp
-	chmod -R go=rX debian/tmp
-	dpkg --build debian/tmp ..
+
+binary-arch: install
+	# cp boehm_gc/README debian/tmp/usr/share/doc/mercury/README.boehm_gc
+# We are probably going to have to override the installation directories
+# to put the documents into /usr/share/doc
+	dh_installdocs 
+	dh_installexamples	samples/*
+	dh_installmanpages
+
+#	dh_undocumented		undocumented commands
+
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_suidregister
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+
+	dh_md5sums
+	dh_builddeb
 
 define checkdir
 	test -f debian/rules


-- 
       Tyson Dowd           # 
                            #  Surreal humour isn't everyone's cup of fur.
     trd at cs.mu.oz.au        # 
http://www.cs.mu.oz.au/~trd #
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------