[boinc] 09/09: 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 aa38a0ec98f0168d8ecc416e4d49463bb8dcb9c7
Merge: c87fd92 b62de78
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Tue Nov 5 10:31:06 2013 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-boinc/boinc
    
    Conflicts:
    	debian/fetch_example_applications.sh

 debian/fetch_example_applications.sh |   36 +++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --cc debian/fetch_example_applications.sh
index 2e884b0,38a322a..73aed59
--- a/debian/fetch_example_applications.sh
+++ b/debian/fetch_example_applications.sh
@@@ -7,7 -7,9 +7,9 @@@
  # This script is released under the same license
  # as BOINC, created and copyright by
  # Steffen Moeller <moeller at debian.org>
- # 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
  
@@@ -93,24 -77,11 +95,28 @@@ key="$projectroot/keys/code_sign_privat
  
  shortver=$(echo $version|cut -d . -f-2)
  
 -appsdir="apps"
 +if [ -z "$appsdir" ]; then
 +	if [ -d "$projectroot/apps" ]; then
 +		echo "W: 'appsdir' not specified, chose '\$projectroot/apps'."
 +		appsdir="$projectroot/apps"
 +	else
 +		echo "W: 'appsdir' not specified, and no apps directory in \$projectroot, decided for 'apps'.".
 +		appsdir="apps"
 +	fi
 +fi
  downloaddir="collection"
- appsdirdownload="/usr/lib/boinc-server-maker/apps" # used as relative path below
  
++<<<<<<< HEAD
 +if [ -z "$downloaddir" ]; then
 +	downloaddir="collection"
 +fi
 +
 +if [ -d "$appsdir" ]; then
 +	echo "E: Directory '$appsdir' is already existing. Please clean this up first."
++=======
+ if [ -d "$appsdir" ]; then
+ 	echo "Directory '$appsdir' is already existing. Please clean this up first."
++>>>>>>> b62de785a82da97b52834ef1490663102da9c322
  	exit
  fi
  
@@@ -164,12 -137,9 +172,18 @@@ d
      echo -n "  "
      for folder in $downloaddir/*
      do 
++<<<<<<< HEAD
 +	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]}
++=======
+       archname=$(echo $folder|cut -d / -f2)
+       echo -n " $archname"
+       cp $folder/$appname $appsdir/$appname/$shortver/${deb2boinc[$archname]}/${appname}_${shortver}_${deb2boinc[$archname]}
++>>>>>>> b62de785a82da97b52834ef1490663102da9c322
      done
      echo
  done

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