r6744 - in /vdr/vdr/trunk/debian: changelog patches/81_Make_config.dpatch rules vdrdbg-buildpackage

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Sun Apr 13 12:43:38 2008
New Revision: 6744

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6744
Log:
* Made Make.config handle DEB_BUILD_OPTIONS=noopt, so all plugins including
  Make.config in their Makefile will inherently suppport noopt as well 
  (see also Debian Policy 3.7.3.0 section 10.1)

Modified:
    vdr/vdr/trunk/debian/changelog
    vdr/vdr/trunk/debian/patches/81_Make_config.dpatch
    vdr/vdr/trunk/debian/rules
    vdr/vdr/trunk/debian/vdrdbg-buildpackage

Modified: vdr/vdr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/changelog?rev=6744&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/changelog (original)
+++ vdr/vdr/trunk/debian/changelog Sun Apr 13 12:43:38 2008
@@ -12,6 +12,9 @@
     because of the missing -fPIC. Plugins, that require special compiler
     arguments, should from now on pass CXXFLAGS as an arguemtn to the make call
     in debian/rules. (closes: #475710)
+  * Made Make.config handle DEB_BUILD_OPTIONS=noopt, so all plugins including
+    Make.config in their Makefile will inherently suppport noopt as well 
+    (see also Debian Policy 3.7.3.0 section 10.1)
   * Added caching to plugin-loader.sh to speed up the initial startup of vdr
     (Patch provided by Michael Burian <michael.burian at sbg.at>)
 

Modified: vdr/vdr/trunk/debian/patches/81_Make_config.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/81_Make_config.dpatch?rev=6744&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/81_Make_config.dpatch (original)
+++ vdr/vdr/trunk/debian/patches/81_Make_config.dpatch Sun Apr 13 12:43:38 2008
@@ -8,8 +8,8 @@
 @DPATCH@
 diff -urNad vdr-1.6.0~/Make.config vdr-1.6.0/Make.config
 --- vdr-1.6.0~/Make.config	1970-01-01 01:00:00.000000000 +0100
-+++ vdr-1.6.0/Make.config	2008-04-12 21:40:20.000000000 +0200
-@@ -0,0 +1,22 @@
++++ vdr-1.6.0/Make.config	2008-04-13 12:11:55.000000000 +0200
+@@ -0,0 +1,28 @@
 +#
 +# The following compiler settings are requiered for Debian builds and will be
 +# included by the Makefile of VDR and most plug-ins.
@@ -18,17 +18,23 @@
 +CFLAGS   = -g -Wall
 +CXXFLAGS = -g -Wall -Woverloaded-virtual -Wno-parentheses
 +
-+ifndef VDRDEBUG
++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 +    CXXFLAGS += -O2
 +    CFLAGS += -O2
 +else
-+    # No Optimization for debug builds
 +    CXXFLAGS += -O0
 +    CFLAGS += -O0
-+    DEFINES += -DVDRDEBUG
 +endif
 +
 +ifndef BUILDVDR
 +    # Requiered for plug-ins only, not for VDR itself
 +    CXXFLAGS += -fPIC
++    CFLAGS += -fPIC
 +endif
++
++ifdef VDRDEBUG
++    # Required for special debug build of VDR, where plugins are 
++    # not unloaded at runtime to give valgrind a chance to detect
++    # memory leaks in the plugin libs
++    DEFINES += -DVDRDEBUG
++endif

Modified: vdr/vdr/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/rules?rev=6744&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/rules (original)
+++ vdr/vdr/trunk/debian/rules Sun Apr 13 12:43:38 2008
@@ -44,7 +44,7 @@
 
 	# build unoptimized vdr with debugging symbols
 	touch po/vdr.pot po/*.po
-	$(MAKE) all $(MAKE_OPTIONS) BUILDVDR=yes VDRDEBUG=yes
+	$(MAKE) all $(MAKE_OPTIONS) BUILDVDR=yes VDRDEBUG=yes DEB_BUILD_OPTIONS=nostrip,noopt
 	cp vdr vdr-dbg
 	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
 

Modified: vdr/vdr/trunk/debian/vdrdbg-buildpackage
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/vdrdbg-buildpackage?rev=6744&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/vdrdbg-buildpackage (original)
+++ vdr/vdr/trunk/debian/vdrdbg-buildpackage Sun Apr 13 12:43:38 2008
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-export DEB_BUILD_OPTIONS="$DEB_BUILD_OPTIONS nostrip"
+export DEB_BUILD_OPTIONS="$DEB_BUILD_OPTIONS noopt nostrip"
 export VDRDEBUG=yes
 dpkg-buildpackage $*