[boinc] 01/01: Experimental again, update copyright and get-orig-source.sh tarball

Gianfranco Costamagna locutusofborg-guest at moszumanska.debian.org
Mon Aug 3 16:33:15 UTC 2015 

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository boinc.

commit 3e74f030bc8a7f65dd3537c0f57b30833f4fe0c1
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Aug 3 18:19:44 2015 +0200

    Experimental again, update copyright and get-orig-source.sh tarball
---
 debian/README.source                  | 57 ++++-------------------------------
 debian/changelog                      |  9 ++++++
 debian/copyright                      |  5 ---
 debian/get-orig-source.sh             |  2 ++
 debian/patches/Makefile_subdirs.patch | 20 ------------
 debian/patches/envargs.patch          |  3 ++
 6 files changed, 20 insertions(+), 76 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 33248a2..951b49c 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -27,42 +27,17 @@ 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 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.
- For more information see:
+ The BOINC project does distribute source code releases as tarballs,
+ but they contain non DFSG files.
 
-   http://boinc.berkeley.edu/trac/wiki/SourceCode
-
- We put the tarball generation into an 'export-boinc' script, 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
-
- 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.  Above process is integrated into debian/get-orig-source.sh target.
-
- This target can be easily called by running "uscan" in your source tree, the first
- time will download the "boinc-v2" git repository in your parent directory, while on the
- next runs will just perform a "git update" to retrieve new commits and new tags.
+ To update you can easily call  "uscan" in your source tree, that will call
+ automatically the get-orig-source.sh script, to remove unwanted files from
+ the source tree.
 
  The final tarball is put on the parent directory, and can be easily imported with
  git-import-orig ../boinc_VERSION+dfsg.orig.tar.gz
 
 
-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-atom1-dev
-
-
 Launcher icon sources
 ---------------------
 
@@ -108,24 +83,4 @@ source/include-binaries and boinc-manager.menu
 
 Removed non-dfsg upstream files
 ===============================
- The files removed from upstream tag are:
-
-   *.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
-   client/app_stats_mac.cpp
-   version.h
-   .gitignore
+ The files removed from upstream tag are listed in get-orig-source.sh file
diff --git a/debian/changelog b/debian/changelog
index 463db8a..1fa132a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+boinc (7.6.6+dfsg-3exp1) experimental; urgency=medium
+
+  * Upload to experimental again, with the boinc-server-* packages.
+  * d/get-orig-tarball.sh, remove some more Windows autogenerated files.
+  * d/copyright: update to reflect removed files.
+  * update README.source file.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Mon, 03 Aug 2015 18:19:11 +0200
+
 boinc (7.6.6+dfsg-3) unstable; urgency=medium
 
   * d/p/fix-underlinking.patch (Closes: #794107).
diff --git a/debian/copyright b/debian/copyright
index 28bcb69..fba816f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -339,15 +339,10 @@ License: MIT
 
 Files: html/user/openid_login.php
        samples/vboxwrapper/vboxwrapper.cpp
-       samples/vboxwrapper/cernvm/cernvmwrapper.cpp
 Copyright: 2008-2014 University of California
            2011 Daniel Lombraña González <teleyinex AT gmail DOT com>
 License: LGPL-3+
 
-Files: html/inc/kses.php
-Copyright: 2002, 2003 Ulf Harnhammar
-License: GPL-2+
-
 Files: html/inc/recaptchalib.php
 Copyright: 2007 reCAPTCHA -- http://recaptcha.net
 License: MIT
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
index 1419f1d..c556cea 100644
--- a/debian/get-orig-source.sh
+++ b/debian/get-orig-source.sh
@@ -72,6 +72,8 @@ rm -rfv ${ORIG_TARBALL_DIR}/samples/vboxwrapper/vboxwrapper_win.h
 rm -rfv ${ORIG_TARBALL_DIR}/samples/vboxwrapper/vboxwrapper_win.rc
 rm -rfv ${ORIG_TARBALL_DIR}/samples/wrapper/wrapper_win.h
 rm -rfv ${ORIG_TARBALL_DIR}/samples/wrapper/wrapper_win.rc
+rm -rfv ${ORIG_TARBALL_DIR}/samples/gfx_html/browser_win.h
+rm -rfv ${ORIG_TARBALL_DIR}/samples/gfx_html/browser_win.rc
 rm -rfv ${ORIG_TARBALL_DIR}/build
 # bzr stuff and debian directory aren't needed
 # if you use the same source tree for building the latest version
diff --git a/debian/patches/Makefile_subdirs.patch b/debian/patches/Makefile_subdirs.patch
deleted file mode 100644
index 201b86e..0000000
--- a/debian/patches/Makefile_subdirs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Frank Thomas
-Description: We do not build the screensaver.
-
-Index: boinc/Makefile.am
-===================================================================
---- boinc.orig/Makefile.am	2011-10-08 14:11:56.000000000 +0200
-+++ boinc/Makefile.am	2011-10-08 14:32:51.000000000 +0200
-@@ -22,9 +22,9 @@
- 
- if ENABLE_MANAGER
-    CLIENTGUI_SUBDIRS = clientgui clientgui/res locale
--if BUILD_X11_SCREENSAVER
--   CLIENTGUI_SUBDIRS += clientscr
--endif
-+#if BUILD_X11_SCREENSAVER
-+#   CLIENTGUI_SUBDIRS += clientscr
-+#endif
- endif
- 
- # ORDER MATTERS below.  One must build dependencies FIRST, then things
diff --git a/debian/patches/envargs.patch b/debian/patches/envargs.patch
index 78d659b..9aaf684 100644
--- a/debian/patches/envargs.patch
+++ b/debian/patches/envargs.patch
@@ -1,3 +1,6 @@
+Description:
+  Fix inconsistencies spot with research compiler (Debian bug ##747964).
+
 diff -urN a/zip/zip/util.c b/zip/zip/util.c
 --- a/zip/zip/util.c	2015-04-02 00:03:00.000000000 +0100
 +++ b/zip/zip/util.c	2015-04-02 00:04:10.000000000 +0100

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git

More information about the pkg-boinc-commits mailing list