From: Steven Abadie <steven@alephobjects.com>
Date: Tue, 30 Sep 2014 03:35:37 +0000 (-0600)
Subject: Debian packaging now includes incremental release number.
X-Git-Tag: 14.09-1.18~119
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5ffdb836a4f5719e243a210d3aa82fb161383390;p=cura.git

Debian packaging now includes incremental release number.
---

diff --git a/package.sh b/package.sh
index c5440200..1524571b 100755
--- 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 eff38868..afe8d4f4 100755
--- 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
index 00000000..7ed6ff82
--- /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
index 00000000..0cfbf088
--- /dev/null
+++ b/scripts/linux/debian_i386_release
@@ -0,0 +1 @@
+2