Debian packaging now includes incremental release number.

diff --git a/package.sh b/package.sh
index c544020004ff1618acec0ee2ba74baf14ab30864..1524571bbd9be0edb83be69ce02f48a19c809b12 100755 (executable)
--- a/package.sh
+++ b/package.sh
@@ -21,6 +21,13 @@ ARCHIVE_FOR_DISTRIBUTION=1
 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)
+
+
 ##Which versions of external programs to use
 WIN_PORTABLE_PY_VERSION=2.7.2.1
 
@@ -207,6 +214,8 @@ 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
@@ -233,7 +242,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_${BUILD_NAME}-${BUILD_TARGET}.deb
+       dpkg-deb --build ${BUILD_TARGET} $(dirname ${TARGET_DIR})/cura_${BUILD_NAME}-${debian_32_release}-${BUILD_TARGET}.deb
        sudo chown `id -un`:`id -gn` ${BUILD_TARGET} -R
        exit
 fi
@@ -243,6 +252,8 @@ 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
@@ -269,7 +280,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_${BUILD_NAME}-${BUILD_TARGET}.deb
+       dpkg-deb --build ${BUILD_TARGET} $(dirname ${TARGET_DIR})/cura_${BUILD_NAME}-${debian_64_release}-${BUILD_TARGET}.deb
        sudo chown `id -un`:`id -gn` ${BUILD_TARGET} -R
        exit
 fi

diff --git a/scripts/linux/debian_amd64/DEBIAN/control b/scripts/linux/debian_amd64/DEBIAN/control
index eff38868b70e4ed0888bdd9879ff745fdb3e5328..afe8d4f464b0d2c4489fb83f0d36854a39fa4f6c 100755 (executable)
--- a/scripts/linux/debian_amd64/DEBIAN/control
+++ b/scripts/linux/debian_amd64/DEBIAN/control
@@ -1,11 +1,12 @@
+Source: cura
 Package: cura
-Version: 14.01
+Version: 14.09
+Maintainer: Aleph Objects, Inc. <info@alephobjects.com>
 Section: misc
 Priority: optional
 Architecture: amd64
 Essential: no
 Depends: python-wxgtk2.8, python-opengl, python-serial, python-numpy
-Maintainer: Daid <daid303@gmail.com>
 Provides: cura
 Installed-Size: 10000
 Description: Cura is a full software solution for 3D printing,

diff --git a/scripts/linux/debian_amd64_release b/scripts/linux/debian_amd64_release
new file mode 100644 (file)
index 0000000..7ed6ff8
--- /dev/null
+++ b/scripts/linux/debian_amd64_release
@@ -0,0 +1 @@
+5

diff --git a/scripts/linux/debian_i386_release b/scripts/linux/debian_i386_release
new file mode 100644 (file)
index 0000000..0cfbf08
--- /dev/null
+++ b/scripts/linux/debian_i386_release
@@ -0,0 +1 @@
+2