[SCM] BOINC packaging branch, master, updated. debian/6.4.5-1-22-gd70388d

rmayorga rmayorga at debian.org
Mon Jun 15 05:00:59 UTC 2009


The following commit has been merged in the master branch:
commit d70388dd2152566880172dd4a948147efe9c1919
Author: rmayorga <rmayorga at debian.org>
Date:   Sun Jun 14 22:59:33 2009 -0600

    Adding more indfo on README.source about dfsg things

diff --git a/debian/README.source b/debian/README.source
index 946dd59..42d24ae 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,11 +1,15 @@
-Modifications to the upstream source:
+Modifications to the upstream source
+====================================
  This package uses quilt to manage all modifications to the upstream
  source. Changes are stored in the source package as diffs in
  debian/patches and applied during the build.
 
  Refer to /usr/share/doc/quilt/README.source for details.
 
+
+
 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
@@ -16,15 +20,37 @@ Repackaged upstream source:
 
  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 Subversion repository:
+ available in our pkg-boinc Git repository:
 
-   http://svn.debian.org/wsvn/pkg-boinc/scripts/export-boinc?op=file
+http://git.debian.org/?p=pkg-boinc/scripts.git;a=blob_plain;f=export-boinc;hb=HEAD
 
  For example, to obtain the .orig.tar.gz tarball for BOINC version 5.8.17
  this script is invoked as:
 
    $ export-boinc -r 5.8.17
 
+This script will take care of remove the non-DFSG files from the upstream
+tag and produce the correct version using +dfsg prefix.
+
+
+
+Removed non-dfsg upstream files
+===============================
+The files removed from upstream tag are:
+
+client/mac
+clientgui/mac
+mac_build
+mac_installer
+win_build
+coprocs
+client/app_stats_mac.cpp
+
+
+
+
+Debian packaging VCS
+=====================
 Very recently, the management of the packaging has moved from subversion
 to a git repository. Again, the Wiki pages hold instructions and offer
 references for the current and future contributors - you?
diff --git a/debian/changelog b/debian/changelog
index 00645d2..eda8a30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
-boinc (6.4.5-2) unstable; urgency=low
+boinc (6.4.5+dfsg-2) unstable; urgency=low
 
   * Uploaded to unstable
   * Include a patch picked from Upstream SVN
      to avoid FTBFSs whith gcc 4.4 (Closes: #526666)
   * remove CUDA dir that contais binary-only non DFSG software
   * change section from boinc-dbg to debug
+  * set orig +dfsg since we remove non-dfsg software 
+    when we pull the tag from upstream
+    + Add Comments about this on README.Source
+  * Move schedtool to Recommends, (Closes: #532133)
+  * Add ru debconf templates translation, thanks
+    to Yuri Kozlov <yuray at komyakino.ru> (Closes: #531205)
 
  -- Rene Mayorga <rmayorga at debian.org>  Sat, 23 May 2009 13:29:17 -0600
 
diff --git a/debian/control b/debian/control
index b1a798d..a8f9630 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,8 @@ Package: boinc-client
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.3), adduser,
  lsb-base (>= 3.0-6), ca-certificates
-Suggests: boinc-app-seti, boinc-manager | kboincspy, schedtool 
+Suggests: boinc-app-seti, boinc-manager | kboincspy
+Recommends: schedtool
 Description: core client for the BOINC distributed computing infrastructure
  The Berkeley Open Infrastructure for Network Computing (BOINC) is a
  software platform for distributed computing: several initiatives of
diff --git a/debian/watch b/debian/watch
index 9d239b6..c3a69fd 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/_/\./g;s/\///" \
+opts="uversionmangle=s/_/\./g;s/\///;s/$/\+dfsg/" \
   http://boinc.berkeley.edu/svn/tags/boinc_core_release_(\d+_\d*[13579]_.*)

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list