[SCM] BOINC packaging branch, master, updated. debian/7.0.27+dfsg-3-62-g2d68f9a

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 2d68f9a3591f410306b9d459c14b7908615c40dd
Author: Steffen Moeller <moeller at debian.org>
Date:   Sat Aug 11 01:28:03 2012 +0200

    Allowing for omission of boinc-server-maker package
    
    By uncommenting the package in debian/control, the
    build rules get notice. This prepares for build errors
    in 7.0.32 and 7.0.33 of the server part. It works
    find with 7.0.31.

diff --git a/debian/README.Debian b/debian/README.Debian
index 1718519..12003f3 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -9,3 +9,12 @@ be removed from the testing distribution.
 To have BOINC back in, and to help eliminate an older mysql dependency,
 this release now sees the OpenCL helper package for AMD/ATI removed.
 This is temporary, I very much hope.
+
+----
+
+Upstream at times performs changes to the boinc-client and the
+boinc-server at the same time. The clients set the pace for releases
+and hence sometimes the server package should better not be released.
+The preparation of the boinc-server-maker package is now made optional.
+Anybody commenting out the package in debian/control will have the
+package rebuilt for the client only.
diff --git a/debian/control b/debian/control
index fa1b77c..98eff45 100644
--- a/debian/control
+++ b/debian/control
@@ -224,27 +224,27 @@ Description: libraries for BOINC's scientific applications
  which utilizes the BOINC infrastructure.
 
 
-Package: boinc-server-maker
-Architecture: any
-Provides: boinc-server
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- python, python-mysqldb,
- mysql-server-5.0 | virtual-mysql-server, apache2 | httpd-cgi,
- php5, php5-cli, php5-mysql,
- tcsh, openssl (>= 0.9.8), adduser, libfcgi0ldbl
-Recommends: libapache2-mod-php5, php5-gd, uuid-runtime,
- boinc-cgi-stripchart
-Suggests: boinc-app-examples
-Description: BOINC server applications and data files
- The Berkeley Open Infrastructure for Network Computing (BOINC) is a
- software platform for distributed computing using volunteered computer
- resources. For every scientific problem its own distinct project-server
- must be provided. The users only run a common client with project-specific
- additions (if not self-compiled or available as a Linux distribution's
- package itself) being downloaded from the server.
- .
- This package contains the daemons and tools to create and run BOINC
- projects.
+#Package: boinc-server-maker
+#Architecture: any
+#Provides: boinc-server
+#Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
+# python, python-mysqldb,
+# mysql-server-5.0 | virtual-mysql-server, apache2 | httpd-cgi,
+# php5, php5-cli, php5-mysql,
+# tcsh, openssl (>= 0.9.8), adduser, libfcgi0ldbl
+#Recommends: libapache2-mod-php5, php5-gd, uuid-runtime,
+# boinc-cgi-stripchart
+#Suggests: boinc-app-examples
+#Description: BOINC server applications and data files
+# The Berkeley Open Infrastructure for Network Computing (BOINC) is a
+# software platform for distributed computing using volunteered computer
+# resources. For every scientific problem its own distinct project-server
+# must be provided. The users only run a common client with project-specific
+# additions (if not self-compiled or available as a Linux distribution's
+# package itself) being downloaded from the server.
+# .
+# This package contains the daemons and tools to create and run BOINC
+# projects.
 
 
 Package: boinc-app-examples
diff --git a/debian/rules b/debian/rules
index 9758584..cb1265d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -123,6 +123,12 @@ CXXFLAGS += $(DEB_OPT_FLAGS)
 CFLAGS_boinc-client := $(CFLAGS)
 CXXFLAGS_boinc-client := $(CXXFLAGS)
 
+ENABLE_SERVER_TEST := $(shell egrep '^Package:.*boinc-server-maker' debian/control)
+ENABLE_SERVER :=
+ifneq (,$(findstring clang,$(DEB_BUILD_OPTIONS)))
+ENABLE_SERVER :=--enable-server 
+endif
+
 # --disable-static
 # For debugging, these options are useful:
 #   --enable-debug
@@ -131,7 +137,7 @@ CFGFLAGS_boinc-client = \
   $(TYPE_FLAGS) \
   --prefix=/usr \
   --enable-client \
-  --enable-server \
+  $(ENABLE_SERVER) \
   --disable-fcgi \
   --enable-manager \
   --enable-libraries \
@@ -295,8 +301,10 @@ override_dh_auto_install: update-boinc-applinks.1
 		egrep -l "^#!.*env..*python" $$i/* | xargs -r sed -i '1s%#!.*%#!/usr/bin/python%' ; \
 	done
 	
-	# something for upstream to fix
-	-chmod +x $(CURDIR)/debian/boinc-server-maker/usr/share/boinc-server/sched/transitioner_catchup.php
+	# something for upstream to fix, optional, in case we do not build the server
+	if [ -d $(CURDIR)/debian/boinc-server-maker ]; then \
+	-chmod +x $(CURDIR)/debian/boinc-server-maker/usr/share/boinc-server/sched/transitioner_catchup.php ; \
+	fi
 	
 	touch $@
 
@@ -311,12 +319,14 @@ 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
-	cd debian/boinc-server-maker/usr/share/boinc-server/html/ops ; \
-	for i in *.php; do \
-		if head -n 1 "$$i" | grep -q "^#!"; then \
-			chmod 755 "$$i" ; \
-		fi ; \
-	done
+	if [ -d debian/boinc-server-maker/usr/share/boinc-server/html/ops ]; then \
+		cd debian/boinc-server-maker/usr/share/boinc-server/html/ops ; \
+		for i in *.php; do \
+			if head -n 1 "$$i" | grep -q "^#!"; then \
+				chmod 755 "$$i" ; \
+			fi ; \
+		done ; \
+	fi
 
 	# Correct catalog file perms
 	find debian -name "*.mo" -exec chmod 644   {} \;

-- 
BOINC packaging