r3117 - packages/trunk/ode/debian

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2007-06-29 11:59:33 +0000 (Fri, 29 Jun 2007)
New Revision: 3117

Modified:
   packages/trunk/ode/debian/changelog
   packages/trunk/ode/debian/rules
Log:
+  * Apply changes provide by Jiří Paleček about the DEB_BUILD_OPTIONS parsing
+    (Closes: #431057)
+   - rules: do not parse DEB_BUILD_OPTIONS to find nostrip anymore, lets
+     dh_strip decide if we should strip or not the binarys
+   - noopt: really exports the correct flags to g++


Modified: packages/trunk/ode/debian/changelog
===================================================================
--- packages/trunk/ode/debian/changelog	2007-06-29 11:48:44 UTC (rev 3116)
+++ packages/trunk/ode/debian/changelog	2007-06-29 11:59:33 UTC (rev 3117)
@@ -1,3 +1,13 @@
+ode (1:0.8.dfsg-3) UNRELEASED; urgency=low
+
+  * Apply changes provide by Jiří Paleček about the DEB_BUILD_OPTIONS parsing
+    (Closes: #431057)
+   - rules: do not parse DEB_BUILD_OPTIONS to find nostrip anymore, lets
+     dh_strip decide if we should strip or not the binarys
+   - noopt: really exports the correct flags to g++
+
+ -- Gonéri Le Bouder <goneri at rulezlan.org>  Fri, 29 Jun 2007 13:54:43 +0200
+
 ode (1:0.8.dfsg-2) unstable; urgency=low
 
   [ Miriam Ruiz ]

Modified: packages/trunk/ode/debian/rules
===================================================================
--- packages/trunk/ode/debian/rules	2007-06-29 11:48:44 UTC (rev 3116)
+++ packages/trunk/ode/debian/rules	2007-06-29 11:59:33 UTC (rev 3117)
@@ -6,13 +6,10 @@
 #export DH_VERBOSE=1
 # This is the debhelper compatibility version to use.
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
+	CXXFLAGS += -O0 -g3
+	CFLAGS += -O0 -g3
+	export CXXFLAGS CFLAGS
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
 
 # shared library versions, option 1
 #version=2.0.5