[SCM] pkg-boinc scripts branch, master, updated. 60de93215e82570f5142d32c8bf0d26caee68d44

Gianfranco Costamagna costamagnagianfranco at yahoo.it
Wed Jun 5 10:18:18 UTC 2013


The following commit has been merged in the master branch:
commit 60de93215e82570f5142d32c8bf0d26caee68d44
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Jun 5 12:17:52 2013 +0200

    Better export script, workarounded git bug in archive module

diff --git a/export-boinc b/export-boinc
index 0329390..56862e9 100755
--- a/export-boinc
+++ b/export-boinc
@@ -139,14 +139,16 @@ fi
 # Remove non-free or unneeded sources or cruft from the upstream source
 # code before creating the tarball.
 
-cat > .gitattributes <<EOATTRIBUTES
+# Directories to exclude should have the "/" at the end, for this bug
+# https://bugs.launchpad.net/ubuntu/+source/git/+bug/1187662
+# already fixed upstream
+
+cat > .git/info/attributes <<EOATTRIBUTES
 *.dll export-ignore
 *.exe export-ignore
 # compiled samples ... also for Linux shall not be with the source
-samples/example_app/bin export-ignore
-#TODO should we remove ttf files?
-# [non-free] Contains binary textured font files (.ttf) without source.
-api/ttf export-ignore
+samples/example_app/bin/ export-ignore
+api/ttf/ export-ignore
 # license fails to explicitly express that is allows modifications
 api/ttfont.{cpp,h} export-ignore
 # redundant with GLUT library, license does not express clearly freedom to modify
@@ -155,34 +157,24 @@ samples/glut export-ignore
 # DFSG-incompatible.
 zip/configure export-ignore
 # DFSG-incompatible Apple Public Source License (APSL).
-lib/mac export-ignore
+lib/mac/ export-ignore
 # [non-free] The file lib/mac/dyld_gdb.h is licensed under the
 # [unneeded] This 3rd party software is already in Debian and we added
 # them to boinc's Build-Depends.
-curl export-ignore
-#zlib and openssl not included anymore in the source tree
-#zlib export-ignore
-#openssl export-ignore
-samples/jpeglib export-ignore
+curl/ export-ignore
+samples/jpeglib/ export-ignore
 # [unneeded] Cruft that is not needed to build the BOINC software.
 .vimrc export-ignore
-#.cvsignore not included anymore in the source tree
-#.cvsignore export-ignore
 # [non-free, unneeded] Unneeded build systems and binaries without
 # source.
-coprocs export-ignore
-win_build export-ignore
-mac_build export-ignore
-#client/mac not included anymore in the source tree
-#client/mac export-ignore
-clientgui/mac export-ignore
-mac_installer export-ignore
+coprocs/ export-ignore
+win_build/ export-ignore
+mac_build/ export-ignore
+clientgui/mac/ export-ignore
+mac_installer/ export-ignore
 client/app_stats_mac.cpp  export-ignore
 # modified in build process
 version.h export-ignore
-#config.sub and config.guess not included anymore in the source tree
-#config.sub export-ignore
-#config.guess export-ignore
 .gitignore export-ignore
 # bzr stuff and debian directory isn't needed
 # if you use the same source tree for building the latest version
@@ -190,7 +182,7 @@ version.h export-ignore
 # you can erroneously export these directories too
 .bzr export-ignore
 .bzrignore export-ignore
-debian export-ignore
+debian/ export-ignore
 EOATTRIBUTES
 
 # source files should not be executable

-- 
pkg-boinc scripts



More information about the pkg-boinc-commits mailing list