[MLton-commit] r7512

[Wesley Terpstra]

More-or-less builds cleanly now


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

U   mlton/trunk/package/debian/changelog
U   mlton/trunk/package/debian/control
U   mlton/trunk/package/debian/mlton-doc.install
U   mlton/trunk/package/debian/rules

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

Modified: mlton/trunk/package/debian/changelog
===================================================================
--- mlton/trunk/package/debian/changelog	2011-03-20 17:06:00 UTC (rev 7511)
+++ mlton/trunk/package/debian/changelog	2011-03-20 17:07:10 UTC (rev 7512)
@@ -5,6 +5,7 @@
   * Split package into compiler, runtime, basis, tools, and doc
    * Use multiarch to support cross-compiling
    * Eliminates the need for a mlton-cross package
+  * Updated standards version (no changes needed)
 
  -- Wesley W. Terpstra (Debian) <terpstra at debian.org>  Sun, 20 Mar 2011 14:05:32 +0100
 

Modified: mlton/trunk/package/debian/control
===================================================================
--- mlton/trunk/package/debian/control	2011-03-20 17:06:00 UTC (rev 7511)
+++ mlton/trunk/package/debian/control	2011-03-20 17:07:10 UTC (rev 7512)
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Wesley W. Terpstra (Debian) <terpstra at debian.org>
 Build-Depends: mlton (>= 20070826), htmldoc, texlive-latex-base, procps, debhelper (>= 7.0.0), cdbs (>= 0.4.52), quilt
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 
 Package: mlton-compiler
 Architecture: alpha amd64 armel hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc
 Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}, gcc, libc6-dev, libgmp-dev, mlton-basis (= ${binary:Version}), mlton-runtime (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, gcc, libc6-dev, libgmp-dev, mlton-basis (= ${source:Version}), mlton-runtime (= ${binary:Version})
 Homepage: http://mlton.org/
 Description: Optimizing compiler for Standard ML - Compiler package
  MLton is a whole-program optimizing compiler
@@ -42,6 +42,7 @@
 Package: mlton-runtime
 Architecture: alpha amd64 armel hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc
 Multi-Arch: allowed
+Depends: ${misc:Depends}
 Homepage: http://mlton.org/
 Description: Optimizing compiler for Standard ML - Runtime package
  MLton is a whole-program optimizing compiler
@@ -57,6 +58,7 @@
 
 Package: mlton-basis
 Architecture: all
+Depends: ${misc:Depends}
 Homepage: http://mlton.org/
 Description: Optimizing compiler for Standard ML - Tools package
  MLton is a whole-program optimizing compiler
@@ -72,6 +74,7 @@
 
 Package: mlton-doc
 Architecture: all
+Depends: ${misc:Depends}
 Homepage: http://mlton.org/
 Description: Optimizing compiler for Standard ML - Documentation package
  MLton is a whole-program optimizing compiler
@@ -87,7 +90,7 @@
 
 Package: mlton
 Architecture: all
-Depends: mlton-compiler, mlton-tools, mlton-doc
+Depends: ${misc:Depends}, mlton-compiler, mlton-tools, mlton-doc
 Homepage: http://mlton.org/
 Description: Optimizing compiler for Standard ML - Complete package
  MLton is a whole-program optimizing compiler

Modified: mlton/trunk/package/debian/mlton-doc.install
===================================================================
--- mlton/trunk/package/debian/mlton-doc.install	2011-03-20 17:06:00 UTC (rev 7511)
+++ mlton/trunk/package/debian/mlton-doc.install	2011-03-20 17:07:10 UTC (rev 7512)
@@ -1,6 +1,5 @@
 usr/share/doc/mlton/examples
 usr/share/doc/mlton/guide
-usr/share/doc/mlton/mlton
 usr/share/doc/mlton/cmcat
 usr/share/doc/mlton/cm2mlb
 usr/share/doc/mlton/ckit-lib

Modified: mlton/trunk/package/debian/rules
===================================================================
--- mlton/trunk/package/debian/rules	2011-03-20 17:06:00 UTC (rev 7511)
+++ mlton/trunk/package/debian/rules	2011-03-20 17:07:10 UTC (rev 7512)
@@ -10,7 +10,7 @@
 DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make -C $(DEB_BUILDDIR)
 
 # The MLton guide is html. Don't compress example .sml files.
-DEB_COMPRESS_EXCLUDE = mlton/guide .sml
+DEB_COMPRESS_EXCLUDE_ALL = mlton/guide .sml
 
 DEB_MAKE_CLEAN_TARGET   = clean clean-svn
 DEB_MAKE_BUILD_TARGET   = all RUNTIME_ARGS="$(HEAPSIZE)"
@@ -21,8 +21,13 @@
 common-configure-arch::
 	free
 
+# Move MLton target to per-architecture path
+common-install-arch::
+	mv $(CURDIR)/debian/tmp/usr/lib/mlton/targets/self $(CURDIR)/debian/tmp/usr/lib/mlton/targets/$(DEB_HOST_GNU_TYPE)
+	ln -s /usr/lib/mlton/targets/$(DEB_HOST_GNU_TYPE) $(CURDIR)/debian/tmp/usr/lib/mlton/targets/self
+
 # Remove licenses and empty directories to appease lintian
-common-install-arch::
+common-install-indep::
 	find $(CURDIR)/debian/tmp -type d -empty -delete
 	rm -rf $(CURDIR)/debian/tmp/usr/share/doc/mlton/license
 	if test -n "$(DEB_ISNATIVE)"; then mv \