[hedgewars] 01/01: Fix previous commit

[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 90d23afff9ffb51d33bf021d34d4fcd79a6c84b2
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Jan 15 11:54:08 2015 +0100

    Fix previous commit
---
 debian/changelog                                   |  4 +-
 debian/control                                     |  3 +-
 ...dd-RelWithDebInfo-for-debugging-pourposes.patch | 65 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  2 +-
 5 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 28848ac..b99a114 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-hedgewars (0.9.21.1-5) unstable; urgency=medium
+hedgewars (0.9.21.1-5) UNRELEASED; urgency=medium
 
   * Add a debug package, per upstream request.
+    - 0001-Add-RelWithDebInfo-for-debugging-pourposes.patch
+      Add RelWithDebInfo support for cmake..
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Thu, 15 Jan 2015 08:58:44 +0100
 
diff --git a/debian/control b/debian/control
index be95b3e..b3482e5 100644
--- a/debian/control
+++ b/debian/control
@@ -91,10 +91,9 @@ Description: Data files for hedgewars
 
 Package: hedgewars-dbg
 Section: debug
-Priority: extra
 Architecture: any
 Depends: hedgewars (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Debug symbols for Hedgewars
- Hedgewars runtime debug symbols.
+ This package contains debug symbols for the hedgewars package.
diff --git a/debian/patches/0001-Add-RelWithDebInfo-for-debugging-pourposes.patch b/debian/patches/0001-Add-RelWithDebInfo-for-debugging-pourposes.patch
new file mode 100644
index 0000000..a43a1be
--- /dev/null
+++ b/debian/patches/0001-Add-RelWithDebInfo-for-debugging-pourposes.patch
@@ -0,0 +1,65 @@
+From a021c17407eff3d18c39b82795f93d207d1ff0d5 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
+Date: Thu, 15 Jan 2015 11:48:28 +0100
+Subject: [PATCH] Add RelWithDebInfo for debugging pourposes
+
+---
+ CMakeLists.txt                     | 9 +++++----
+ QTfrontend/CMakeLists.txt          | 4 ++--
+ cmake_modules/compilerchecks.cmake | 2 +-
+ 3 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bfb9a6c..d7df4b3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -70,12 +70,13 @@ include(${CMAKE_MODULE_PATH}/platform.cmake)
+ if(CMAKE_BUILD_TYPE)
+     string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)
+     if(NOT((CMAKE_BUILD_TYPE MATCHES "RELEASE") OR
+-           (CMAKE_BUILD_TYPE MATCHES "DEBUG")))
+-        set(CMAKE_BUILD_TYPE ${default_build_type} CACHE STRING "Build type (Debug/Release)" FORCE)
+-        message(STATUS "Unknown build type, using default (${default_build_type})")
++           (CMAKE_BUILD_TYPE MATCHES "DEBUG") OR
++           (CMAKE_BUILD_TYPE MATCHES "RELWITHDEBINFO")))
++        set(CMAKE_BUILD_TYPE ${default_build_type} CACHE STRING "Build type (Debug/Release/RelWithDebInfo)" FORCE)
++        message(STATUS "Unknown build type ${CMAKE_BUILD_TYPE}, using default (${default_build_type})")
+     endif()
+ else(CMAKE_BUILD_TYPE)
+-    set(CMAKE_BUILD_TYPE ${default_build_type} CACHE STRING "Build type (Debug/Release)" FORCE)
++    set(CMAKE_BUILD_TYPE ${default_build_type} CACHE STRING "Build type (Debug/Release/RelWithDebInfo)" FORCE)
+ endif(CMAKE_BUILD_TYPE)
+ 
+ 
+diff --git a/QTfrontend/CMakeLists.txt b/QTfrontend/CMakeLists.txt
+index 695caad..9687059 100644
+--- a/QTfrontend/CMakeLists.txt
++++ b/QTfrontend/CMakeLists.txt
+@@ -190,9 +190,9 @@ endif()
+ 
+ #when debugging, always prompt a console to see fronted messages
+ #TODO: check it doesn't interfere on UNIX
+-if(CMAKE_BUILD_TYPE MATCHES "RELEASE")
++if(CMAKE_BUILD_TYPE MATCHES "RELEASE" OR CMAKE_BUILD_TYPE MATCHES "RELWITHDEBINFO")
+     set(console_access "WIN32")
+-endif(CMAKE_BUILD_TYPE MATCHES "RELEASE")
++endif(CMAKE_BUILD_TYPE MATCHES "RELEASE" OR CMAKE_BUILD_TYPE MATCHES "RELWITHDEBINFO")
+ 
+ add_executable(hedgewars ${console_access}
+     ${hwfr_src}
+diff --git a/cmake_modules/compilerchecks.cmake b/cmake_modules/compilerchecks.cmake
+index 2029712..676ae8e 100644
+--- a/cmake_modules/compilerchecks.cmake
++++ b/cmake_modules/compilerchecks.cmake
+@@ -62,7 +62,7 @@ if(UNIX)
+         endif()
+     endif()
+ 
+-    if(CMAKE_BUILD_TYPE MATCHES "RELEASE")
++    if(CMAKE_BUILD_TYPE MATCHES "RELEASE" OR CMAKE_BUILD_TYPE MATCHES "RELWITHDEBINFO")
+         set(CMAKE_REQUIRED_FLAGS "-Wl,--as-needed")
+         check_c_compiler_flag("" HAVE_ASNEEDED)
+         if(HAVE_ASNEEDED)
+-- 
+2.1.0
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2f64291
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Add-RelWithDebInfo-for-debugging-pourposes.patch
diff --git a/debian/rules b/debian/rules
index 234eb1b..03f23fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ endif
 HEDGEWARS_OPTIONS= \
  -DCMAKE_INSTALL_PREFIX=/usr/lib/hedgewars \
  -DDATA_INSTALL_DIR=/usr/share/games/hedgewars \
- -DCMAKE_BUILD_TYPE=RELEASE -DPHYSFS_SYSTEM=ON \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPHYSFS_SYSTEM=ON \
  -DFONTS_DIRS='/usr/share/fonts/truetype/wqy;$(DEJAVU_DIRECTORY)' \
  -DNOVERSIONINFOUPDATE=1 \
  -DBUILD_ENGINE_C=$(BUILD_ENGINE_C)

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