This is an automated email from the git hooks/post-receive script.
treinen pushed a commit to branch master
in repository dose3.
commit e455409e5cc00c5521af3aef596ed1058b9162ab
Author: Ralf Treinen <trei...@free.fr>
Date: Tue Jan 17 21:48:01 2017 +0100
update embedded cputable and tupletable to dpkg 1.18.15
---
debian/changelog | 4 +-
debian/patches/architectures-dpkg-1.18.15 | 74 +++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 78 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index dda7649..31207ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ dose3 (5.0.1-8) unstable; urgency=medium
* Patches taken from upstream (thanks, Josch!)
- architecture-tuples: replace architecture triples by tuples.
(closes: #843409)
+ * - architectures-dpkg-1.18.15: Update embedded cputable and tupletable
+ to dpkg 1.18.15
- -- Ralf Treinen <trei...@debian.org> Tue, 17 Jan 2017 21:34:51 +0100
+ -- Ralf Treinen <trei...@debian.org> Tue, 17 Jan 2017 21:47:13 +0100
dose3 (5.0.1-7) unstable; urgency=medium
diff --git a/debian/patches/architectures-dpkg-1.18.15
b/debian/patches/architectures-dpkg-1.18.15
new file mode 100644
index 0000000..075f4e4
--- /dev/null
+++ b/debian/patches/architectures-dpkg-1.18.15
@@ -0,0 +1,74 @@
+Author: Johannes 'josch' Schauer <jo...@mister-muffin.de>
+Description: deb/architecture.ml: Update embedded cputable and tupletable
+ to dpkg 1.18.15
+
+diff --git a/deb/architecture.ml b/deb/architecture.ml
+index 0a3b823..ddd6adc 100644
+--- a/deb/architecture.ml
++++ b/deb/architecture.ml
+@@ -27,11 +27,12 @@ include Util.Logging(struct let label = label end) ;;
+ (* the line numbers correspond to the line numbers in /usr/share/dpkg/cputable
+ * to be quickly able to find changes *)
+ let cpulist = ref [
+-(* lines 17..23 *) "i386"; "ia64"; "alpha"; "amd64"; "armeb"; "arm"; "arm64";
+-(* lines 24..29 *) "avr32"; "hppa"; "m32r"; "m68k"; "mips"; "mipsel";
+-(* lines 30..34 *) "mips64"; "mips64el"; "or1k"; "powerpc"; "powerpcel";
+-(* lines 35..41 *) "ppc64"; "ppc64el"; "s390"; "s390x"; "sh3"; "sh3eb";
"sh4";
+-(* lines 42..44 *) "sh4eb"; "sparc"; "sparc64" ]
++(* lines 19..25 *) "i386"; "ia64"; "alpha"; "amd64"; "armeb"; "arm"; "arm64";
++(* lines 26..31 *) "avr32"; "hppa"; "m32r"; "m68k"; "mips"; "mipsel";
++(* lines 32..36 *) "mipsr6"; "mipsr6el"; "mips64"; "mips64el"; "mips64r6";
++(* lines 37..41 *) "mips64r6el"; "nios2"; "or1k"; "powerpc"; "powerpcel";
++(* lines 42..48 *) "ppc64"; "ppc64el"; "s390"; "s390x"; "sh3"; "sh3eb";
"sh4";
++(* lines 49..52 *) "sh4eb"; "sparc"; "sparc64"; "tilegx"; ]
+
+ (* from /usr/share/dpkg/tupletable
+ *
+@@ -40,32 +41,37 @@ let cpulist = ref [
+ *
+ * debian tuple (abi,libc,os,cpu) debian arch *)
+ let tupletable = ref [
+- (("eabi","uclibc","linux","arm"), "uclibc-linux-armel"); (* line 6 *)
++ (("eabi","uclibc","linux","arm"), "uclibc-linux-armel"); (* line 8 *)
+ (("base","uclibc","linux","<cpu>"), "uclibc-linux-<cpu>");
+- (("eabihf","musl","linux","arm"), "musl-linux-armhf");
++ (("eabihf","musl","linux","arm"), "musl-linux-armhf"); (* line 10 *)
+ (("base","musl","linux","<cpu>"), "musl-linux-<cpu>");
+- (("eabihf","gnu","linux","arm"), "armhf"); (* line 10 *)
++ (("eabihf","gnu","linux","arm"), "armhf");
+ (("eabi","gnu","linux","arm"), "armel");
++ (("abin32","gnu","linux","mips64r6el"), "mipsn32r6el");
++ (("abin32","gnu","linux","mips64r6"), "mipsn32r6"); (* line 15 *)
+ (("abin32","gnu","linux","mips64el"), "mipsn32el");
+ (("abin32","gnu","linux","mips64"), "mipsn32");
+- (("abi64","gnu","linux","mips64el"), "mips64el");
+- (("abi64","gnu","linux","mips64"), "mips64"); (* line 15 *)
++ (("abi64","gnu","linux","mips64r6el"), "mips64r6el");
++ (("abi64","gnu","linux","mips64r6"), "mips64r6");
++ (("abi64","gnu","linux","mips64el"), "mips64el"); (* line 20 *)
++ (("abi64","gnu","linux","mips64"), "mips64");
+ (("spe","gnu","linux","powerpc"), "powerpcspe");
+ (("x32","gnu","linux","amd64"), "x32");
+- (("hardened1","gnu","linux","<cpu>"), "hardened1-linux-<cpu>");
+ (("base","gnu","linux","<cpu>"), "<cpu>");
++ (("eabihf","gnu","kfreebsd","arm"), "kfreebsd-armhf"); (* line 25 *)
+ (("base","gnu","kfreebsd","<cpu>"), "kfreebsd-<cpu>");
+- (("base","gnu","knetbsd","<cpu>"), "knetbsd-<cpu>"); (* line 20 *)
++ (("base","gnu","knetbsd","<cpu>"), "knetbsd-<cpu>");
+ (("base","gnu","kopensolaris","<cpu>"), "kopensolaris-<cpu>");
+ (("base","gnu","hurd","<cpu>"), "hurd-<cpu>");
+- (("base","bsd","dragonflybsd","<cpu>"), "dragonflybsd-<cpu>");
++ (("base","bsd","dragonflybsd","<cpu>"), "dragonflybsd-<cpu>"); (* line 30 *)
+ (("base","bsd","freebsd","<cpu>"), "freebsd-<cpu>");
+- (("base","bsd","openbsd","<cpu>"), "openbsd-<cpu>"); (* line 25 *)
++ (("base","bsd","openbsd","<cpu>"), "openbsd-<cpu>");
+ (("base","bsd","netbsd","<cpu>"), "netbsd-<cpu>");
+ (("base","bsd","darwin","<cpu>"), "darwin-<cpu>");
++ (("base","sysv","aix","<cpu>"), "aix-<cpu>"); (* line 35 *)
+ (("base","sysv","solaris","<cpu>"), "solaris-<cpu>");
+ (("eabi","uclibc","uclinux","arm"), "uclinux-armel");
+- (("base","uclibc","uclinux","<cpu>"), "uclinux-<cpu>"); (* line 30 *)
++ (("base","uclibc","uclinux","<cpu>"), "uclinux-<cpu>");
+ (("base","tos","mint","m68k"), "mint-m68k");
+ (("base","gnu","linux","<cpu>"), "linux-<cpu>") (* this entry is not
from /usr/share/dpkg/tupletable *)
+ (* the "linux-" prefix is commented in scripts/Dpkg/Arch.pm with "XXX:
Might disappear in the future, not sure yet." *)
diff --git a/debian/patches/series b/debian/patches/series
index 3ac1fe0..72e783a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ binaries-prefix-edos
input-xz-files
ocaml-4.02.3+gcc-6.2.0
architecture-tuples
+architectures-dpkg-1.18.15
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
