[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 e115bed70644ee25ff971272ce22bade88d5b255
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Fri Jan 4 01:39:45 2013 +0100

    Merged.

diff --git a/debian/changelog b/debian/changelog
index 2ae18b4..d1aefe8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,4 @@
-<<<<<<< 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 --git a/debian/rules b/debian/rules
index 9b2f69d..7f42c0a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -140,15 +140,9 @@ TMP=$(shell egrep -v '^%' debian/control.in > debian/control)
 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)
@@ -182,25 +176,15 @@ CFGFLAGS_boinc-client = \
 		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
@@ -378,13 +362,8 @@ 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