[SCM] BOINC packaging branch, master, updated. debian/7.0.33+dfsg-1-20-g6f1f69c

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 6f1f69c2bc71024139b6a2862234e0dfa01671ff
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Fri Aug 24 22:26:30 2012 +0200

    Upload of 7.0.34+dfsg-2

diff --git a/debian/control.in b/debian/control.in
index 626178e..dcad090 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -64,7 +64,8 @@ Description: libraries of BOINC the client depends on
 Package: boinc-nvidia-cuda
 Architecture: amd64 i386
 Section: contrib/net
-Depends: ${misc:Depends}, boinc, libcuda1|nvidia-current, libcuda1-ia32 [amd64]|nvidia-current [amd64], ia32-libs [amd64]|nvidia-current [amd64]
+Depends: ${misc:Depends}, boinc, libcuda1|nvidia-current,
+Recommends: libcuda1-ia32 [amd64]|nvidia-current [amd64], ia32-libs [amd64]|nvidia-current [amd64]
 Description: metapackage for CUDA-savvy BOINC client and manager
  The Berkeley Open Infrastructure for Network Computing (BOINC) is a
  software platform for distributed computing: several initiatives of
@@ -202,10 +203,10 @@ Package: libboinc-app-dev
 Section: libdevel
 Architecture: all
 Depends: ${misc:Depends},
- libboinc7 (>= ${binary:Version}),
- libboinc7 (<< ${binary:Version}.1~),
- libboinc-app7 (>= ${binary:Version}),
- libboinc-app7 (<< ${binary:Version}.1~),
+ libboinc7 (>= ${source:Version}),
+ libboinc7 (<< ${source:Version}+1~),
+ libboinc-app7 (>= ${source:Version}),
+ libboinc-app7 (<< ${source:Version}+1~),
  libc6-dev | libc-dev,
  libstdc++6-4.3-dev | libstdc++-dev, libssl-dev, libmysqlclient-dev
 Conflicts: boinc-dev (<= 7.0.28+dfsg-2)
@@ -285,9 +286,7 @@ Package: boinc-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: boinc-client (= ${binary:Version}) | boinc-manager (= ${binary:Version})
- | libboinc7 (= ${binary:Version})
- | libboinc-app7 (= ${binary:Version}),
+Depends: boinc-client (= ${binary:Version}) | boinc-manager (= ${binary:Version}) | libboinc7 (= ${binary:Version}) | libboinc-app7 (= ${binary:Version}),
  ${misc:Depends}
 Suggests: libcurl3-dbg, libssl0.9.8-dbg, libwxgtk2.8-dbg
 Description: debugging symbols for BOINC binaries
diff --git a/debian/rules b/debian/rules
index d1ca61e..c5de7bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -158,7 +158,8 @@ CFGFLAGS_boinc-client = \
 # Default rule
 
 %:
-	if [ ! -f debian/control ]; then \
+	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 ; \
 		else \

-- 
BOINC packaging