Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Please unblock package rust-typenum

It fixes a FTBFS on i386

unblock rust-typenum/1.10.0-2

-- System Information:
Debian Release: buster/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 
'testing-debug'), (500, 'stable'), (300, 'unstable'), (100, 'experimental'), 
(1, 'experimental-debug')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.19.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8), LANGUAGE=en_GB:en 
(charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru rust-typenum-1.10.0/debian/changelog 
rust-typenum-1.10.0/debian/changelog
--- rust-typenum-1.10.0/debian/changelog        2018-07-08 13:24:38.000000000 
-0700
+++ rust-typenum-1.10.0/debian/changelog        2019-05-18 19:13:40.000000000 
-0700
@@ -1,3 +1,11 @@
+rust-typenum (1.10.0-2) unstable; urgency=medium
+
+  * Team upload.
+  * Package typenum 1.10.0 from crates.io using debcargo 2.2.10
+  * Add patch that fixes FTBFS on i386.
+
+ -- Ximin Luo <infini...@debian.org>  Sat, 18 May 2019 19:13:40 -0700
+
 rust-typenum (1.10.0-1) unstable; urgency=medium
 
   * Package typenum 1.10.0 from crates.io using debcargo 2.2.1
diff -Nru rust-typenum-1.10.0/debian/control rust-typenum-1.10.0/debian/control
--- rust-typenum-1.10.0/debian/control  2018-07-08 13:24:38.000000000 -0700
+++ rust-typenum-1.10.0/debian/control  2019-05-18 19:13:40.000000000 -0700
@@ -2,13 +2,14 @@
 Section: rust
 Priority: optional
 Build-Depends: debhelper (>= 11),
- dh-cargo (>= 6),
+ dh-cargo (>= 15),
  cargo:native <!nocheck>,
  rustc:native <!nocheck>,
  libstd-rust-dev <!nocheck>
 Maintainer: Debian Rust Maintainers 
<pkg-rust-maintain...@alioth-lists.debian.net>
-Uploaders: Ximin Luo <infini...@debian.org>
-Standards-Version: 4.1.5
+Uploaders:
+ kpcyrd <g...@rxv.cc>
+Standards-Version: 4.2.0
 Vcs-Git: https://salsa.debian.org/rust-team/debcargo-conf.git [src/typenum]
 Vcs-Browser: 
https://salsa.debian.org/rust-team/debcargo-conf/tree/master/src/typenum
 
diff -Nru rust-typenum-1.10.0/debian/copyright.debcargo.hint 
rust-typenum-1.10.0/debian/copyright.debcargo.hint
--- rust-typenum-1.10.0/debian/copyright.debcargo.hint  2018-07-08 
13:24:38.000000000 -0700
+++ rust-typenum-1.10.0/debian/copyright.debcargo.hint  2019-05-18 
19:13:40.000000000 -0700
@@ -25,8 +25,8 @@
 
 Files: debian/*
 Copyright:
- 2018 Debian Rust Maintainers <pkg-rust-maintain...@alioth-lists.debian.net>
- 2018 FIXME (overlay) Your Name <Your Email>
+ 2018-2019 Debian Rust Maintainers 
<pkg-rust-maintain...@alioth-lists.debian.net>
+ 2018-2019 kpcyrd <g...@rxv.cc>
 License: MIT or Apache-2.0
 
 License: Apache-2.0
diff -Nru rust-typenum-1.10.0/debian/debcargo.toml 
rust-typenum-1.10.0/debian/debcargo.toml
--- rust-typenum-1.10.0/debian/debcargo.toml    2018-07-08 13:24:38.000000000 
-0700
+++ rust-typenum-1.10.0/debian/debcargo.toml    2019-05-18 19:13:40.000000000 
-0700
@@ -1 +1,2 @@
 overlay = "."
+uploaders = ["kpcyrd <g...@rxv.cc>"]
diff -Nru rust-typenum-1.10.0/debian/patches/pr115.patch 
rust-typenum-1.10.0/debian/patches/pr115.patch
--- rust-typenum-1.10.0/debian/patches/pr115.patch      1969-12-31 
16:00:00.000000000 -0800
+++ rust-typenum-1.10.0/debian/patches/pr115.patch      2019-05-18 
19:13:40.000000000 -0700
@@ -0,0 +1,23 @@
+From 0d5196feadafa77c727f517d747ffcf3fd0e8ba9 Mon Sep 17 00:00:00 2001
+From: Michael Hudson-Doyle <michael.hud...@canonical.com>
+Date: Wed, 13 Mar 2019 15:55:30 +1300
+Subject: [PATCH] round result of (highest as f64).log(2.0)
+
+Even though (1024f64).log(2.0) has an exact, representable, value, with rustc 
1.32 on i386 it comes out as +9.999999999999999985 with optimization enabled. 
And the rustc doesn't like having two defintions for U1024 etc.
+---
+ build/main.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/main.rs b/build/main.rs
+index 16b0ffe2f..b7939f993 100644
+--- a/build/main.rs
++++ b/build/main.rs
+@@ -81,7 +81,7 @@ pub fn no_std() {}
+ fn main() {
+     let highest: u64 = 1024;
+ 
+-    let first2: u32 = (highest as f64).log(2.0) as u32 + 1;
++    let first2: u32 = (highest as f64).log(2.0).round() as u32 + 1;
+     let first10: u32 = (highest as f64).log(10.0) as u32 + 1;
+     let uints = (0..(highest + 1))
+         .chain((first2..64).map(|i| 2u64.pow(i)))
diff -Nru rust-typenum-1.10.0/debian/watch rust-typenum-1.10.0/debian/watch
--- rust-typenum-1.10.0/debian/watch    2018-07-08 13:24:38.000000000 -0700
+++ rust-typenum-1.10.0/debian/watch    2019-05-18 19:13:40.000000000 -0700
@@ -1,4 +1,5 @@
 version=4
-opts=filenamemangle=s/.*\/(.*)\/download/typenum-$1\.tar\.gz/g\ 
- https://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=crates.io/typenum 
.*/crates/typenum/@ANY_VERSION@/download
+opts=filenamemangle=s/.*\/(.*)\/download/typenum-$1\.tar\.gz/g,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/ \
+https://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=crates.io/typenum 
.*/crates/typenum/@ANY_VERSION@/download
 

Reply via email to