From 15f6115917944f25168e3d8f995a5ca69b723964 Mon Sep 17 00:00:00 2001 From: Christopher Cramer Date: Thu, 28 May 2015 15:06:34 -0400 Subject: [PATCH] Update Debian packaging (control, *.install) First, usr/lib/mlton/opcodes was part of the discontinued bytecode codegen. It doesn't exist anymore, so don't try to install it. Second, the GNU architecture has changed from i486 to i586. I don't know why the GNU architecture (which has changed twice, and may change again to i686, for all I know) is used in all these paths instead of the Debian architecture (which will presumably remain i386 until the end of time). But I will assume there is a good reason, and so switch all the paths to the new architecture. --- package/debian/control | 14 +++++++------- package/debian/mlton-compiler.install | 1 - package/debian/mlton-runtime-i486-gnu.install | 1 - .../debian/mlton-runtime-i486-kfreebsd-gnu.install | 1 - .../debian/mlton-runtime-i486-linux-gnu.install | 1 - package/debian/mlton-runtime-i586-gnu.install | 1 + .../debian/mlton-runtime-i586-kfreebsd-gnu.install | 1 + .../debian/mlton-runtime-i586-linux-gnu.install | 1 + 8 files changed, 10 insertions(+), 11 deletions(-) delete mode 100644 package/debian/mlton-runtime-i486-gnu.install delete mode 100644 package/debian/mlton-runtime-i486-kfreebsd-gnu.install delete mode 100644 package/debian/mlton-runtime-i486-linux-gnu.install create mode 100644 package/debian/mlton-runtime-i586-gnu.install create mode 100644 package/debian/mlton-runtime-i586-kfreebsd-gnu.install create mode 100644 package/debian/mlton-runtime-i586-linux-gnu.install diff --git a/package/debian/control b/package/debian/control index 84016c562a..635820f55e 100644 --- a/package/debian/control +++ b/package/debian/control @@ -101,7 +101,7 @@ Description: Optimizing compiler for Standard ML - tools Package: mlton-runtime-native Architecture: alpha amd64 armel armhf hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc -Depends: ${misc:Depends}, mlton-runtime-alpha-linux-gnu (= ${binary:Version}) [alpha] | mlton-runtime-x86-64-linux-gnu (= ${binary:Version}) [amd64] | mlton-runtime-arm-linux-gnueabi (= ${binary:Version}) [armel] | mlton-runtime-arm-linux-gnueabihf (= ${binary:Version}) [armhf] | mlton-runtime-hppa-linux-gnu (= ${binary:Version}) [hppa] | mlton-runtime-i486-gnu (= ${binary:Version}) [hurd-i386] | mlton-runtime-i486-linux-gnu (= ${binary:Version}) [i386] | mlton-runtime-ia64-linux-gnu (= ${binary:Version}) [ia64] | mlton-runtime-i486-kfreebsd-gnu (= ${binary:Version}) [kfreebsd-i386] | mlton-runtime-x86-64-kfreebsd-gnu (= ${binary:Version}) [kfreebsd-amd64] | mlton-runtime-mips-linux-gnu (= ${binary:Version}) [mips] | mlton-runtime-mipsel-linux-gnu (= ${binary:Version}) [mipsel] | mlton-runtime-powerpc-linux-gnu (= ${binary:Version}) [powerpc] | mlton-runtime-s390-linux-gnu (= ${binary:Version}) [s390] | mlton-runtime-sparc-linux-gnu (= ${binary:Version}) [sparc] +Depends: ${misc:Depends}, mlton-runtime-alpha-linux-gnu (= ${binary:Version}) [alpha] | mlton-runtime-x86-64-linux-gnu (= ${binary:Version}) [amd64] | mlton-runtime-arm-linux-gnueabi (= ${binary:Version}) [armel] | mlton-runtime-arm-linux-gnueabihf (= ${binary:Version}) [armhf] | mlton-runtime-hppa-linux-gnu (= ${binary:Version}) [hppa] | mlton-runtime-i586-gnu (= ${binary:Version}) [hurd-i386] | mlton-runtime-i586-linux-gnu (= ${binary:Version}) [i386] | mlton-runtime-ia64-linux-gnu (= ${binary:Version}) [ia64] | mlton-runtime-i586-kfreebsd-gnu (= ${binary:Version}) [kfreebsd-i386] | mlton-runtime-x86-64-kfreebsd-gnu (= ${binary:Version}) [kfreebsd-amd64] | mlton-runtime-mips-linux-gnu (= ${binary:Version}) [mips] | mlton-runtime-mipsel-linux-gnu (= ${binary:Version}) [mipsel] | mlton-runtime-powerpc-linux-gnu (= ${binary:Version}) [powerpc] | mlton-runtime-s390-linux-gnu (= ${binary:Version}) [s390] | mlton-runtime-sparc-linux-gnu (= ${binary:Version}) [sparc] Homepage: http://mlton.org/ Description: Optimizing compiler for Standard ML - native runtime libraries MLton is a whole-program optimizing compiler @@ -205,7 +205,7 @@ Description: Optimizing compiler for Standard ML - hppa runtime libraries . This package provides hppa target libraries. -Package: mlton-runtime-i486-gnu +Package: mlton-runtime-i586-gnu Architecture: hurd-i386 Multi-Arch: foreign Depends: ${misc:Depends}, mlton-basis (= ${source:Version}) @@ -221,9 +221,9 @@ Description: Optimizing compiler for Standard ML - hurd-i386 runtime libraries multiprecision library, and lots of useful libraries. . - This package provides hurd i486 target libraries. + This package provides hurd i586 target libraries. -Package: mlton-runtime-i486-linux-gnu +Package: mlton-runtime-i586-linux-gnu Architecture: i386 Multi-Arch: foreign Depends: ${misc:Depends}, mlton-basis (= ${source:Version}) @@ -239,7 +239,7 @@ Description: Optimizing compiler for Standard ML - i386 runtime libraries multiprecision library, and lots of useful libraries. . - This package provides i486 target libraries. + This package provides i586 target libraries. Package: mlton-runtime-ia64-linux-gnu Architecture: ia64 @@ -259,7 +259,7 @@ Description: Optimizing compiler for Standard ML - ia64 runtime libraries . This package provides ia64 target libraries. -Package: mlton-runtime-i486-kfreebsd-gnu +Package: mlton-runtime-i586-kfreebsd-gnu Architecture: kfreebsd-i386 Multi-Arch: foreign Depends: ${misc:Depends}, mlton-basis (= ${source:Version}) @@ -275,7 +275,7 @@ Description: Optimizing compiler for Standard ML - kfreebsd-i386 runtime librari multiprecision library, and lots of useful libraries. . - This package provides kfreebsd i386 target libraries. + This package provides kfreebsd i586 target libraries. Package: mlton-runtime-x86-64-kfreebsd-gnu Architecture: kfreebsd-amd64 diff --git a/package/debian/mlton-compiler.install b/package/debian/mlton-compiler.install index d7eacb679d..6f1b7317ff 100644 --- a/package/debian/mlton-compiler.install +++ b/package/debian/mlton-compiler.install @@ -2,6 +2,5 @@ usr/bin/mlton usr/lib/mlton/mlton-compile usr/lib/mlton/static-library usr/lib/mlton/platform -usr/lib/mlton/opcodes usr/lib/mlton/targets/self usr/share/man/man1/mlton.1.gz diff --git a/package/debian/mlton-runtime-i486-gnu.install b/package/debian/mlton-runtime-i486-gnu.install deleted file mode 100644 index a038b01003..0000000000 --- a/package/debian/mlton-runtime-i486-gnu.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/mlton/targets/i486-gnu/* diff --git a/package/debian/mlton-runtime-i486-kfreebsd-gnu.install b/package/debian/mlton-runtime-i486-kfreebsd-gnu.install deleted file mode 100644 index db4dd70df6..0000000000 --- a/package/debian/mlton-runtime-i486-kfreebsd-gnu.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/mlton/targets/i486-kfreebsd-gnu/* diff --git a/package/debian/mlton-runtime-i486-linux-gnu.install b/package/debian/mlton-runtime-i486-linux-gnu.install deleted file mode 100644 index 6a1d6920ec..0000000000 --- a/package/debian/mlton-runtime-i486-linux-gnu.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/mlton/targets/i486-linux-gnu/* diff --git a/package/debian/mlton-runtime-i586-gnu.install b/package/debian/mlton-runtime-i586-gnu.install new file mode 100644 index 0000000000..2a23ce8a8d --- /dev/null +++ b/package/debian/mlton-runtime-i586-gnu.install @@ -0,0 +1 @@ +usr/lib/mlton/targets/i586-gnu/* diff --git a/package/debian/mlton-runtime-i586-kfreebsd-gnu.install b/package/debian/mlton-runtime-i586-kfreebsd-gnu.install new file mode 100644 index 0000000000..76a0b19de7 --- /dev/null +++ b/package/debian/mlton-runtime-i586-kfreebsd-gnu.install @@ -0,0 +1 @@ +usr/lib/mlton/targets/i586-kfreebsd-gnu/* diff --git a/package/debian/mlton-runtime-i586-linux-gnu.install b/package/debian/mlton-runtime-i586-linux-gnu.install new file mode 100644 index 0000000000..b8cf754023 --- /dev/null +++ b/package/debian/mlton-runtime-i586-linux-gnu.install @@ -0,0 +1 @@ +usr/lib/mlton/targets/i586-linux-gnu/*