This is an automated email from the git hooks/post-receive script. locutusofborg-guest pushed a commit to branch master in repository hedgewars.
commit 7f39e4c658ceb9fc3f06eab12be0bba23b2b12fd Author: Gianfranco Costamagna <[email protected]> Date: Thu Mar 17 11:00:00 2016 +0100 Remove fix-arm-failures, upload to unstable --- debian/changelog | 7 +++++++ debian/patches/fix-arm-failures.patch | 12 ------------ debian/patches/series | 1 - 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index fe96959..c8ac10d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +hedgewars (0.9.22-dfsg-6) unstable; urgency=medium + + * Re-disable fPIC patch. + (remove fix-arm-failures.patch) + + -- Gianfranco Costamagna <[email protected]> Wed, 16 Mar 2016 23:26:05 +0100 + hedgewars (0.9.22-dfsg-5) unstable; urgency=medium * Fix insecure VCS fields. diff --git a/debian/patches/fix-arm-failures.patch b/debian/patches/fix-arm-failures.patch deleted file mode 100644 index f35937c..0000000 --- a/debian/patches/fix-arm-failures.patch +++ /dev/null @@ -1,12 +0,0 @@ -Description: disable again fPIC on arm. ---- hedgewars-0.9.22-dfsg.orig/hedgewars/CMakeLists.txt -+++ hedgewars-0.9.22-dfsg/hedgewars/CMakeLists.txt -@@ -15,7 +15,7 @@ add_flag_append(CMAKE_Pascal_FLAGS_RELEA - if(UNIX) - include(TargetArch) - target_architecture(CMAKE_TARGET_ARCHITECTURES) -- if(${CMAKE_Pascal_COMPILER_VERSION} VERSION_GREATER 2.7 OR ${CMAKE_TARGET_ARCHITECTURES} MATCHES "x86_64" OR ${CMAKE_TARGET_ARCHITECTURES} MATCHES "i386") -+ if((${CMAKE_Pascal_COMPILER_VERSION} VERSION_GREATER 2.7 AND ${CMAKE_Pascal_COMPILER_VERSION} VERSION_LESS 3.0) OR ${CMAKE_TARGET_ARCHITECTURES} MATCHES "x86_64" OR ${CMAKE_TARGET_ARCHITECTURES} MATCHES "i386") - add_flag_append(CMAKE_Pascal_FLAGS "-fPIC") - endif() - endif(UNIX) diff --git a/debian/patches/series b/debian/patches/series index 20a6104..6283151 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,4 +12,3 @@ a0e5bd1d4d77c1558394d9ac6b6b8a5030ef5282.patch ce3a58617e5732376b4ef5d47fc2be73b705a154.patch 93292d80924aeadfda9f327ba78891cc4bab6c3c.patch f121e6c350a041a429a57ba4748ad673aa8420ea.patch -fix-arm-failures.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/hedgewars.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
