[boinc] 07/07: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-boinc/boinc

[Steffen Möller]

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

moeller pushed a commit to branch master
in repository boinc.

commit 61eeb00436b91b23d9e5e8ad1d7ddf1f6b93afe5
Merge: b62de78 68de8ef
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Tue Nov 5 14:11:41 2013 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-boinc/boinc
    
    Conflicts:
    	debian/fetch_example_applications.sh
    
    Also added *~ to .gitignore

 .gitignore                           |    1 +
 debian/changelog                     |    3 ++
 debian/fetch_example_applications.sh |   71 ++++++++++++++++++++++++----------
 debian/rules                         |    8 +++-
 4 files changed, 61 insertions(+), 22 deletions(-)

diff --cc .gitignore
index f88cb22,f88cb22..da67188
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,3 +1,4 @@@
++*~
  */Makefile
  */Makefile.in
  */*/Makefile.in
diff --cc debian/fetch_example_applications.sh
index 38a322a,8321012..fd1e56c
--- a/debian/fetch_example_applications.sh
+++ b/debian/fetch_example_applications.sh
@@@ -7,8 -7,9 +7,8 @@@
  # This script is released under the same license
  # as BOINC, created and copyright by
  # Steffen Moeller <moeller at debian.org>
- #
- # Modified by
 -# with contributions by Christian Beer <djangofett at gmx.net>.
 -#
 -# Modified by
++# with contributions by
++# Christian Beer <djangofett at gmx.net>
  # Natalia Nikitina <nevecie at yandex.ru>
  
  set -e
@@@ -137,9 -168,9 +166,12 @@@ d
      echo -n "  "
      for folder in $downloaddir/*
      do 
--      archname=$(echo $folder|cut -d / -f2)
--      echo -n " $archname"
--      cp $folder/$appname $appsdir/$appname/$shortver/${deb2boinc[$archname]}/${appname}_${shortver}_${deb2boinc[$archname]}
++	archname=$(echo $folder|cut -d / -f2)
++        echo -n " $archname"
++	#echo Creating new apps directory structure
++	mkdir -p $appsdir/$appname/${shortver}/${deb2boinc[$archname]}
++	#echo Copying $folder/$appname $appsdir/$appname/${shortver}/${deb2boinc[$archname]}/${appname}_${shortver}_${deb2boinc[$archname]}
++	cp $folder/$appname $appsdir/$appname/${shortver}/${deb2boinc[$archname]}/${appname}_${shortver}_${deb2boinc[$archname]}
      done
      echo
  done

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