[SCM] FreeCAD packaging branch, experimental, updated. debian/0.13.1830-dfsg-1_exp1-3-geb29048

[Boris Pek]

The following commit has been merged in the experimental branch:
commit eb29048c6d5f3348d5501e1a8501be2b4673cfae
Author: Boris Pek <tehnick-8 at yandex.ru>
Date:   Fri Feb 8 22:56:45 2013 +0200

    Update scripts/get_git_orig_src.sh:
    - change version format to comply with
      versioning scheme used in upstream
    - simplify script

diff --git a/debian/scripts/get_git_orig_src.sh b/debian/scripts/get_git_orig_src.sh
index 6024447..f58e8d9 100755
--- a/debian/scripts/get_git_orig_src.sh
+++ b/debian/scripts/get_git_orig_src.sh
@@ -6,6 +6,8 @@
 # Packages, that needs to be installed to use the script:
 # atool, git-core
 
+set -e
+
 git clone git://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad git_temp_packaging
 
 cd git_temp_packaging
@@ -18,16 +20,13 @@ else
     echo 'Using the latest revision'
 fi 
 
-GIT_REV=$(git log -n 1 --pretty="format:%h")
-GIT_DAT=$(git log -n 1 --pretty="format:%ai")
-GIT_DAT=${GIT_DAT:0:10}
-GIT_DAT=$(echo $GIT_DAT | sed 's/-//g')
+GIT_CMT_COUNT=$(git rev-list HEAD | wc -l)
 
-VER_DEB=0.13~$GIT_DAT.git$GIT_REV
-FOLDER_NAME=freecad-0.13~$GIT_DAT.git$GIT_REV
-TARBALL_NAME=freecad_0.13~$GIT_DAT.git$GIT_REV.orig.tar.xz
+DEB_VER=0.13.$GIT_CMT_COUNT-dfsg
+FOLDER_NAME=freecad-$DEB_VER
+TARBALL_NAME=freecad_$DEB_VER.orig.tar.xz
 
-echo $VER_DEB
+echo $DEB_VER
 echo $FOLDER_NAME
 echo $TARBALL_NAME
 
@@ -35,11 +34,14 @@ python src/Tools/SubWCRev.py
 
 cd ..
 
-mkdir $FOLDER_NAME 
-cp -r git_temp_packaging/* $FOLDER_NAME/
+rm -fr $FOLDER_NAME
+
+mv git_temp_packaging $FOLDER_NAME
 rm -rf $FOLDER_NAME/.git 
 rm -rf $FOLDER_NAME/src/3rdParty/CxImage
 rm -rf $FOLDER_NAME/src/3rdParty/Pivy
 rm -rf $FOLDER_NAME/src/3rdParty/Pivy-0.5
 
 tar Jcvf $TARBALL_NAME $FOLDER_NAME
+
+rm -fr $FOLDER_NAME

-- 
FreeCAD packaging