r37 - in unstable/rutilt/debian: . patches

[benh at alioth.debian.org]

Author: benh
Date: 2007-10-07 19:35:34 +0000 (Sun, 07 Oct 2007)
New Revision: 37

Added:
   unstable/rutilt/debian/patches/010_fix_cflags.diff
Modified:
   unstable/rutilt/debian/patches/series
   unstable/rutilt/debian/rules
Log:
Disabled stripping in debug builds.


Added: unstable/rutilt/debian/patches/010_fix_cflags.diff
===================================================================
--- unstable/rutilt/debian/patches/010_fix_cflags.diff	                        (rev 0)
+++ unstable/rutilt/debian/patches/010_fix_cflags.diff	2007-10-07 19:35:34 UTC (rev 37)
@@ -0,0 +1,23 @@
+--- rutilt.orig/configure.sh
++++ rutilt/configure.sh
+@@ -23,8 +23,9 @@
+ helper_mode=4755
+ makefile_target='$(RUTILT_NAME) $(HELPER_NAME)'
+ kernel_sources_path='/lib/modules/'`uname -r`'/build/include/'
+-options_base='-pipe -Wall -s'
+-options="$options_base -O3 -DNDEBUG"
++options_base='-pipe -Wall'
++options_debug="$options_base -g"
++options="$options_base -s -O3 -DNDEBUG"
+ # Generated variables :
+ rutilt_name=rutilt
+ rutilt_prefix=bin/
+@@ -120,7 +121,7 @@
+ 
+          --debug)
+             echo 'Enabling debugging output, turning optimizations off.'
+-            options=$options_base
++            options=$options_debug
+             make clean_rutilt_secure_target_name;;
+ 
+         *)

Modified: unstable/rutilt/debian/patches/series
===================================================================
--- unstable/rutilt/debian/patches/series	2007-10-07 18:33:43 UTC (rev 36)
+++ unstable/rutilt/debian/patches/series	2007-10-07 19:35:34 UTC (rev 37)
@@ -4,6 +4,7 @@
 007_fix_buffer_lengths.diff
 008_fix_row_toggled.diff
 009_remove_unsafe_signal_handler.diff
+010_fix_cflags.diff
 001_fix_desktop.diff
 002_fix_install.diff
 003_fix_ELF_location.diff

Modified: unstable/rutilt/debian/rules
===================================================================
--- unstable/rutilt/debian/rules	2007-10-07 18:33:43 UTC (rev 36)
+++ unstable/rutilt/debian/rules	2007-10-07 19:35:34 UTC (rev 37)
@@ -5,18 +5,16 @@
 
 include /usr/share/quilt/quilt.make
 
-CFLAGS = -Wall -g
+CONFIGURE_OPTIONS := --launcher=external --prefix=/usr --force
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
+	CONFIGURE_OPTIONS += --debug
 endif
 
 configure: configure-stamp
 configure-stamp: patch
 	dh_testdir
-	./configure.sh --launcher=external --prefix=/usr --force
+	./configure.sh $(CONFIGURE_OPTIONS)
 
 	touch configure-stamp