Merge tag 'upstream/2.0.0'

Upstream version 2.0.0

build_orig.sh

@@ -1,86 +0,0 @@
-#!/bin/bash
-# the directory of the script
-DIR=`cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd`
-echo "Working directory $DIR"
-
-# the temp directory used, within $DIR
-WORK_DIR=`mktemp -d -p "$DIR"`
-echo "Creating temp working directory $WORK_DIR"
-
-# deletes the temp directory
-function cleanup {
-  rm -rf "$WORK_DIR"
-  echo "Deleted temp working directory $WORK_DIR"
-}
-
-# register the cleanup function to be called on the EXIT signal
-trap cleanup EXIT
-
-# Download Files specified in files.diz
-while IFS=! read type app version outputfile url md5 realver
-do
-  echo "Downloading $app Version: $version"
-  #use -O for output file. define $outputfile yourself
-  wget -c --no-check-certificate --tries=1 -O $DIR/../$outputfile --timeout=5 "$url"
-  # use $(..) instead of backticks.
-  calculated_md5=$(md5sum "$DIR/../$outputfile" | cut -f 1 -d " ")
-  # compare md5
-  case "$calculated_md5" in
-    "$md5" )
-      echo "$DIR/../$outputfile md5 ok"
-    ;;
-    *)
-      echo "$DIR/../$outputfile md5 NOT ok"
-      exit 1
-    ;;
-  esac
-done < "$DIR/files.diz"
-
-# Extract to specified dir and set some variables
-while IFS=! read type app version outputfile url md5 realver
-do
-  mkdir -p $WORK_DIR/${type}/${realver}
-  pushd $WORK_DIR/${type}/${realver}
-  tar -zxf $DIR/../$outputfile
-  unzip $DIR/../$outputfile
-  popd
-  mkdir -p $WORK_DIR/${app}-${version}/${type}/${realver}
-  pushd $WORK_DIR/${app}-${version}/${type}/${realver}
-  case "${type}" in
-    "amd64" )
-      mv $WORK_DIR/${type}/${realver}/*/64bin/magician .
-      mv $WORK_DIR/${type}/${realver}/magician .
-      chmod +x magician
-    ;;
-    "i386" )
-      mv $WORK_DIR/${type}/${realver}/*/32bin/magician .
-      mv $WORK_DIR/${type}/${realver}/magician .
-      chmod +x magician
-    ;;
-    *)
-      echo "Wrong arch"
-      exit 1
-    ;;
-  esac
-  echo "${app}_${version}.orig.tar.gz" > $WORK_DIR/filename.txt
-  echo "${app}-${version}" > $WORK_DIR/dirname.txt
-  echo "${version}" > $WORK_DIR/version.txt
-  popd
-done < "$DIR/files.diz"
-
-FILENAME=`cat $WORK_DIR/filename.txt`
-DIRNAME=`cat $WORK_DIR/dirname.txt`
-echo "Creating $DIR/../$FILENAME "
-
-pushd $WORK_DIR
-tar -czf $DIR/../$FILENAME $DIRNAME
-popd
-
-VER=`cat $WORK_DIR/version.txt`
-echo "Importing $DIR/../$FILENAME as $VER into git"
-#exit 1
-
-cleanup
-gbp import-orig --pristine-tar -u $VER $DIR/../$FILENAME
-
-exit 0

files.diz

@@ -1,4 +0,0 @@
-amd64!magician!2.0.0!Samsung_Magician_DC_Linux_64bit.zip!http://www.samsung.com/semiconductor/minisite/ssd/downloads/software/Samsung_Magician_DC_Linux_64bit.zip!07132c95d8bf88fad498fab4b7864b2e!2.00
-i386!magician!2.0.0!Samsung_Magician_DC_Linux_32bit.zip!http://www.samsung.com/semiconductor/minisite/ssd/downloads/software/Samsung_Magician_DC_Linux_32bit.zip!1357224cd841ef97b57c1a489e4f37b4!2.00
-amd64!magician!2.0.0!samsung_magician_dc-v1.0_rtm_p2.tar.gz!http://www.samsung.com/semiconductor/minisite/ssd/downloads/software/samsung_magician_dc-v1.0_rtm_p2.tar.gz!b7e88ecac15adddaa5bfae3f679ee2ca!1.00
-i386!magician!2.0.0!samsung_magician_dc-v1.0_rtm_p2.tar.gz!http://www.samsung.com/semiconductor/minisite/ssd/downloads/software/samsung_magician_dc-v1.0_rtm_p2.tar.gz!b7e88ecac15adddaa5bfae3f679ee2ca!1.00