From: Sebastian Harl <sh@tokkee.org>
Date: Wed, 17 Jun 2009 18:35:18 +0000 (+0200)
Subject: patches: Added CXXFLAGS.dpatch to remove -O3 from CXXFLAGS.
X-Git-Tag: pfstmo-1.4-1~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ba5a85c38e87660ff481f33304ac8329f924f5b2;p=pkg-pfstmo.git

patches: Added CXXFLAGS.dpatch to remove -O3 from CXXFLAGS.
---

diff --git a/debian/changelog b/debian/changelog
index 149b722..8e3372b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ pfstmo (1.4-1) unstable; urgency=low
     - Updated standards-version to 3.8.2 - no changes.
   * debian/rules:
     - Pass appropriate CFLAGS and CXXFLAGS to configure.
+  * debian/patches:
+    - Added CXXFLAGS.dpatch to remove -O3 from CXXFLAGS.
 
- -- Sebastian Harl <tokkee@debian.org>  Wed, 17 Jun 2009 19:36:23 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Wed, 17 Jun 2009 20:34:35 +0200
 
 pfstmo (1.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 3c1bee9..56148a0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: graphics
 Priority: optional
 Maintainer: Debian PhotoTools Maintainers <pkg-phototools-devel@lists.alioth.debian.org>
 Uploaders: Sebastian Harl <tokkee@debian.org>
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), autotools-dev, pkg-config, libpfs-dev, fftw3-dev, libgsl0-dev
+Build-Depends: debhelper (>= 5), dpatch, dpkg-dev (>= 1.14.6), autotools-dev, pkg-config, libpfs-dev, fftw3-dev, libgsl0-dev
 Standards-Version: 3.8.2
 Homepage: http://www.mpi-inf.mpg.de/resources/tmo/
 Vcs-Git: git://git.debian.org/git/pkg-phototools/pfstmo.git
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..cee4d00
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1,2 @@
+CXXFLAGS.dpatch
+
diff --git a/debian/patches/CXXFLAGS.dpatch b/debian/patches/CXXFLAGS.dpatch
new file mode 100755
index 0000000..aafb391
--- /dev/null
+++ b/debian/patches/CXXFLAGS.dpatch
@@ -0,0 +1,45 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## CXXFLAGS.dpatch by Sebastian Harl <tokkee@debian.org>
+##
+## DP: Remove -O3 from CXXFLAGS.
+
+@DPATCH@
+
+diff a/configure b/configure
+--- a/configure
++++ b/configure
+@@ -19378,8 +19378,6 @@ fi
+ # Check whether --enable-debug was given.
+ if test "${enable_debug+set}" = set; then
+   enableval=$enable_debug; if test "$enable_debug" = "yes" ; then
+-                     temp_CXXFLAGS=`echo $CXXFLAGS | sed "s/-O./ /; s/-g//"`
+-		     CXXFLAGS="-g $temp_CXXFLAGS"
+ 		     cat >>confdefs.h <<\_ACEOF
+ #define DEBUG 1
+ _ACEOF
+@@ -19387,8 +19385,6 @@ _ACEOF
+ 		  fi
+ else
+   enable_debug="no"
+-                     temp_CXXFLAGS=`echo $CXXFLAGS | sed "s/-O./ /; s/-g//"`
+-   	             CXXFLAGS="-O3 $temp_CXXFLAGS"
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define NDEBUG 1
+diff a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,13 +37,9 @@ AC_ARG_ENABLE(debug,
+ 		AC_HELP_STRING([--enable-debug],
+ 				 [Enable debug symbols and asserts]),
+ 		 [if test "$enable_debug" = "yes" ; then
+-                     temp_CXXFLAGS=`echo $CXXFLAGS | sed "s/-O./ /; s/-g//"`
+-		     CXXFLAGS="-g $temp_CXXFLAGS"
+ 		     AC_DEFINE([DEBUG])
+ 		  fi],
+                   [enable_debug="no"
+-                     temp_CXXFLAGS=`echo $CXXFLAGS | sed "s/-O./ /; s/-g//"`
+-   	             CXXFLAGS="-O3 $temp_CXXFLAGS"
+                      AC_DEFINE(NDEBUG, 1, [Disable assertion checks])
+ 
+ 
diff --git a/debian/rules b/debian/rules
index c8625e7..382daf7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,9 +22,15 @@ else
 	CXXFLAGS += -O2
 endif
 
-config.status: configure
+include /usr/share/dpatch/dpatch.make
+
+config.status: configure $(DPATCH_STAMPFN)
 	dh_testdir
 	
+	# do not rebuild the build system
+	touch aclocal.m4 acinclude.m4 configure.ac configure config.h.in \
+		config.status Makefile.am Makefile.in Makefile
+	
 	for file in config.guess config.sub; do \
 		if [ ! -e $$file.upstream ]; then \
 			mv $$file $$file.upstream; \
@@ -59,6 +65,8 @@ clean:
 		fi \
 	done
 	
+	$(MAKE) -f debian/rules unpatch
+	
 	dh_clean
 
 install: build