[SCM] BOINC packaging branch, clean_with_debian, updated. client_release_7.0.20-830-ge3f5f8e

[Steffen Moeller]

The following commit has been merged in the clean_with_debian branch:
commit ddad1d99a049e7470288858bca5678b5e5f2cb25
Merge: dd0947a0b98a723ac0a73cb71f1e842377f803e8 f5530c9b5dd8d0ff4ac72992d2cc845ee56683ee
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Fri Jan 4 01:36:13 2013 +0100

    Merge branch 'debian-folder-HEAD' into clean_with_debian
    
    Conflicts:
    	debian/changelog
    	debian/rules

diff --combined debian/changelog
index 295a6e6,d1aefe8..2ae18b4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +boinc-trunk (7.0.42+trunk+dfsg-1) experimental; urgency=low
++=======
+ boinc-trunk (7.0.42+master+20130101+dfsg-1) experimental; urgency=low
++>>>>>>> debian-folder-HEAD
  
    * Initial release of server packages from the BOINC trunk
      - debian/control.in may be told to prepare also other packages
diff --combined debian/rules
index afff70a,2aaee28..9b2f69d
--- a/debian/rules
+++ b/debian/rules
@@@ -7,9 -7,9 +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
 +#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,
@@@ -110,8 -110,14 +110,8 @@@ endi
  
  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
 +CFLAGS += -flto
 +LDFLAGS += -flto
  
  CFLAGS += -Wall
  CXXFLAGS += -Wall
@@@ -140,9 -146,9 +140,15 @@@ TMP=$(shell egrep -v '^%' debian/contro
  endif
  
  ENABLE_CLIENT_TEST := $(shell egrep '^Package:.*boinc$$' debian/control.in)
++<<<<<<< HEAD
 +ENABLE_CLIENT := --disable-client
 +ifneq (,$(ENABLE_CLIENT_TEST))
 +ENABLE_SERVER := --enable-client
++=======
+ ENABLE_CLIENT := --disable-client --disable-manager
+ ifneq (,$(ENABLE_CLIENT_TEST))
+ ENABLE_CLIENT := --enable-client --enable-manager --enable-dynamic-client-linkage
++>>>>>>> debian-folder-HEAD
  TMP=$(shell sed -i 's/^@//' debian/control)
  else
  TMP=$(shell sed -i '/^@/d' debian/control)
@@@ -158,13 -164,11 +164,11 @@@ CFGFLAGS_boinc-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)" \
@@@ -178,15 -182,15 +182,25 @@@
  		echo "Generating debian/control file from debian/control.in" ; \
  		( \
  		if egrep -q '^Package:.*boinc-server-maker' debian/control.in; then \
++<<<<<<< HEAD
 +			sed -e 's/^%//' debian/control.in | grep -v '^@'> debian/control ; \
 +		else \
 +			egrep -v '^%' debian/control.in | grep -v '^@'> debian/control ; \
++=======
+ 			sed -e 's/^%//' debian/control.in ; \
+ 		else \
+ 			egrep -v '^%' debian/control.in ; \
++>>>>>>> debian-folder-HEAD
  		fi \
  		) | ( \
  		if egrep -q '^Package:.*boinc$$' debian/control.in; then \
  			sed -e 's/^@//' ; \
  		else \
++<<<<<<< HEAD
 +			egrep -v '^@' ; \
++=======
+ 			sed -e '/^@/d' ; \
++>>>>>>> debian-folder-HEAD
  		fi \
  		) > debian/control; \
  	fi
@@@ -364,8 -368,8 +378,13 @@@ override_dh_install
  	find $(CURDIR)/debian -name "*.la" | xargs -r rm -f
  
  override_dh_strip:
++<<<<<<< HEAD
 +	[ -d boinc-dbg ] && dh_strip -a -Nboinc-server-dbg -Nboinc-server-maker -Nboinc-app-examples --dbg-package=boinc-dbg
 +	[ -d boinc-server-dbg ] && dh_strip -a -Nboinc-dbg -Pboinc-server-maker -Pboinc-app-examples --dbg-package=boinc-server-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
++>>>>>>> debian-folder-HEAD
  
  override_dh_installchangelogs:
  	dh_installchangelogs -k checkin_notes

-- 
BOINC packaging