From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 10 Nov 2020 08:01:24 +0000 (+0000)
Subject: Manual merge of version 1.4.1+dfsg-1+rpi1 and 1.5.2+dfsg-2 to produce 1.5.2+dfsg... 
X-Git-Tag: archive/raspbian/1.5.3+dfsg-1+rpi1~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1e9710e53f8bdd009672c7e5837cb9ff2cbddc3e;p=julia.git

Manual merge of version 1.4.1+dfsg-1+rpi1 and 1.5.2+dfsg-2 to produce 1.5.2+dfsg-2+rpi1
---

1e9710e53f8bdd009672c7e5837cb9ff2cbddc3e
diff --cc debian/changelog
index 6c6282a,7eacec7..c90940b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,42 +1,55 @@@
- julia (1.4.1+dfsg-1+rpi1) bullseye-staging; urgency=medium
++julia (1.5.2+dfsg-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 1.0.3+dfsg-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 02 Mar 2019 23:41:50 +0000]
 +  * Set julia target option for raspbian.
 +  * Build with -latomic
 +
 +  [changes introduced in 1.4.1+dfsg-1+rpi1 by Peter Michael green]
 +  * Disable testsuite.
 +  * Upload package despite armv7 contamination check fail in
 +    libopenblas64_.so I think it's probablly a false positive.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 26 Apr 2020 15:42:38 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 10 Nov 2020 08:00:02 +0000
++
+ julia (1.5.2+dfsg-2) unstable; urgency=medium
+ 
+   * Set USE_BLAS64=0 for 32bit builds (Closes: #973477)
+     (and maybe other arch B-D, too)
+ 
+  -- Norbert Preining <norbert@preining.info>  Wed, 04 Nov 2020 16:56:54 +0900
+ 
+ julia (1.5.2+dfsg-1) unstable; urgency=medium
+ 
+   [ Debian Janitor ]
+   * debian/copyright: use spaces rather than tabs to start continuation lines.
+   * Set upstream metadata fields: Repository.
+   * Remove obsolete field Name from debian/upstream/metadata (already present in
+     machine-readable debian/copyright).
+ 
+   [ Aron Xu ]
+   * Use cp to avoid real invocation of curl command
+ 
+   [ Mo Zhou ]
+   * New upstream version 1.5.0+dfsg
+   * Remove the embedded OpenBLAS source package.
+   * Rebase+Refresh the existing patches.
+   * Upgrade the embedded Pkg.jl
+   * Upgrade embedded Statistics.jl
+   * Bump LLVM dependency to llvm-10-dev.
+ 
+   [ Norbert Preining ]
+   * Revert openblas removal until test failures with separate library
+     are resolved.
+   * Add myself to uploaders.
+   * Update symbols.
+   * Upgrade the embedded Pkg.jl
+   * New upstream version 1.5.2+dfsg
+   * Update embedded Documenter to 0.25.2
+   * Update of privacy breach fixes.
+   * Conflict with libjulia-openblas64 for now, as we ship an embedded
+     version.
+ 
+  -- Norbert Preining <norbert@preining.info>  Sun, 25 Oct 2020 23:04:33 +0900
  
  julia (1.4.1+dfsg-1) unstable; urgency=medium
  
diff --cc debian/patches/series
index 57f2ccf,51f45c4..b38e555
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -18,13 -16,14 +16,12 @@@ doc-unicode-data-path.patc
  
  # distro integration, wip, experimental, disabled by default
  #default-load-path-distro.patch
 -
  # Test
- test-skip-sigint.patch
+ #test-skip-sigint.patch
  test-skip-dns-ubuntu.patch
 -
  # This patch is for embedded sources. Already pre-applied.
  # privacy-breach.patch
  # doc-silent.patch
 -
  mask-tests-1.2.0.patch
  arm64-openblas.patch
 +add-libatomic.patch
- openblas-skip-patch.patch
diff --cc debian/rules
index 4438c53,c4af38a..49442ae
--- a/debian/rules
+++ b/debian/rules
@@@ -68,7 -69,8 +69,8 @@@ COMMON_FLAGS += MARCH=pentium4 
  else ifneq (,$(filter $(DEB_HOST_ARCH),arm64))
  COMMON_FLAGS += USE_BLAS64=0
  else ifneq (,$(filter $(DEB_HOST_ARCH),armhf))
+ COMMON_FLAGS += USE_BLAS64=0
 -COMMON_FLAGS += JULIA_CPU_TARGET="armv7-a;armv7-a,neon;armv7-a,neon,vfp4"
 +COMMON_FLAGS += JULIA_CPU_TARGET="arm1176jzf-s"
  else ifneq (,$(filter $(DEB_HOST_ARCH),ppc64el))
  COMMON_FLAGS += JULIA_CPU_TARGET="pwr8"
  else