[MLton-commit] r7313

[Wesley Terpstra]

New packaging rules


----------------------------------------------------------------------

U   mlton/trunk/package/debian/changelog
A   mlton/trunk/package/debian/compat
U   mlton/trunk/package/debian/control
A   mlton/trunk/package/debian/mlton.install
A   mlton/trunk/package/debian/mlton.lintian-overrides
U   mlton/trunk/package/debian/rules

----------------------------------------------------------------------

Modified: mlton/trunk/package/debian/changelog
===================================================================
--- mlton/trunk/package/debian/changelog	2009-10-28 15:21:03 UTC (rev 7312)
+++ mlton/trunk/package/debian/changelog	2009-10-28 15:40:35 UTC (rev 7313)
@@ -1,3 +1,13 @@
+mlton (20091028) unstable; urgency=low
+
+  * Added hurd memory-layout definition for mlnlffigen.
+  * Use gcc-4.4; it works around #552314 on mips.
+  * Switch to using cdbs and debhelper.
+  * Appease lintian by (hyphens in manual, licence file, empty directories)
+  * Set the Homepage field
+
+ -- Wesley W. Terpstra (Debian) <terpstra at debian.org>  Wed, 28 Oct 2009 15:48:22 +0100
+
 mlton (20091022) unstable; urgency=low
 
   * Added missing hurd variant to mlton-stubs bootstrap library.

Added: mlton/trunk/package/debian/compat
===================================================================
--- mlton/trunk/package/debian/compat	2009-10-28 15:21:03 UTC (rev 7312)
+++ mlton/trunk/package/debian/compat	2009-10-28 15:40:35 UTC (rev 7313)
@@ -0,0 +1 @@
+7

Modified: mlton/trunk/package/debian/control
===================================================================
--- mlton/trunk/package/debian/control	2009-10-28 15:21:03 UTC (rev 7312)
+++ mlton/trunk/package/debian/control	2009-10-28 15:40:35 UTC (rev 7313)
@@ -2,18 +2,19 @@
 Section: devel
 Priority: optional
 Maintainer: Wesley W. Terpstra (Debian) <terpstra at debian.org>
-Build-Depends: mlton (>= 20070826), htmldoc, libgmp3-dev (>= 4.0.1), texlive-latex-base, procps
+Build-Depends: mlton (>= 20070826), gcc, htmldoc, libgmp3-dev (>= 4.0.1), texlive-latex-base, procps, debhelper (>= 7.0.0), cdbs (>= 0.4.52)
 Standards-Version: 3.8.3.0
 
 Package: mlton
 Architecture: alpha amd64 hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc
 Depends: ${shlibs:Depends}, gcc, libc6-dev, libgmp3-dev (>= 4.0.1)
+Homepage: http://mlton.org/
 Description: Optimizing compiler for Standard ML
- MLton (mlton.org) is a whole-program optimizing
- compiler for Standard ML.  MLton generates
- standalone executables with excellent runtime
- performance, is SML 97 compliant, and has a
- complete basis library.  MLton has source-level
- profiling, a fast C FFI, an interface to the GNU
+ MLton is a whole-program optimizing compiler
+ for Standard ML.  MLton generates standalone 
+ executables with excellent runtime performance,
+ is SML 97 compliant, and has a complete basis
+ library.  MLton has source-level profiling,
+ a fast C FFI, an interface to the GNU
  multiprecision library, and lots of useful
  libraries.

Added: mlton/trunk/package/debian/mlton.install
===================================================================
--- mlton/trunk/package/debian/mlton.install	2009-10-28 15:21:03 UTC (rev 7312)
+++ mlton/trunk/package/debian/mlton.install	2009-10-28 15:40:35 UTC (rev 7313)
@@ -0,0 +1 @@
+usr/*

Added: mlton/trunk/package/debian/mlton.lintian-overrides
===================================================================
--- mlton/trunk/package/debian/mlton.lintian-overrides	2009-10-28 15:21:03 UTC (rev 7312)
+++ mlton/trunk/package/debian/mlton.lintian-overrides	2009-10-28 15:40:35 UTC (rev 7313)
@@ -0,0 +1,2 @@
+# This is a part of the wiki manual
+mlton: extra-license-file usr/share/doc/mlton/guide/License

Modified: mlton/trunk/package/debian/rules
===================================================================
--- mlton/trunk/package/debian/rules	2009-10-28 15:21:03 UTC (rev 7312)
+++ mlton/trunk/package/debian/rules	2009-10-28 15:40:35 UTC (rev 7313)
@@ -1,53 +1,22 @@
 #!/usr/bin/make -f
 
-VERSION  := $(shell dpkg-parsechangelog  | grep Version | cut -d" " -f2)
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
+
 HEAPSIZE := $(shell . debian/heap-size)
-CP = cp -fpR
 
-configure: configure-stamp
-configure-stamp:
-	free
-	make VERSION=$(VERSION) RELEASE=1 version
-	touch configure-stamp
+# MLton compiles optimized, debug, and pic versions on its own.
+DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make -C $(DEB_BUILDDIR)
 
-build: configure-stamp build-stamp
-build-stamp:
-	$(MAKE) RUNTIME_ARGS="fixed-heap $(HEAPSIZE)"
-	if dpkg-architecture -ihurd-any; then true; else ./bin/regression; fi
-	touch build-stamp
+DEB_MAKE_CLEAN_TARGET   = clean clean-svn
+DEB_MAKE_BUILD_TARGET   = all RUNTIME_ARGS="fixed-heap $(HEAPSIZE)" VERSION=$(DEB_VERSION)
+DEB_MAKE_INSTALL_TARGET = install-no-strip DESTDIR=$(CURDIR)/debian/tmp/ PREFIX=/usr MAN_PREFIX_EXTRA=/share
+DEB_MAKE_CHECK_TARGET   = check
 
-clean:
-	rm -rf build-stamp configure-stamp debian/mlton debian/substvars
-	$(MAKE) clean clean-svn
+# Useful when inspecting build logs
+common-configure-arch::
+	free
 
-BUILDDIR = $(CURDIR)/debian/mlton
-install: build
-	$(MAKE) install post-install-debian DESTDIR=$(BUILDDIR) \
-		PREFIX=/usr MAN_PREFIX_EXTRA=/share
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	# dh_installdeb
-	mkdir -p $(BUILDDIR)/DEBIAN
-	# dh_shlibdeps
-	dpkg-shlibdeps \
-		-e$(BUILDDIR)/usr/bin/mllex \
-		-e$(BUILDDIR)/usr/bin/mlnlffigen \
-		-e$(BUILDDIR)/usr/bin/mlprof \
-		-e$(BUILDDIR)/usr/bin/mlyacc \
-		-e$(BUILDDIR)/usr/lib/mlton/mlton-compile 
-	# dh_gencontrol
-	dpkg-gencontrol -isp -P$(BUILDDIR)
-	# dh_md5sums
-	cd $(BUILDDIR) && \
-		find * -type f ! -regex '^DEBIAN/.*' -print0 | \
-			xargs -r0 md5sum >DEBIAN/md5sums
-	# dh_builddeb
-	dpkg-deb --build $(BUILDDIR) ../
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+# Remove empty directories to appease lintian
+common-install-arch::
+	find path/to/base/dir -type d -empty -delete