[cernlib] 01/01: Imported Debian patch 20061220+dfsg3-4.2

[Balint Reczey]

This is an automated email from the git hooks/post-receive script.

rbalint pushed a commit to annotated tag debian/20061220+dfsg3-4.2
in repository cernlib.

commit 7fcd0a10ae6f81417d42a92b4a58243b12efffa9
Author: Wookey <wookey at debian.org>
Date:   Fri Jun 12 18:50:03 2015 +0000

    Imported Debian patch 20061220+dfsg3-4.2
---
 .git-ignore                                        |  0
 debian/cernlib-debian.mk                           |  2 +-
 debian/changelog                                   | 20 ++++++++++++++++++++
 .../patches/304-update-Imake-config-files.dpatch   | 22 ++++++++++++++++++++--
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/.git-ignore b/.git-ignore
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/cernlib-debian.mk b/debian/cernlib-debian.mk
index 17507cd..c1e4200 100644
--- a/debian/cernlib-debian.mk
+++ b/debian/cernlib-debian.mk
@@ -177,7 +177,7 @@ clean: Makefile
 	-chmod a+x $(ADDONDIR)/scripts/[a-z]*
 
 debian/control.new: $(wildcard debian/control.d/*.control)
-	cat $^ > $@
+	cat $(sort $^) > $@
 
 debian/control: debian/control.new
 	cp -f $< $@
diff --git a/debian/changelog b/debian/changelog
index 6811b18..0017104 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+cernlib (20061220+dfsg3-4.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Suport arm64 (Closes: #766482)
+
+ -- Wookey <wookey at debian.org>  Fri, 12 Jun 2015 18:50:03 +0000
+
+cernlib (20061220+dfsg3-4.1) unstable; urgency=medium
+
+  [ Aurelien Jarno ]
+  * Non-maintainer upload.
+
+  [ Mauricio Faria de Oliveira ]
+  * Fix 'debian/control.new' for GNU make 3.82+ (Closes: #720689)
+    Thanks Michael Tautschnig. New versions of GNU make don't 'sort' the output
+    of 'wildcard' anymore. This is reported in the following GNU make announce:
+    https://lists.gnu.org/archive/html/info-gnu/2010-07/msg00023.html
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu, 28 Aug 2014 19:07:13 +0200
+
 cernlib (20061220+dfsg3-4) unstable; urgency=low
 
   * cernlib-base-dev: depends on dpkg-dev to fix Multiarch support.
diff --git a/debian/patches/304-update-Imake-config-files.dpatch b/debian/patches/304-update-Imake-config-files.dpatch
index 9f6d4a9..c25aa86 100644
--- a/debian/patches/304-update-Imake-config-files.dpatch
+++ b/debian/patches/304-update-Imake-config-files.dpatch
@@ -941,7 +941,7 @@
  #endif /* DGUX */
  
  #ifdef __convex__
-@@ -366,101 +735,446 @@
+@@ -366,101 +735,452 @@
  # define ConvexArchitecture
  #endif /* _convex_ */
  
@@ -1272,6 +1272,12 @@
 +#   define AMD64Architecture
 +#  endif
 +# endif
++# if defined(__aarch64__)
++#  undef __aarch64__
++#  ifndef ARM64Architecture
++#   define ARM64Architecture
++#  endif
++# endif
 +#endif /* linux || __GLIBC__ */
 +
 +#if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
@@ -1495,7 +1501,7 @@
  #endif
  #define HasPutenv		YES
  #define HasShm			YES
-@@ -97,38 +97,308 @@
+@@ -97,38 +97,320 @@
  #define NeedVarargsPrototypes	YES
  #define NeedWidePrototypes	NO
  
@@ -1800,6 +1806,18 @@
 +# define CERNLIB_QMLXIA64
 +#endif /* AMD64Architecture */
 +
++#ifdef ARM64Architecture
++# ifndef OptimizationLevel
++#  define OptimizationLevel	-O3
++# endif
++# ifndef OptimizedCDebugFlags
++#  define OptimizedCDebugFlags  OptimizationLevel
++# endif
++# define LinuxMachineDefines    -D__aarch64__
++# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
++# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
++#endif /* ARM64Architecture */
++
 +#ifndef StandardDefines
 +# define StandardDefines        -Dlinux LinuxMachineDefines LinuxSourceDefines
 +#endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cernlib.git