Changes to Debian package naming.

The debian package is now cura-lulzbot. Changed Debian release number to a manual number change in package.sh. Added git commit hash to pacakge name.

diff --git a/package.sh b/package.sh
index 97ebae526f811715a4676fdebcc7f32e730ef434..ed7b9af66bf1e0dfd6e2d65aeba0936216f8f16b 100755 (executable)
--- a/package.sh
+++ b/package.sh
@@ -22,11 +22,10 @@ export BUILD_NAME=14.09
 TARGET_DIR=Cura-${BUILD_NAME}-${BUILD_TARGET}
 
 ##Debian package release
-debian_64_release_counter=scripts/linux/debian_amd64_release
-debian_64_release=$(<$debian_64_release_counter)
-debian_32_release_counter=scripts/linux/debian_i386_release
-debian_32_release=$(<$debian_32_release_counter)
+export DEBIAN_RELEASE=1
 
+##Git commit
+GIT_HASH=$(git rev-parse --short=4 HEAD)
 
 ##Which versions of external programs to use
 WIN_PORTABLE_PY_VERSION=2.7.2.1
@@ -214,8 +213,6 @@ fi
 #############################
 
 if [ "$BUILD_TARGET" = "debian_i386" ]; then
-       ((debian_32_release += 1))
-       echo $debian_32_release > $debian_32_release_counter
     export CXX="g++ -m32"
        if [ ! -d "Power" ]; then
                git clone https://github.com/GreatFruitOmsk/Power
@@ -242,7 +239,7 @@ if [ "$BUILD_TARGET" = "debian_i386" ]; then
        sudo chmod 755 scripts/linux/${BUILD_TARGET}/usr -R
        sudo chmod 755 scripts/linux/${BUILD_TARGET}/DEBIAN -R
        cd scripts/linux
-       dpkg-deb --build ${BUILD_TARGET} $(dirname ${TARGET_DIR})/cura-AO_${BUILD_NAME}-${debian_32_release}-${BUILD_TARGET}.deb
+       dpkg-deb --build ${BUILD_TARGET} $(dirname ${TARGET_DIR})/cura-lulzbot_${BUILD_NAME}-${DEBIAN_RELEASE}-${GIT_HASH}_${BUILD_TARGET}.deb
        sudo chown `id -un`:`id -gn` ${BUILD_TARGET} -R
        exit
 fi
@@ -252,8 +249,6 @@ fi
 #############################
 
 if [ "$BUILD_TARGET" = "debian_amd64" ]; then
-       ((debian_64_release += 1))
-       echo $debian_64_release > $debian_64_release_counter
     export CXX="g++ -m64"
        if [ ! -d "Power" ]; then
                git clone https://github.com/GreatFruitOmsk/Power
@@ -280,7 +275,7 @@ if [ "$BUILD_TARGET" = "debian_amd64" ]; then
        sudo chmod 755 scripts/linux/${BUILD_TARGET}/usr -R
        sudo chmod 755 scripts/linux/${BUILD_TARGET}/DEBIAN -R
        cd scripts/linux
-       dpkg-deb --build ${BUILD_TARGET} $(dirname ${TARGET_DIR})/cura-AO_${BUILD_NAME}-${debian_64_release}-${BUILD_TARGET}.deb
+       dpkg-deb --build ${BUILD_TARGET} $(dirname ${TARGET_DIR})/cura-lulzbot_${BUILD_NAME}-${DEBIAN_RELEASE}-${GIT_HASH}_${BUILD_TARGET}.deb
        sudo chown `id -un`:`id -gn` ${BUILD_TARGET} -R
        exit
 fi

diff --git a/scripts/linux/debian_amd64_release b/scripts/linux/debian_amd64_release
deleted file mode 100644 (file)
index b4de394..0000000
--- a/scripts/linux/debian_amd64_release
+++ /dev/null
@@ -1 +0,0 @@
-11

diff --git a/scripts/linux/debian_i386_release b/scripts/linux/debian_i386_release
deleted file mode 100644 (file)
index 00750ed..0000000
--- a/scripts/linux/debian_i386_release
+++ /dev/null
@@ -1 +0,0 @@
-3