[SCM] BOINC packaging branch, debian-folder-HEAD, updated. 75f9fc85ab450e24fb04c5cdaa00bbd7b27b0be1

[Steffen Moeller]

The following commit has been merged in the debian-folder-HEAD branch:
commit 75f9fc85ab450e24fb04c5cdaa00bbd7b27b0be1
Merge: 9689a74968bec3da272fb1bf856f63cbf641e0ad 34c45f40a878a8dbb1cd199a993fd5f393795002
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Sun Jan 6 20:28:14 2013 +0100

    Merge branch 'debian-folder-release' into debian-folder-HEAD

diff --combined debian/rules
index 2aaee28,bb6b685..a14a996
--- a/debian/rules
+++ b/debian/rules
@@@ -7,9 -7,6 +7,9 @@@
  #export  CC=/usr/lib/gcc-snapshot/bin/gcc
  #export CXX=/usr/lib/gcc-snapshot/bin/g++
  #export CPP=/usr/lib/gcc-snapshot/bin/cpp
 +export  CC=gcc-4.8
 +export CXX=g++-4.8
 +export CPP=cpp-4.8
  
  # Set default flags with dpkg-buildflags
  # -Wformat -Werror=format-security will need many fixes to avoid ftbfs,
@@@ -109,15 -106,10 +109,10 @@@ ifeq ($(DEB_HOST_GNU_TYPE), i486-gnu
  endif
  
  GCCVERSION=$(shell gcc --version | tr " " "\n" | egrep '^[0-9]+\.[0-9]+\.[0-9]+$$' | cut -f1,2 -d.)
- # gcc 4.6 on precise has issues while gcc 4.7 on sid is just fine
- ifneq (4.6,$(GCCVERSION))
- ifneq (4.5,$(GCCVERSION))
- ifneq (4.4,$(GCCVERSION))
-   CFLAGS += -flto
-   LDFLAGS += -flto
- endif
- endif
- endif
+ 
+ # Link-Time-Optimization
+ CFLAGS += -flto
+ LDFLAGS += -flto
  
  CFLAGS += -Wall
  CXXFLAGS += -Wall
@@@ -145,15 -137,6 +140,15 @@@ els
  TMP=$(shell egrep -v '^%' debian/control.in > debian/control)
  endif
  
 +ENABLE_CLIENT_TEST := $(shell egrep '^Package:.*boinc$$' debian/control.in)
 +ENABLE_CLIENT := --disable-client --disable-manager
 +ifneq (,$(ENABLE_CLIENT_TEST))
 +ENABLE_CLIENT := --enable-client --enable-manager --enable-dynamic-client-linkage
 +TMP=$(shell sed -i 's/^@//' debian/control)
 +else
 +TMP=$(shell sed -i '/^@/d' debian/control)
 +endif
 +
  # --disable-static
  # For debugging, these options are useful:
  #   --enable-debug
@@@ -161,14 -144,16 +156,14 @@@
  CFGFLAGS_boinc-client = \
    $(TYPE_FLAGS) \
    --prefix=/usr \
 -  --enable-client \
 +  $(ENABLE_CLIENT) \
    $(ENABLE_SERVER) \
    --disable-fcgi \
 -  --enable-manager \
    --enable-libraries \
    --enable-unicode \
    --enable-shared \
    --with-ssl \
    --with-x \
 -  --enable-dynamic-client-linkage \
    CFLAGS="$(CFLAGS_boinc-client)" \
    CXXFLAGS="$(CXXFLAGS_boinc-client)" \
    CPPFLAGS="$(CPPFLAGS)" \
@@@ -180,19 -165,11 +175,19 @@@
  %:
  	if [ ! -f debian/control -o debian/control.in -nt debian/control ]; then \
  		echo "Generating debian/control file from debian/control.in" ; \
 +		( \
  		if egrep -q '^Package:.*boinc-server-maker' debian/control.in; then \
 -			sed -e 's/^%//' debian/control.in > debian/control ; \
 +			sed -e 's/^%//' debian/control.in ; \
 +		else \
 +			egrep -v '^%' debian/control.in ; \
 +		fi \
 +		) | ( \
 +		if egrep -q '^Package:.*boinc$$' debian/control.in; then \
 +			sed -e 's/^@//' ; \
  		else \
 -			egrep -v '^%' debian/control.in > debian/control ; \
 -		fi ; \
 +			sed -e '/^@/d' ; \
 +		fi \
 +		) > debian/control; \
  	fi
  	dh $@ --parallel --with python2
  
@@@ -281,13 -258,13 +276,13 @@@ BINARIES += samples/worker/worker sampl
  	samples/atiopencl/atiopencl
  
  override_dh_auto_clean: 
 -	dh_auto_clean
 -	$(MAKE) -C samples/sleeper distclean
 +	-dh_auto_clean
 +	-$(MAKE) -C samples/sleeper distclean
  	# fail on unpatched source
  	# $(MAKE) -C samples/worker distclean
  	rm -rf samples/worker/worker samples/worker/worker.o
 -	$(MAKE) -C samples/example_app distclean
 -	$(MAKE) -C samples/wrapper distclean
 +	-$(MAKE) -C samples/example_app distclean || $(MAKE) -C samples/example_app clean
 +	-$(MAKE) -C samples/wrapper distclean || $(MAKE) -C samples/wrapper clean
  	find . -name Makefile.in -o -name "*.a" -o -name "*.o" | xargs -r rm
  	find . -name "Makefile" | grep -v samples | xargs -r rm
  	rm -f configure clientscr/boincscr
@@@ -357,6 -334,7 +352,6 @@@ endi
  	do \
  		egrep -l "^#!.*env..*python" $$i/* | xargs -r sed -i '1s%#!.*%#!/usr/bin/python%' ; \
  	done
 -#	-chmod +x $(CURDIR)/debian/boinc-server-maker/usr/share/boinc-server/sched/transitioner_catchup.php ; \
  
  override_dh_install:
  	# boinc apps are built only together with the server
@@@ -368,8 -346,7 +363,8 @@@
  	find $(CURDIR)/debian -name "*.la" | xargs -r rm -f
  
  override_dh_strip:
 -	dh_strip -a --dbg-package=boinc-dbg
 +	[ -d debian/boinc-dbg ] && dh_strip -a --no-package=-boinc-server-dbg --no-package=boinc-server-maker --no-package=boinc-app-examples --dbg-package=boinc-dbg
 +	[ -d debian/boinc-server-dbg ] && dh_strip -a -Nboinc -Nlibboinc7 -Nboinc-nvidia-cuda -Nboinc-amd-opencl -Nboinc-client -Nboinc-manager -Nboinc-dev -Nlibboinc-app-dev -Nlibboinc-app7 -Nboinc-cgi-stripchart --no-package=boinc-dbg --dbg-package=boinc-server-dbg
  
  override_dh_installchangelogs:
  	dh_installchangelogs -k checkin_notes
@@@ -379,9 -356,8 +374,9 @@@ override_dh_fixperms
  	# some files are not right with 755
  	find debian -name "*.php" -o -name "*.php.example" -o -name "*.cpp" | grep -v "update_translations.php" | grep -v "transitioner_catchup.php" | xargs -L 1 -r chmod 644 --
  	# some other files are indeed to be executed via the command line
 -	if [ -d debian/boinc-server-maker/usr/share/boinc-server/html/ops ]; then \
 -		cd debian/boinc-server-maker/usr/share/boinc-server/html/ops ; \
 +	opsdir=debian/boinc-server-maker/usr/share/boinc-server-maker/html/ops ; \
 +	if [ -d "$$opsdir" ]; then \
 +		cd "$$opsdir" ; \
  		for i in *.php; do \
  			if head -n 1 "$$i" | grep -q "^#!"; then \
  				chmod 755 "$$i" ; \

-- 
BOINC packaging