r10218 - in packages/trunk/plee-the-bear/debian: . patches

[Julien Jorge]

Author: j-jorge-guest
Date: 2009-08-26 19:33:31 +0000 (Wed, 26 Aug 2009)
New Revision: 10218

Added:
   packages/trunk/plee-the-bear/debian/patches/clear-selection-checks-layer.diff
Modified:
   packages/trunk/plee-the-bear/debian/changelog
   packages/trunk/plee-the-bear/debian/control
   packages/trunk/plee-the-bear/debian/patches/series
   packages/trunk/plee-the-bear/debian/rules
Log:
- Fix a segfault when clicking on an empty level in the level editor
  (patch clear-selection-checks-layer.diff).
- Add a -DNDEBUG on the compile line.
- Add libboost-thread in the dependencies (required by version 0.4).



Modified: packages/trunk/plee-the-bear/debian/changelog
===================================================================
--- packages/trunk/plee-the-bear/debian/changelog	2009-08-25 23:15:01 UTC (rev 10217)
+++ packages/trunk/plee-the-bear/debian/changelog	2009-08-26 19:33:31 UTC (rev 10218)
@@ -13,6 +13,10 @@
   * Set copyright to 2009.
   * Fix watch file regexp.
     + Probably still needs improvement.
+  * Fix a segfault when clicking on an empty level in the level editor
+    (patch clear-selection-checks-layer.diff).
+  * Add a -DNDEBUG on the compile line.
+  * Add libboost-thread in the dependencies (required by version 0.4).
 
  -- Julien Jorge <julien_jorge at yahoo.fr>  Sat, 22 Aug 2009 10:59:56 +0200
 

Modified: packages/trunk/plee-the-bear/debian/control
===================================================================
--- packages/trunk/plee-the-bear/debian/control	2009-08-25 23:15:01 UTC (rev 10217)
+++ packages/trunk/plee-the-bear/debian/control	2009-08-26 19:33:31 UTC (rev 10218)
@@ -5,6 +5,7 @@
 Uploaders: Julien Jorge <julien_jorge at yahoo.fr>, Barry deFreese <bdefreese at debian.org>
 Build-Depends: quilt, docbook-to-man, debhelper (>= 5.0.51), cmake (>= 2.6),
  libsdl-mixer1.2-dev (>= 1.2.8), libboost-filesystem-dev (>= 1.33),
+ libboost-thread-dev (>= 1.33),
  mesa-common-dev (>= 6.5), libclaw-dev (>= 1.5.4),
  libclaw-graphic-dev (>= 1.5.4), libclaw-logger-dev (>= 1.5.4),
  libclaw-application-dev (>= 1.5.4), libclaw-dynamic-library-dev (>= 1.5.4),

Added: packages/trunk/plee-the-bear/debian/patches/clear-selection-checks-layer.diff
===================================================================
--- packages/trunk/plee-the-bear/debian/patches/clear-selection-checks-layer.diff	                        (rev 0)
+++ packages/trunk/plee-the-bear/debian/patches/clear-selection-checks-layer.diff	2009-08-26 19:33:31 UTC (rev 10218)
@@ -0,0 +1,16 @@
+Index: plee-the-bear-0.4/bear-factory/level-editor/src/bf/code/gui_level.cpp
+===================================================================
+--- plee-the-bear-0.4.orig/bear-factory/level-editor/src/bf/code/gui_level.cpp	2009-08-26 20:50:32.000000000 +0200
++++ plee-the-bear-0.4/bear-factory/level-editor/src/bf/code/gui_level.cpp	2009-08-26 20:50:52.000000000 +0200
+@@ -201,9 +201,8 @@
+ /*----------------------------------------------------------------------------*/
+ void bf::gui_level::clear_selection()
+ {
+-  CLAW_PRECOND( m_active_layer < layers_count() );
+-
+-  clear_selection( m_active_layer );
++  if ( m_active_layer < layers_count() )
++    clear_selection( m_active_layer );
+ } // gui_level::clear_selection()
+ 
+ /*----------------------------------------------------------------------------*/

Modified: packages/trunk/plee-the-bear/debian/patches/series
===================================================================
--- packages/trunk/plee-the-bear/debian/patches/series	2009-08-25 23:15:01 UTC (rev 10217)
+++ packages/trunk/plee-the-bear/debian/patches/series	2009-08-26 19:33:31 UTC (rev 10218)
@@ -0,0 +1 @@
+clear-selection-checks-layer.diff

Modified: packages/trunk/plee-the-bear/debian/rules
===================================================================
--- packages/trunk/plee-the-bear/debian/rules	2009-08-25 23:15:01 UTC (rev 10217)
+++ packages/trunk/plee-the-bear/debian/rules	2009-08-26 19:33:31 UTC (rev 10218)
@@ -26,7 +26,8 @@
 	# Perform an out-of-tree build to keep a clean source tree
 	mkdir $(BUILD_TREE)
 	cd $(BUILD_TREE); cmake .. \
-		-DCMAKE_INSTALL_PREFIX:STRING="/usr" -DCMAKE_C_FLAGS:STRING="$(CFLAGS)" \
+		-DCMAKE_INSTALL_PREFIX:STRING="/usr" \
+		-DCMAKE_C_FLAGS:STRING="$(CFLAGS) -DNDEBUG" \
 		-DBUILD_STATIC:BOOL=ON \
 		-DBEAR_ENGINE_INSTALL_LIBRARY_DIR:STRING="lib/games/plee-the-bear" \
 		-DPTB_INSTALL_CUSTOM_LIBRARY_DIR:STRING="lib/games/plee-the-bear" \