[hedgewars] 01/01: Upload to unstable, disabling patches

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch master
in repository hedgewars.

commit 1bb73934e00035df7297d84901204a1a3b8fbf3b
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Jan 7 11:11:12 2015 +0100

    Upload to unstable, disabling patches
---
 debian/changelog                              |  8 ++++++++
 debian/patches/disable-fstack-protector.patch | 18 ------------------
 debian/patches/series                         |  1 -
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f9149d9..487e15d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hedgewars (0.9.21.1-3) unstable; urgency=medium
+
+  * Upload to unstable, with no patches at all.
+    - the clang build failure seems probably clang-related (cfr: #754417).
+      leaving the arch enabled until some clang folk fixes this.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 07 Jan 2015 11:02:36 +0100
+
 hedgewars (0.9.21.1-2) experimental; urgency=medium
 
   * Try to not use fstack-protector when BUILD_ENGINE_C, clang is
diff --git a/debian/patches/disable-fstack-protector.patch b/debian/patches/disable-fstack-protector.patch
deleted file mode 100644
index 087de2e..0000000
--- a/debian/patches/disable-fstack-protector.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/cmake_modules/compilerchecks.cmake b/cmake_modules/compilerchecks.cmake
-index 2029712..26a15e4 100644
---- a/cmake_modules/compilerchecks.cmake
-+++ b/cmake_modules/compilerchecks.cmake
-@@ -17,9 +17,12 @@ if(NOT (WIN32 OR (CMAKE_SYSTEM_NAME MATCHES BSD.OS) OR (CMAKE_SYSTEM_NAME MATCHE
-     #some bsd installations reported problems too
-     #(see 822312 654424 on bugzilla.redhat.com)
-     check_c_compiler_flag("-fstack-protector-all -fstack-protector" HAVE_STACKPROTECTOR)
--    if(HAVE_STACKPROTECTOR)
-+    if(HAVE_STACKPROTECTOR AND NOT BUILD_ENGINE_C)
-         add_flag_append(CMAKE_C_FLAGS "-fstack-protector-all -fstack-protector")
-         add_flag_append(CMAKE_CXX_FLAGS "-fstack-protector-all -fstack-protector")
-+    else()
-+        add_flag_append(CMAKE_C_FLAGS "-fnostack-protector")
-+        add_flag_append(CMAKE_CXX_FLAGS "-fnostack-protector")
-     endif()
- endif()
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a03d01c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-disable-fstack-protector.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/hedgewars.git