[med-svn] r454 - in trunk/packages/proda/trunk/debian: . patches

[hanska-guest at alioth.debian.org]

Author: hanska-guest
Date: 2007-09-30 08:09:25 +0000 (Sun, 30 Sep 2007)
New Revision: 454

Added:
   trunk/packages/proda/trunk/debian/patches/02-fix_CXXFLAGS.dpatch
Removed:
   trunk/packages/proda/trunk/debian/patches/02-disable_debug_flags.dpatch
Modified:
   trunk/packages/proda/trunk/debian/changelog
   trunk/packages/proda/trunk/debian/patches/00list
   trunk/packages/proda/trunk/debian/rules
Log:
CXXFLAGS are no more hardcoded into Makefile


Modified: trunk/packages/proda/trunk/debian/changelog
===================================================================
--- trunk/packages/proda/trunk/debian/changelog	2007-09-29 14:32:30 UTC (rev 453)
+++ trunk/packages/proda/trunk/debian/changelog	2007-09-30 08:09:25 UTC (rev 454)
@@ -1,11 +1,11 @@
-proda (1.0-3) UNRELEASED; urgency=low
+proda (1.0-3) unstable; urgency=low
 
   [ Charles Plessy ]
   * Moved the Homepage: field out from the package's description.
 
   [ David Paleino ]
-  * Debug flags removed from Makefile - now the binary is much more
-    lightweight ;) (debian/patches/02-disable_debug_flags.dpatch added)
+  * CXXFLAGS are no more hardcoded into the Makefile (added
+    debian/patches/02-fix_CXXFLAGS.dpatch)
   * debian/control: removing dependencies for manpage generation - it is
     static now (there's no point in building always the same manpage on
     different archs)
@@ -13,7 +13,7 @@
   * debian/manpage.xml removed
   * debian/rules edited to reflect the changes above
 
- -- David Paleino <d.paleino at gmail.com>  Sat, 29 Sep 2007 16:24:53 +0200
+ -- David Paleino <d.paleino at gmail.com>  Sun, 30 Sep 2007 12:04:09 +0200
 
 proda (1.0-2) unstable; urgency=low
 

Modified: trunk/packages/proda/trunk/debian/patches/00list
===================================================================
--- trunk/packages/proda/trunk/debian/patches/00list	2007-09-29 14:32:30 UTC (rev 453)
+++ trunk/packages/proda/trunk/debian/patches/00list	2007-09-30 08:09:25 UTC (rev 454)
@@ -1,2 +1,2 @@
 01-fix_gcc4.3_warnings.dpatch
-02-disable_debug_flags.dpatch
+02-fix_CXXFLAGS.dpatch

Deleted: trunk/packages/proda/trunk/debian/patches/02-disable_debug_flags.dpatch
===================================================================
--- trunk/packages/proda/trunk/debian/patches/02-disable_debug_flags.dpatch	2007-09-29 14:32:30 UTC (rev 453)
+++ trunk/packages/proda/trunk/debian/patches/02-disable_debug_flags.dpatch	2007-09-30 08:09:25 UTC (rev 454)
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02-disable_debug_flags.dpatch by David Paleino <d.paleino at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad proda-1.0~/Makefile proda-1.0/Makefile
---- proda-1.0~/Makefile	2007-09-29 16:13:18.000000000 +0200
-+++ proda-1.0/Makefile	2007-09-29 16:17:37.000000000 +0200
-@@ -18,14 +18,14 @@
- OTHERFLAGS = -DVERSION="\"1.00\""
- 
- # debug mode    
--CXXFLAGS = -g -W -Wall -pedantic $(OTHERFLAGS)
-+#CXXFLAGS = -g -W -Wall -pedantic $(OTHERFLAGS)
- 
- # profile mode
- #CXXFLAGS = -pg -W -Wall -pedantic $(OTHERFLAGS)
- 
- # release mode
- #CXXFLAGS = -O3 -W -Wall -pedantic -DNDEBUG $(OTHERFLAGS) -mmmx -msse -msse2 -mfpmath=sse -march=pentium4 -mcpu=pentium4 -funroll-loops -fomit-frame-pointer 
--#CXXFLAGS = -O3 -W -Wall -pedantic -DNDEBUG $(OTHERFLAGS) -funroll-loops 
-+CXXFLAGS = -O2 -W -Wall -pedantic -DNDEBUG $(OTHERFLAGS) -funroll-loops
- 
- ################################################################################
- # 3) Dependencies

Added: trunk/packages/proda/trunk/debian/patches/02-fix_CXXFLAGS.dpatch
===================================================================
--- trunk/packages/proda/trunk/debian/patches/02-fix_CXXFLAGS.dpatch	                        (rev 0)
+++ trunk/packages/proda/trunk/debian/patches/02-fix_CXXFLAGS.dpatch	2007-09-30 08:09:25 UTC (rev 454)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02-fix_CXXFLAGS.dpatch by David Paleino <d.paleino at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad proda-1.0~/Makefile proda-1.0/Makefile
+--- proda-1.0~/Makefile	2007-09-29 17:01:00.000000000 +0200
++++ proda-1.0/Makefile	2007-09-30 12:06:42.000000000 +0200
+@@ -17,8 +17,10 @@
+ 
+ OTHERFLAGS = -DVERSION="\"1.00\""
+ 
++CXXFLAGS="$(CXXFLAGS) $(OTHERFLAGS)"
++
+ # debug mode    
+-CXXFLAGS = -g -W -Wall -pedantic $(OTHERFLAGS)
++#CXXFLAGS = -g -W -Wall -pedantic $(OTHERFLAGS)
+ 
+ # profile mode
+ #CXXFLAGS = -pg -W -Wall -pedantic $(OTHERFLAGS)


Property changes on: trunk/packages/proda/trunk/debian/patches/02-fix_CXXFLAGS.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/proda/trunk/debian/rules
===================================================================
--- trunk/packages/proda/trunk/debian/rules	2007-09-29 14:32:30 UTC (rev 453)
+++ trunk/packages/proda/trunk/debian/rules	2007-09-30 08:09:25 UTC (rev 454)
@@ -3,12 +3,12 @@
 
 #export DH_VERBOSE=1
 
-CFLAGS = -Wall -g
+CXXFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
+	CXXFLAGS += -O0
 else
-	CFLAGS += -O2
+	CXXFLAGS += -O2
 endif
 
 patch: patch-stamp
@@ -23,7 +23,7 @@
 build: patch build-stamp
 build-stamp:
 	dh_testdir
-	$(MAKE)
+	$(MAKE) CXXFLAGS="$(CXXFLAGS)"
 	touch $@
 
 clean: unpatch