From: daid <daid303@gmail.com>
Date: Fri, 2 Jan 2015 12:34:59 +0000 (+0100)
Subject: Fix the long standing debian version bug.
X-Git-Tag: 15.01-RC6~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4fec8120f77acfc93d118a3736ee7a566d3631de;p=cura.git

Fix the long standing debian version bug.
---

diff --git a/package.sh b/package.sh
index 14086e5b..15d9da1e 100755
--- a/package.sh
+++ b/package.sh
@@ -292,6 +292,7 @@ if [ "$BUILD_TARGET" = "debian_i386" ]; then
 	cp scripts/linux/cura.py scripts/linux/${BUILD_TARGET}/usr/share/cura/
 	cp -a Power/power scripts/linux/${BUILD_TARGET}/usr/share/cura/
 	echo $BUILD_NAME > scripts/linux/${BUILD_TARGET}/usr/share/cura/Cura/version
+	cat scripts/linux/debian_control | sed 's/\[BUILD_NAME\]/${BUILD_NAME}/' | sed 's/\[ARCH\]/i368/' > scripts/linux/${BUILD_TARGET}/control
 	sudo chown root:root scripts/linux/${BUILD_TARGET} -R
 	sudo chmod 755 scripts/linux/${BUILD_TARGET}/usr -R
 	sudo chmod 755 scripts/linux/${BUILD_TARGET}/DEBIAN -R
@@ -321,6 +322,7 @@ if [ "$BUILD_TARGET" = "debian_amd64" ]; then
 	cp scripts/linux/cura.py scripts/linux/${BUILD_TARGET}/usr/share/cura/
 	cp -a Power/power scripts/linux/${BUILD_TARGET}/usr/share/cura/
 	echo $BUILD_NAME > scripts/linux/${BUILD_TARGET}/usr/share/cura/Cura/version
+	cat scripts/linux/debian_control | sed 's/\[BUILD_NAME\]/${BUILD_NAME}/' | sed 's/\[ARCH\]/amd64/' > scripts/linux/${BUILD_TARGET}/control
 	sudo chown root:root scripts/linux/${BUILD_TARGET} -R
 	sudo chmod 755 scripts/linux/${BUILD_TARGET}/usr -R
 	sudo chmod 755 scripts/linux/${BUILD_TARGET}/DEBIAN -R
@@ -350,6 +352,7 @@ if [ "$BUILD_TARGET" = "debian_armhf" ]; then
 	cp scripts/linux/cura.py scripts/linux/${BUILD_TARGET}/usr/share/cura/
 	cp -a Power/power scripts/linux/${BUILD_TARGET}/usr/share/cura/
 	echo $BUILD_NAME > scripts/linux/${BUILD_TARGET}/usr/share/cura/Cura/version
+	cat scripts/linux/debian_control | sed 's/\[BUILD_NAME\]/${BUILD_NAME}/' | sed 's/\[ARCH\]/armhf/' > scripts/linux/${BUILD_TARGET}/control
 	sudo chown root:root scripts/linux/${BUILD_TARGET} -R
 	sudo chmod 755 scripts/linux/${BUILD_TARGET}/usr -R
 	sudo chmod 755 scripts/linux/${BUILD_TARGET}/DEBIAN -R
diff --git a/scripts/linux/debian_armhf/DEBIAN/control b/scripts/linux/debian_armhf/DEBIAN/control
deleted file mode 100644
index 05029d00..00000000
--- a/scripts/linux/debian_armhf/DEBIAN/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Package: cura
-Version: 14.01
-Section: misc
-Priority: optional
-Architecture: armhf
-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,
- aimed at RepRaps and the Ultimaker. It's free software payed for
- and maintained by Ultimaker.
-
diff --git a/scripts/linux/debian_amd64/DEBIAN/control b/scripts/linux/debian_control
old mode 100755
new mode 100644
similarity index 89%
rename from scripts/linux/debian_amd64/DEBIAN/control
rename to scripts/linux/debian_control
index eff38868..f969844f
--- a/scripts/linux/debian_amd64/DEBIAN/control
+++ b/scripts/linux/debian_control
@@ -1,8 +1,8 @@
 Package: cura
-Version: 14.01
+Version: [BUILD_NAME]
 Section: misc
 Priority: optional
-Architecture: amd64
+Architecture: [ARCH]
 Essential: no
 Depends: python-wxgtk2.8, python-opengl, python-serial, python-numpy
 Maintainer: Daid <daid303@gmail.com>
diff --git a/scripts/linux/debian_i386/DEBIAN/control b/scripts/linux/debian_i386/DEBIAN/control
deleted file mode 100644
index ea2a2c2f..00000000
--- a/scripts/linux/debian_i386/DEBIAN/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Package: cura
-Version: 14.01
-Section: misc
-Priority: optional
-Architecture: i386
-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,
- aimed at RepRaps and the Ultimaker. It's free software payed for
- and maintained by Ultimaker.
-