Manual merge of version 1.0.4+dfsg-1+rpi1 and 1.3.0+dfsg-2 to produce 1.3.0+dfsg...

diff --cc Make.inc
index e1dbfb5bafafbab4af8796832aa789d8c26b8fd6,6a525bd2cbed69cd14a0fe318cf8313405d0b9bc..ceecb23f76ea5920ca7a5c80053ae022595b8037
--- 1/Make.inc
--- 2/Make.inc
+++ b/Make.inc
@@@ -986,7 -1082,7 +1082,7 @@@ else ifneq ($(USEMSVC), 1
  endif
  
  ifeq ($(OS), Linux)
- OSLIBS += -Wl,--no-as-needed -ldl -lrt -lpthread -Wl,--export-dynamic,--as-needed,--no-whole-archive $(LIBUNWIND) -latomic
 -OSLIBS += -Wl,--no-as-needed -ldl -lrt -lpthread -Wl,--export-dynamic,--as-needed,--no-whole-archive
++OSLIBS += -Wl,--no-as-needed -ldl -lrt -lpthread -Wl,--export-dynamic,--as-needed,--no-whole-archive -latomic
  # Detect if ifunc is supported
  IFUNC_DETECT_SRC := 'void (*f0(void))(void) { return (void(*)(void))0L; }; void f(void) __attribute__((ifunc("f0")));'
  ifeq (supported, $(shell echo $(IFUNC_DETECT_SRC) | $(CC) -Werror -x c - -S -o /dev/null > /dev/null 2>&1 && echo supported))

diff --cc debian/changelog
index 8aba441568e2e1f7dcf2bee1c649c29ad8e941f1,a76460d4abead3c557cf8e9a8087b32e8671ed22..8a11d94808c0a3d9a6642b991f346d817784842b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,106 +1,114 @@@
- julia (1.0.4+dfsg-1+rpi1) bullseye-staging; urgency=medium
++julia (1.3.0+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
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 20 Jul 2019 00:55:17 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 22 Dec 2019 02:56:06 +0000
++
+ julia (1.3.0+dfsg-2) unstable; urgency=medium
+ 
+   * Mark two symbols as x86 only. (thanks to Graham Inggs)
+   * rules: Disable BLAS64 on arm64.
+   * Temporarily make autopkgtest fail-permissive.
+ 
+  -- Mo Zhou <cdluminate@gmail.com>  Sat, 14 Dec 2019 10:21:17 +0800
+ 
+ julia (1.3.0+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream version 1.3.0+dfsg
+   * Patch Make.inc to fix openblas FTBFS on arm64
+   * Refresh patches.
+   * Update embedded libuv and Pkg.jl, as well as d/s/include-binaries.
+   * B-D on p7zip and set USE_SYSTEM_P7ZIP=1.
+   * Remove nonexisting files from julia.docs.
+   * Update symbols control file.
+   * B-D on zlib1g-dev and set USE_SYSTEM_ZLIB=1.
+   * Remove unused patch: llvm-armhf-baseline.patch
+   * Bump LLVM version to 8.
+   * Reflect symbol changes resulted by the LLVM version bump.
+   * Override two lintian warnings
+ 
+  -- Mo Zhou <cdluminate@gmail.com>  Thu, 28 Nov 2019 19:26:55 +0800
+ 
+ julia (1.2.0+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream version 1.2.0+dfsg
+   * Rebase/Refresh patches. Remove make-unwind-logic-error.patch.
+   * Update the embedded Pkg.jl to 394e7c5d55d3722f5b2ab660ca0a694ea0041974
+   * Disable binary builders via USE_BINARYBUILDER=0 .
+   * Bump LLVM dependency to llvm-7-dev (Closes: #919593, #912792).
+   * Update installation control files.
+   * Refresh symbols list.
+   * Patch: mask some failing tests.
+   * Bundle OpenBLAS and SuiteSparse source tarballs. (USE_BLAS64 is enabled)
+     Bundled OpenBLAS is specially compiled with SONAME=libopenblas64_.so,
+     INTERFACE64=1 and all symbols suffixed by "64_". Bundled SuiteSparse
+     is built against the bundled OpenBLAS with -DSUN64 extra CFLAG.
+     (Closes: #910924, #930548)
+     * Patch the suitesparse checksum.
+     * Prevent Makefile from downloading openblas and suitesparse.
+     * Update list of included-binaries
+     * Remove OpenBLAS and SuiteSparse from B-D.
+     * Remove libopenblas-base from runtime Depends.
+     * shlibdeps.mk: Add several dependencies for openblas and suitesparse.
+     * rules: Remove the LIBBLAS/LIBLAPACK build flags.
+     * Update copyright information for embedded OpenBLAS, SuiteSparse.
+     * Update the embedded OpenBLAS to 0.3.7
+   * rules: Remove the if-clause that disables libunwind for s390x.
+   * Exclude some libraries during shlibdeps resolution and dh_install.
+   * Files-Excluded: exclude the whole contrib/windows directory.
+   * Make tests fail-permissive.
+ 
+  -- Mo Zhou <cdluminate@gmail.com>  Tue, 29 Oct 2019 20:08:37 +0800
+ 
+ julia (1.1.1+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream version 1.1.1+dfsg
+   * Bump Standards-Version to 4.4.0 (no change).
+   * Add update-jl.sh script for managing embedded sources.
+     + Update embedded Pkg.jl to 40cbbe224d4a491503279dfc5b9aefe15412f007.
+     + Update embedded Documenter.jl to 0.23.0
+     + Update embedded JSON.jl to 0.21.0
+     + Update embedded DocStringExtensions.jl to 0.8.0
+     + Embed DocumenterlaTeX.jl 0.2.0
+     + Embed Parsers.jl 0.3.6
+     * Re-apply the privacy-breach.patch to the embedded .jl packages.
+   * Disable the flaky PDF build and remove the doc-base file.
+   * Apply wrap-and-sort.
+ 
+  -- Mo Zhou <cdluminate@gmail.com>  Thu, 25 Jul 2019 14:12:44 +0000
+ 
+ julia (1.1.0+dfsg-1) experimental; urgency=medium
+ 
+   [ Mo Zhou ]
+   * New upstream version 1.1.0+dfsg
+   * shlibdeps.mk: remove unused arpack part.
+   * B-D: Require llvm-6.0-dev (>= 1:6.0.1-11).
+   * Remove patches merged upstream and refresh patches:
+     - appstream.patch
+     - test-skip-i386-spec.patch
+   * Update the embedded source or source tarballs:
+     + libuv, Pkg.jl, Documenter.jl (= 0.22.1), DocumenterLatex.jl (= 0.2.0),
+       DocStringExtensions (= 0.7.0), JSON.jl (= 0.20.0).
+   * Refresh symbols list for libjulia1.
+   * Switch back to use system LLVM:
+     + Set USE_SYSTEM_LLVM=1.
+     + Add makefile options for system LLVM.
+     + Add DESTDIR argument to makefile options.
+     + Build-Depends on system LLVM-6.0.
+     - Remove the embedded LLVM-6.0.0 tarball and update include-binaries.
+     - Remove cmake and python3 from Build-Depends since they are for LLVM.
+     - Remove copyright paragraph for the embedded LLVM.
+     - Remove the LLVM installation hack from rules.
+     - Remove hacky patches for related to the embedded LLVM.
+       - install-embedded-llvm-hack.patch
+       - install-julia-hack.patch
+ 
+   [ Salsa Pipeline ]
+   * Update salsa CI pipeline
+ 
+  -- Mo Zhou <cdluminate@gmail.com>  Thu, 04 Apr 2019 04:25:04 +0000
  
  julia (1.0.4+dfsg-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 732250aa75835b3695f977def6bee2ac8cf0880c,b2fe921c15f3934a653071357167d2e2021d3f16..ac0db7002daa31b84770db0f5d8a656a7fa9495e
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -12,21 -17,14 +17,12 @@@ doc-unicode-data-path.patc
  
  # distro integration, wip, experimental, disabled by default
  #default-load-path-distro.patch
- 
- # Misc enhancement
- appstream.patch
--
  # Test
  test-skip-sigint.patch
- test-skip-i386-spec.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

diff --cc debian/rules
index b17b5eed1ccd1f10402f262c0214b5026b685d14,43533607ef6c37e5b103374a9e1cbeab92c15f95..f1e4ba444708d02b148b4d689196a651c3503c4c
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -57,8 -65,10 +65,10 @@@ COMMON_FLAGS += MARCH=x86-64 
  else ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386 kfreebsd-i386))
  COMMON_FLAGS += MARCH=pentium4 \
        JULIA_CPU_TARGET="pentium4;sandybridge,-xsaveopt,clone_all"
+ else ifneq (,$(filter $(DEB_HOST_ARCH),arm64))
+ COMMON_FLAGS += USE_BLAS64=0
  else ifneq (,$(filter $(DEB_HOST_ARCH),armhf))
 -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