[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-146-gec3887f

[Steffen Moeller]

The following commit has been merged in the master branch:
commit f37339e60d0d9cb9b1862c140a3987c20c63cebc
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jan 2 00:12:23 2011 +0100

    Worked more towards lintian cleanliness.

diff --git a/debian/changelog b/debian/changelog
index 516220c..073ffe4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+boinc (6.12.8+dfsg-3) experimental; urgency=low
+
+  * Reworked the boinc-server.links
+  * More towards lintian cleanliness
+
+ -- Steffen Moeller <moeller at debian.org>  Sat, 01 Jan 2011 17:56:15 +0100
+
 boinc (6.12.8+dfsg-2) experimental; urgency=low
 
   * Developing the Server package further.
diff --git a/debian/control b/debian/control
index 45633e1..8c7259f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Steffen Moeller <moeller at debian.org>,
  Daniel Hahler <ubuntu at thequod.de>
 DM-Upload-Allowed: yes
 Standards-Version: 3.9.1.0
-Build-Depends: debhelper (>= 7.0.17ubuntu2), po-debconf, dh-buildinfo,
+Build-Depends: debhelper (>= 7.0.50~), po-debconf, dh-buildinfo,
  docbook2x, docbook-xml, autotools-dev, automake1.9 (>= 1.9.3),
  autoconf (>= 2.59), libxml2-utils, gettext, zlib1g-dev, libssl-dev,
  libcurl4-openssl-dev (>= 7.17.1), freeglut3-dev, libsm-dev, libice-dev,
@@ -100,9 +100,8 @@ Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-mysqldb,
  mysql-server-5.0 | virtual-mysql-server, apache2 | httpd-cgi, php5, php5-cli,
- php5-mysql, tcsh | c-shell, openssl (>= 0.9.8)
+ php5-mysql, tcsh | c-shell, openssl (>= 0.9.8), adduser
 Recommends: libapache2-mod-php5, php5-gd
-Suggests: coreutils
 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
diff --git a/debian/rules b/debian/rules
index 96acd23..66fd0c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -137,7 +137,19 @@ override_dh_auto_configure:
 update-boinc-applinks.1: debian/manpages/update-boinc-applinks.xml
 	docbook2x-man debian/manpages/update-boinc-applinks.xml
 
-build:	build-stamp
+
+samples/sleeper/sleeper: build-stamp samples/sleeper/sleeper.cpp
+	$(MAKE) -C samples/sleeper
+samples/worker/worker: build-stamp samples/worker/worker.cpp
+	$(MAKE) -C samples/worker
+samples/example_app/uc2: build-stamp samples/example_app/uc2.cpp
+	$(MAKE) -C samples/example_app
+samples/wrapper/wrapper: build-stamp samples/wrapper/wrapper.cpp
+	$(MAKE) -C samples/wrapper
+
+SAMPLES=samples/sleeper/sleeper samples/worker/worker samples/example_app/uc2 samples/wrapper/wrapper
+
+build:	build-stamp $(SAMPLES)
 build-stamp:
 	dh build --parallel
 	touch $@
@@ -251,7 +263,7 @@ override_dh_installchangelogs:
 override_dh_fixperms:
 	dh_fixperms
 	# some files are not right with 755, some are, this needs furhter investigations
-	find debian -name "*.php" -o -name "*.php.example" | grep -v "update_translations.php" | xargs -L 1 -r chmod 644 --
+	find debian -name "*.php" -o -name "*.php.example" -o -name "*.cpp" | grep -v "update_translations.php" | xargs -L 1 -r chmod 644 --
 	# Correct catalog file perms
 	find debian -name "*.mo" -exec chmod 644   {} \;
 	chmod 755 \
@@ -259,7 +271,7 @@ override_dh_fixperms:
 	  debian/boinc-client/usr/share/bug/boinc-client/script \
 	  debian/boinc-manager/usr/share/doc/boinc-manager/examples/run-boincmgr
 
-override_dh_install:
+override_dh_install: $(SAMPLES)
 	dh_install
 	rm -rf debian/boinc-manager/usr/share/locale/en_US/
 	# delete empty dirs

-- 
BOINC packaging