[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.6+git64-g5dc8b2b+dfsg-3-10-ga41439b

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=a41439b

The following commit has been merged in the experimental branch:
commit a41439b5b968ab9f1074c58ca57c3ee904a2e043
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Apr 8 18:57:49 2015 -0300

    Remove aarch64_arm64_fix_arch_detection.patch, applied upstream.
---
 debian/changelog                                   |  1 +
 .../patches/aarch64_arm64_fix_arch_detection.patch | 49 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cec6575..9f95a3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qt4-x11 (4:4.8.6+git155-g716fbae+dfsg-1) UNRELEASED; urgency=medium
   * Remove GStreamer 0.10's build dependencies. The real users of it
     should be using phonon with GStreamer 1.0.
   * Add a note for packagers on qt4-default's long description.
+  * Remove aarch64_arm64_fix_arch_detection.patch, applied upstream.
 
   [ Dmitry Shachnev ]
   * Make qt4-qmake suggest libqtcore4, as that package contains configuration
diff --git a/debian/patches/aarch64_arm64_fix_arch_detection.patch b/debian/patches/aarch64_arm64_fix_arch_detection.patch
deleted file mode 100644
index fbbd75b..0000000
--- a/debian/patches/aarch64_arm64_fix_arch_detection.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 800abbba658203fc8e746e3fc780a297cd4110cf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?=
- <perezmeyer at gmail.com>
-Date: Wed, 20 Aug 2014 17:52:49 -0300
-Subject: [PATCH] Fix AArch64/arm64 detection.
-
-The detection needs to go before arm, else the system will detect AArch64/arm64
-as arm.
-
-This patch comes from Wookey, he has agreed to put it under BSD or Expat
-to allow it's inclusion in here:
-<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#255>
-
-Change-Id: Ic2171c03fca8bb871347940fa3a2bc467776f797
----
- configure | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/configure b/configure
-index a9ba7c8..eb88b72 100755
---- a/configure
-+++ b/configure
-@@ -3241,17 +3241,17 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
-     	fi
-     	CFG_HOST_ARCH=s390
-     	;;
--    *:*:arm*)
-+    *:*:aarch64*|*:*:arm64*)
-         if [ "$OPT_VERBOSE" = "yes" ]; then
--            echo "    ARM (arm)"
-+            echo "    AArch64 (aarch64)"
-         fi
--        CFG_HOST_ARCH=arm
-+        CFG_HOST_ARCH=aarch64
-         ;;
--    *:*:aarch64*)
-+    *:*:arm*)
-         if [ "$OPT_VERBOSE" = "yes" ]; then
--            echo "    AArch64 (aarch64)"
-+            echo "    ARM (arm)"
-         fi
--        CFG_HOST_ARCH=aarch64
-+        CFG_HOST_ARCH=arm
-         ;;
-     Linux:*:sparc*)
-         if [ "$OPT_VERBOSE" = "yes" ]; then
--- 
-2.1.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 97e221e..78104c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,6 @@ dont_crash_on_broken_gif_images.patch
 xmlpatterns_stack_overflow_fix.diff
 
 # Patches submitted upstream but still not accepted
-aarch64_arm64_fix_arch_detection.patch
 aarch64_arm64_qatomic_support.patch
 fix_libmng_test.patch
 

-- 
Qt 4 packaging