[polyml] 02/07: Updated packaging for new release
James Clarke
jrtc27-guest at moszumanska.debian.org
Thu Jan 28 10:16:08 UTC 2016
This is an automated email from the git hooks/post-receive script.
jrtc27-guest pushed a commit to branch master
in repository polyml.
commit 9536992b28ddbdc9580e9df3f633c8bf185a9a9c
Author: James Clarke <jrtc27 at jrtc27.com>
Date: Mon Jan 25 18:49:32 2016 +0000
Updated packaging for new release
---
debian/changelog | 8 +++
debian/control | 4 +-
debian/copyright | 4 +-
debian/{libpolyml6.install => libpolyml7.install} | 0
debian/patches/arm64.diff | 59 -----------------------
debian/patches/make-check.diff | 18 -------
debian/patches/mips.diff | 57 ----------------------
debian/patches/mipsel.diff | 17 -------
debian/patches/noexec-stack.diff | 22 ---------
debian/patches/pexport-endian.diff | 34 -------------
debian/patches/polyc.1-fix.diff | 22 ---------
debian/patches/ppc64.diff | 44 -----------------
debian/patches/series | 8 ---
debian/shlibs.local | 2 +-
14 files changed, 13 insertions(+), 286 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b349dd6..b16117e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+polyml (5.6-1) UNRELEASED; urgency=medium
+
+ * New upstream version
+ * Removed patches applied upstream
+ * Rename libpolyml6 to libpolyml7
+
+ -- James Clarke <jrtc27 at jrtc27.com> Mon, 25 Jan 2016 18:45:49 +0000
+
polyml (5.5.2-4) unstable; urgency=low
* Take over as uploader
diff --git a/debian/control b/debian/control
index 0223cfb..7543fba 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Package: libpolyml-dev
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: libpolyml6 (= ${binary:Version}), ${misc:Depends}
+Depends: libpolyml7 (= ${binary:Version}), ${misc:Depends}
Description: development files for Poly/ML, a compiler for Standard ML
Poly/ML is an implementation of the Standard ML programming language
Standard ML is a general-purpose, modular, type-safe, strict,
@@ -38,7 +38,7 @@ Description: development files for Poly/ML, a compiler for Standard ML
This package provides the files needed to compile stand-alone executables
with Poly/ML.
-Package: libpolyml6
+Package: libpolyml7
Section: libs
Architecture: any
Multi-Arch: same
diff --git a/debian/copyright b/debian/copyright
index cc21655..d509581 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,12 +4,12 @@ Source: <http://www.polyml.org>
Files: *
Author: David Matthews <polyml at polyml.org>
-Copyright: Copyright 1999-2014 David Matthews <polyml at polyml.org>
+Copyright: Copyright 1999-2016 David Matthews <polyml at polyml.org>
License: LGPL-2.1+
Files: debian/*
Copyright: Copyright 2008 Achim D. Brucker <brucker at member.fsf.org>
- Copyright 2015 James Clarke <jrtc27 at jrtc27.com>
+ Copyright 2015-2016 James Clarke <jrtc27 at jrtc27.com>
License: LGPL-2.1+
Files: libffi/*
diff --git a/debian/libpolyml6.install b/debian/libpolyml7.install
similarity index 100%
rename from debian/libpolyml6.install
rename to debian/libpolyml7.install
diff --git a/debian/patches/arm64.diff b/debian/patches/arm64.diff
deleted file mode 100644
index e06f6c2..0000000
--- a/debian/patches/arm64.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: Add support for 64-bit ARM using the interpreter.
-Origin: upstream, https://github.com/polyml/polyml/commit/6d84a491c4ec5fa95c085ddcc8f9cca84bbea870
-Author: Christian Neukirchen <chneukirchen at gmail.com>
-Author: David Matthews <dm at prolingua.co.uk>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/config.h.in
-+++ b/config.h.in
-@@ -548,6 +548,9 @@
- /* Define to 1 if the system has the type `_Bool'. */
- #undef HAVE__BOOL
-
-+/* Define if the host is an ARM (64 bit) */
-+#undef HOSTARCHITECTURE_AARCH64
-+
- /* Define if the host is an ARM (32 bit) */
- #undef HOSTARCHITECTURE_ARM
-
---- a/configure
-+++ b/configure
-@@ -21306,6 +21306,12 @@
-
- polyarch=interpret
- ;;
-+ aarch64*)
-+
-+$as_echo "#define HOSTARCHITECTURE_AARCH64 1" >>confdefs.h
-+
-+ polyarch=interpret
-+ ;;
- ia64*)
-
- $as_echo "#define HOSTARCHITECTURE_IA64 1" >>confdefs.h
---- a/configure.ac
-+++ b/configure.ac
-@@ -408,6 +408,10 @@
- AC_DEFINE([HOSTARCHITECTURE_ARM], [1], [Define if the host is an ARM (32 bit)])
- polyarch=interpret
- ;;
-+ aarch64*)
-+ AC_DEFINE([HOSTARCHITECTURE_AARCH64], [1], [Define if the host is an ARM (64 bit)])
-+ polyarch=interpret
-+ ;;
- ia64*)
- AC_DEFINE([HOSTARCHITECTURE_IA64], [1], [Define if the host is Itanium])
- polyarch=interpret
---- a/libpolyml/elfexport.cpp
-+++ b/libpolyml/elfexport.cpp
-@@ -344,6 +344,10 @@
- directReloc = R_IA64_DIR64LSB;
- fhdr.e_flags = EF_IA_64_ABI64;
- useRela = true;
-+#elif defined(HOSTARCHITECTURE_AARCH64)
-+ fhdr.e_machine = EM_AARCH64;
-+ directReloc = R_AARCH64_ABS64;
-+ useRela = true;
- #else
- #error "No support for exporting on this architecture"
- #endif
diff --git a/debian/patches/make-check.diff b/debian/patches/make-check.diff
deleted file mode 100644
index e5df810..0000000
--- a/debian/patches/make-check.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Use conventional check rule in Makefile for running test suite
-Author: James Clarke <jrtc27 at jrtc27.com>
-Forwarded: https://github.com/polyml/polyml/pull/13
-Applied-Upstream: https://github.com/polyml/polyml/commit/e6662a6ef6f4ebcdd1093f2d80b2884335d8cf2b
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -127,6 +127,8 @@
- rm -f *.obj polytemp.txt polyc
-
- # Run tests
--tests: all
-+check-local: all
- echo "val () = use \"$(srcdir)/Tests/RunTests\"; val () = OS.Process.exit(if runTests \"$(srcdir)/Tests\" then OS.Process.success else OS.Process.failure):unit;" | ./poly
-
-+# Retain this target for backwards compatibility
-+tests: check
diff --git a/debian/patches/mips.diff b/debian/patches/mips.diff
deleted file mode 100644
index 004ade8..0000000
--- a/debian/patches/mips.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-Description: Add support for Mips.
-Origin: upstream, https://github.com/polyml/polyml/commit/468c0b5882f1c44fbf188760bff07c1fc32a6769
-Author: David Matthews <dm at prolingua.co.uk>
----
---- a/config.h.in
-+++ b/config.h.in
-@@ -557,6 +557,9 @@
- /* Define if the host is Itanium */
- #undef HOSTARCHITECTURE_IA64
-
-+/* Define if the host is Mips (32-bit) */
-+#undef HOSTARCHITECTURE_MIPS
-+
- /* Define if the host is a Power PC (32 bit) */
- #undef HOSTARCHITECTURE_PPC
-
---- a/configure
-+++ b/configure
-@@ -21318,6 +21318,12 @@
-
- polyarch=interpret
- ;;
-+ mips)
-+
-+$as_echo "#define HOSTARCHITECTURE_MIPS 1" >>confdefs.h
-+
-+ polyarch=interpret
-+ ;;
- *) as_fn_error $? "Poly/ML is not supported for this architecture" "$LINENO" 5 ;;
- esac
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -420,6 +420,10 @@
- AC_DEFINE([HOSTARCHITECTURE_IA64], [1], [Define if the host is Itanium])
- polyarch=interpret
- ;;
-+ mips)
-+ AC_DEFINE([HOSTARCHITECTURE_MIPS], [1], [Define if the host is Mips (32-bit)])
-+ polyarch=interpret
-+ ;;
- *) AC_MSG_ERROR([Poly/ML is not supported for this architecture]) ;;
- esac
-
---- a/libpolyml/elfexport.cpp
-+++ b/libpolyml/elfexport.cpp
-@@ -352,6 +352,10 @@
- fhdr.e_machine = EM_AARCH64;
- directReloc = R_AARCH64_ABS64;
- useRela = true;
-+#elif defined(HOSTARCHITECTURE_MIPS)
-+ fhdr.e_machine = EM_MIPS;
-+ directReloc = R_MIPS_32;
-+ useRela = true;
- #else
- #error "No support for exporting on this architecture"
- #endif
diff --git a/debian/patches/mipsel.diff b/debian/patches/mipsel.diff
deleted file mode 100644
index 5fa56fa..0000000
--- a/debian/patches/mipsel.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Add support for little-endian MIPS
-Author: James Clarke <jrtc27 at jrtc27.com>
-Forwarded: https://github.com/polyml/polyml/pull/14
-Applied-Upstream: https://github.com/polyml/polyml/commit/20c792f27042b24a5263cdcdd78f9732ea5e63d8
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/configure.ac
-+++ b/configure.ac
-@@ -420,7 +420,7 @@
- AC_DEFINE([HOSTARCHITECTURE_IA64], [1], [Define if the host is Itanium])
- polyarch=interpret
- ;;
-- mips)
-+ mips*)
- AC_DEFINE([HOSTARCHITECTURE_MIPS], [1], [Define if the host is Mips (32-bit)])
- polyarch=interpret
- ;;
diff --git a/debian/patches/noexec-stack.diff b/debian/patches/noexec-stack.diff
deleted file mode 100644
index 63121fe..0000000
--- a/debian/patches/noexec-stack.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Stop the stack being made executable under Linux
-Author: James Clarke <jrtc27 at jrtc27.com>
-Forwarded: https://github.com/polyml/polyml/pull/4
-Applied-Upstream: https://github.com/polyml/polyml/commit/c575655598a85e6302240abef674f9462100eec9
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/libpolyml/x86asm.asm
-+++ b/libpolyml/x86asm.asm
-@@ -737,6 +737,13 @@
-
- ENDIF
-
-+;# Mark the stack as non-executable when compiling for Linux
-+IFDEF __linux__
-+IFDEF __ELF__
-+.section .note.GNU-stack, "", @progbits
-+ENDIF
-+ENDIF
-+
- ;#
- ;# CODE STARTS HERE
- ;#
diff --git a/debian/patches/pexport-endian.diff b/debian/patches/pexport-endian.diff
deleted file mode 100644
index 2cee9e2..0000000
--- a/debian/patches/pexport-endian.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Rebuild byte offset when importing code segments.
- The byte count in a code segment is in host byte order. When importing the pre-compiled
- compiler it needs to be reset if the endian-ness differs from the machine that wrote it.
- This is only an issue for interpreted code.
-Origin: backport, https://github.com/polyml/polyml/commit/5d4cf0d219a26ce052d48c7c89ce9c484fff0af7
-Author: David Matthews <dm at prolingua.co.uk>
----
---- a/libpolyml/pexport.cpp
-+++ b/libpolyml/pexport.cpp
-@@ -2,7 +2,7 @@
- Title: Export and import memory in a portable format
- Author: David C. J. Matthews.
-
-- Copyright (c) 2006-7 David C. J. Matthews
-+ Copyright (c) 2006-7, 2016 David C. J. Matthews
-
-
- This library is free software; you can redistribute it and/or
-@@ -827,6 +827,15 @@
- do ch = getc(f); while (ch == ' ');
- }
- }
-+ // Adjust the byte count. This is only necessary when importing the interpreted
-+ // code into a machine with a different endian-ness from the exporter.
-+ {
-+ POLYUNSIGNED l = 0;
-+ while (l < length && p->Get(l) != PolyWord::FromUnsigned(0)) l++;
-+ ASSERT(l < length);
-+ l++;
-+ p->Set(l, PolyWord::FromUnsigned(l*sizeof(PolyWord)));
-+ }
- break;
- }
-
diff --git a/debian/patches/polyc.1-fix.diff b/debian/patches/polyc.1-fix.diff
deleted file mode 100644
index b16361d..0000000
--- a/debian/patches/polyc.1-fix.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Fix typo and version number in polyc man page.
-Origin: upstream, https://github.com/polyml/polyml/commit/61370f2ec8cc79a72b851346a3de0192172bbe67
-Author: David Matthews <dm at prolingua.co.uk>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/polyc.1
-+++ b/polyc.1
-@@ -1,4 +1,4 @@
--.TH POLY 1 "Poly/ML Version 5.5.1 2013"
-+.TH POLY 1 "Poly/ML Version 5.5.2 2014"
- .SH NAME
- polyc \- Compile and link a Standard ML program using Poly/ML
- .SH SYNOPSIS
-@@ -6,7 +6,7 @@
- .I sourcefile
- .SH DESCRIPTION
- .I polyc
--is a script that compiles a Standard ML program using the Poly/ML compile and creates an
-+is a script that compiles a Standard ML program using the Poly/ML compiler and creates an
- executable program from it. It can also be used to link object files created using the
- PolyML.export function with the Poly/ML libraries or to produce an object file. When
- used to compile a Standard ML program it expects the main function to be called "main"
diff --git a/debian/patches/ppc64.diff b/debian/patches/ppc64.diff
deleted file mode 100644
index 15cedc6..0000000
--- a/debian/patches/ppc64.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Added support for 64-bit PowerPC
-Author: James Clarke <jrtc27 at jrtc27.com>
-Forwarded: https://github.com/polyml/polyml/pull/12
-Applied-Upstream: https://github.com/polyml/polyml/commit/80bc4443a26a491796753ec2c4af4a5447cbee8e
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/config.h.in
-+++ b/config.h.in
-@@ -560,6 +560,9 @@
- /* Define if the host is a Power PC (32 bit) */
- #undef HOSTARCHITECTURE_PPC
-
-+/* Define if the host is a Power PC (64 bit) */
-+#undef HOSTARCHITECTURE_PPC64
-+
- /* Define if the host is a Sparc (32 bit) */
- #undef HOSTARCHITECTURE_SPARC
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -400,6 +400,10 @@
- AC_DEFINE([HOSTARCHITECTURE_SPARC], [1], [Define if the host is a Sparc (32 bit)])
- polyarch=interpret
- ;;
-+ powerpc64* | ppc64*)
-+ AC_DEFINE([HOSTARCHITECTURE_PPC64], [1], [Define if the host is a Power PC (64 bit)])
-+ polyarch=interpret
-+ ;;
- power* | ppc*)
- AC_DEFINE([HOSTARCHITECTURE_PPC], [1], [Define if the host is a Power PC (32 bit)])
- polyarch=interpret
---- a/libpolyml/elfexport.cpp
-+++ b/libpolyml/elfexport.cpp
-@@ -314,6 +314,10 @@
- fhdr.e_machine = EM_PPC;
- directReloc = R_PPC_ADDR32;
- useRela = true;
-+#elif defined(HOSTARCHITECTURE_PPC64)
-+ fhdr.e_machine = EM_PPC64;
-+ directReloc = R_PPC64_ADDR64;
-+ useRela = true;
- #elif defined(HOSTARCHITECTURE_SPARC)
- fhdr.e_machine = EM_SPARC;
- directReloc = R_SPARC_32;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4e588e9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,8 +0,0 @@
-polyc.1-fix.diff
-arm64.diff
-noexec-stack.diff
-ppc64.diff
-mips.diff
-pexport-endian.diff
-make-check.diff
-mipsel.diff
diff --git a/debian/shlibs.local b/debian/shlibs.local
index e221758..4fb61e4 100644
--- a/debian/shlibs.local
+++ b/debian/shlibs.local
@@ -1 +1 @@
-libpolyml 6 libpolyml6 (>= 5.5.2)
+libpolyml 7 libpolyml7 (>= 5.6)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/polyml.git
More information about the debian-science-commits
mailing list