[cpl-plugin-giraf] 02/03: Merge branch 'debian-template' into debian

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository cpl-plugin-giraf.

commit ae9178156bd13673c7fd51051f2897fcb1fbed81
Merge: 495a046 e081daa
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed May 6 09:43:29 2015 +0200

    Merge branch 'debian-template' into debian
    
    Conflicts:
    	debian/cpl-plugin-calib.postinst.in

 debian/cpl-plugin-calib.postinst.in | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --cc debian/cpl-plugin-calib.postinst.in
index d786c60,a01821a..af982d7
--- a/debian/cpl-plugin-calib.postinst.in
+++ b/debian/cpl-plugin-calib.postinst.in
@@@ -10,13 -9,32 +9,32 @@@ CALIB=${PIPELINE}-calib-${VERSION
  COMPONENTS="${CALIB}/cal"
  TARGETDIR="/usr/share/cpl-plugins/${PIPELINE}-${VERSION}"
  
+ downloaded=0
+ 
  if [ "$1" = "configure" ] ; then
      mkdir -p ${TARGETDIR}
-     wget -O- ${URL} | \
-     tar xzO ${TAR} | \
-     tar xzC ${TARGETDIR} ${COMPONENTS}  --strip-components=1
+ 
+     for suffix in "" $(seq -f -%.0f 1 9) ; do
+ 
+ 	KIT=${PIPELINE}-kit-${VERSION}${suffix}
 -	URL=ftp://ftp.eso.org/pub/dfs/pipelines/${PIPELINE}/${KIT}.tar.gz
++	URL=ftp://ftp.eso.org/pub/dfs/pipelines/giraffe/${KIT}.tar.gz
+ 	TAR=${KIT}/${CALIB}.tar.gz
+ 
+ 	wget -O- ${URL} | \
+ 	    tar xzO ${TAR} | \
+ 	    tar xzC ${TARGETDIR} ${COMPONENTS} --strip-components=1
+ 
+ 	if [ $? = 0 ] ; then
+ 	    downloaded=1
+ 	    break
+ 	fi
+     done
+ fi
+ 
+ if [ $downloaded = 0 ] ; then
+     exit 1
  fi
  
+ set -e
+ 
  #DEBHELPER#

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-giraf.git