[SCM] BOINC packaging branch, master, updated. upstream/7.0.27+dfsg-441-g8874d9d

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 8874d9d58bac7b5c54d05a1e5fbc2ca25a157a29
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Sat May 19 12:08:39 2012 +0200

    Removing nvidia preparation package
    
    Debian does not allow the package into testing with that is
    dependencing on the non-functional-with-latest-version-of-X fglrx
    drivers.

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..d7e1aad
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,11 @@
+The package provides two virtial packages that help with package
+dependencies to support the employment of graphics cards with the
+computations. For NVidia this is fine, but the AMD/ATI fglrx drivers
+are regularly incompatible with the latest releases of X. At
+the very moment the release team has hence decided to remove those
+and all source packages that depend with a binary on them, to
+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 remporary, I very much hope.
diff --git a/debian/control b/debian/control
index 7885be2..566c2f1 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 7.0.50~), po-debconf, dh-buildinfo, pkg-config (>=
  libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libnotify-dev (>= 0.7.0),
  freeglut3-dev, libwxgtk2.8-dev, libgtk2.0-dev,
  libsqlite3-dev, libmysqlclient-dev, python, libfcgi-dev, libjpeg-dev,
+ libxcb-util0-dev,
  libxss-dev
 Homepage: http://boinc.berkeley.edu/
 Vcs-Git: git://git.debian.org/git/pkg-boinc/boinc.git
@@ -56,29 +57,30 @@ Description: metapackage for CUDA-savvy BOINC client and manager
  section to the regular boinc package. This also meant this binary
  package to be redistributed in the contrib section of Debian.
 
-
-Package: boinc-amd-opencl
-Architecture: amd64 i386
-Section: contrib/net
-Depends: ${misc:Depends}, boinc, fglrx-driver, amd-libopencl1
-Description: metapackage for AMD/ATI OpenCL-savvy BOINC client and manager
- The Berkeley Open Infrastructure for Network Computing (BOINC) is a
- software platform for distributed computing: several initiatives of
- various scientific disciplines all compete for the idle time of
- desktop computers. The developers' web site at the University of
- Berkeley serves as a common portal to the otherwise independently run
- projects.
- .
- Regular users (rightously) often find it an unbearable nuissance to
- care for the configuration of BOINC for the OpenCL-savvy AMD/ATI
- graphics cards.  This package adds a series of dependencies from the
- non-free section to the regular boinc package. This also meant this
- binary package to be redistributed in the contrib section of Debian.
- .
- This package is not perfect, yet. A major problem for the moment
- is the availability of the OpenCL driver for 32bit binaries for
- amd64. If this is planned, install the amd-app package provided
- through the AMD developer forum.
+# Removed until fglrx is back in testing
+#
+#Package: boinc-amd-opencl
+#Architecture: amd64 i386
+#Section: contrib/net
+#Depends: ${misc:Depends}, boinc, fglrx-driver, amd-libopencl1
+#Description: metapackage for AMD/ATI OpenCL-savvy BOINC client and manager
+# The Berkeley Open Infrastructure for Network Computing (BOINC) is a
+# software platform for distributed computing: several initiatives of
+# various scientific disciplines all compete for the idle time of
+# desktop computers. The developers' web site at the University of
+# Berkeley serves as a common portal to the otherwise independently run
+# projects.
+# .
+# Regular users (rightously) often find it an unbearable nuissance to
+# care for the configuration of BOINC for the OpenCL-savvy AMD/ATI
+# graphics cards.  This package adds a series of dependencies from the
+# non-free section to the regular boinc package. This also meant this
+# binary package to be redistributed in the contrib section of Debian.
+# .
+# This package is not perfect, yet. A major problem for the moment
+# is the availability of the OpenCL driver for 32bit binaries for
+# amd64. If this is planned, install the amd-app package provided
+# through the AMD developer forum.
 
 
 Package: boinc-client
diff --git a/debian/rules b/debian/rules
index dfef31e..9ea5ef1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -119,6 +119,7 @@ CXXFLAGS += $(DEB_OPT_FLAGS)
 CFLAGS_boinc-client := $(CFLAGS)
 CXXFLAGS_boinc-client := $(CXXFLAGS)
 
+# --enable-debug
 CFGFLAGS_boinc-client = \
   $(TYPE_FLAGS) \
   --prefix=/usr \
@@ -232,6 +233,7 @@ override_dh_auto_clean:
 	rm -f lib/crypt_prog test/run notices/feeds.xml
 	find test -name "run-*" | xargs -r rm -rf
 	rm -f $(BINARIES)
+	rm -fr debian/boinc-amd-opencl # for cases when this is not in debian/control
 	rm -f \
 	  lockfile \
 	  doc/manpages/*.1 \

-- 
BOINC packaging