[SCM] BOINC packaging branch, master, updated. upstream/7.0.46+dfsg-637-g7bd3c44

Tue Jan 29 23:15:58 UTC 2013

The following commit has been merged in the master branch:
commit 7bd3c4433bb2ce889cba2963d7b2f0c90ea3c672
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Jan 30 00:15:34 2013 +0100

    Merge with debian-folder-release

diff --git a/debian/README.Debian b/debian/README.Debian
index 12003f3..1e064b8 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,20 +1,31 @@
-The package provides two virtual 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.
+BOINC for Debian and Ubuntu
+===========================
 
-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.
+Debian and Ubuntu developers maintain the BOINC packages together
+on the pkg-boinc alioth.debian.org project. You may be interested
+to hear
 
-----
+ * There is a 'boinc' source package for regular clients. Additionally,
+   a 'boinc-experimental' source package provides the very latest
+   developments.
 
-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.
+   The motivation for the redundancy is because of Upstream developing
+   the BOINC client and server code asynchronously. The packaging code
+   is mostly shared between the two.
+
+ * The package provides two virtual packages to 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 temporary, I very much hope.
+
+ * For our own motivation, and also for us maintainers communicating with
+   upstream to help them recognize how important the Debian/Ubuntu
+   packaging is for BOINC, please consider to install the
+   popularity-contest package.
diff --git a/debian/README.source b/debian/README.source
index fe2015e..7239173 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -28,57 +28,60 @@ QUILT_NO_DIFF_TIMESTAMPS=1
 Repackaged upstream source:
 ===========================
  The BOINC project does not distribute source code releases as tarballs,
- but they are tagged in the BOINC Subversion repository.  Anonymous
- Subversion access is available at http://boinc.berkeley.edu/svn/. The
- branch for the BOINC source is trunk/boinc, tagged releases are in tags/.
- For more information see:
+ but they are tagged in the BOINC Git repository.  Anonymous Git access
+ is explained on http://boinc.berkeley.edu/trac/wiki/SourceCodeGit .
+ The 'boinc' source package refers to the respective release tags.
+ The 'boinc-experimental' source package uses the commit of a particular
+ day.  For more information see:
 
    http://boinc.berkeley.edu/trac/wiki/SourceCode
 
- To obtain the source from Subversion and package it as .orig.tar.gz the
- Debian BOINC Maintainers use a script called 'export-boinc' which is
- available in our pkg-boinc Git repository:
+ Upstream's change to Git has hit us unprepared. Our traditional approach 
+ was to check everything out and then prepare a tarball from it. We have
+ put that approach into the script 'export-boinc' which is available in
+ our pkg-boinc Git repository:
 
    wget -O export-boinc \
     "http://git.debian.org/?p=pkg-boinc/scripts.git;a=blob_plain;f=export-boinc;hb=HEAD"
    chmod 755 export-boinc
 
- The latest tags upstream presents at http://boinc.berkeley.edu/svn/tags/ .
- Choose 'the right one' of those.  To obtain the .orig.tar.gz
- tarball for BOINC tag 6_10_58 this script is invoked as:
-
-   $ ./export-boinc -r 6.10.58
-
  It will take a considerable while to download as the final tarball yields >15MB.
  The script will take care of remove the non-DFSG files from the upstream
- tag.
+ tag.  Above process is integrated into debian/rules's get-orig-source target.
 
- Above process is integrated into debian/rules's get-orig-source target. It will
- download the very latest version unless an environment variable VERSION was set:
-   $ VERSION=6.10.58 ./debian/rules get-orig-source
+ Since the advent of git there should be better ways, also for an improved
+ communication with upstream. We are still experimenting.
 
 
 Screen saver
 ------------
 
-No screen saver is built, disabled in the patch
-debian/patches/Makefile_subdirs.patch, which also allowed for the
-removal of the build dependencies
- libxcb-util0-dev|libxcb-atom1-dev
-
-
+ No screen saver is built, disabled in the patch
+ debian/patches/Makefile_subdirs.patch, which also allowed for the
+ removal of the build dependencies
+ libxcb-atom1-dev
 
 
 Removed non-dfsg upstream files
 ===============================
  The files removed from upstream tag are:
 
-   client/mac
-   clientgui/mac
+   *.dll
+   *.exe
+   samples/example_app/bin
+   api/ttf
+   api/ttfont.{cpp,h}
+   samples/glut
+   zip/configure
+   lib/mac
+   curl
+   samples/jpeglib
+   .vimrc
+   coprocs
+   win_build
    mac_build
+   clientgui/mac
    mac_installer
-   win_build
-   coprocs
    client/app_stats_mac.cpp
-
-
+   version.h
+   .gitignore

-- 
BOINC packaging

