Merge remote-tracking branch 'upstream/master'

4 files changed, 26 insertions, 1 deletions

diff --git a/scripts/linux/cura.py b/scripts/linux/cura.py
index c055fdebf4..caf264d2df 100755
--- a/scripts/linux/cura.py
+++ b/scripts/linux/cura.py
@@ -2,6 +2,8 @@
 
 import os, sys
 
+sys.path.insert(1, os.path.dirname(__file__))
+
 try:
     import OpenGL
     import wx
@@ -25,7 +27,6 @@ except ImportError as e:
     
     exit(1)
 
-sys.path.insert(1, os.path.dirname(__file__))
 
 import Cura.cura as cura
 
diff --git a/scripts/linux/debian/DEBIAN/control b/scripts/linux/debian/DEBIAN/control
new file mode 100755
index 0000000000..dd2af10b58
--- /dev/null
+++ b/scripts/linux/debian/DEBIAN/control
@@ -0,0 +1,14 @@
+Package: cura
+Version: 13.03-1
+Section: misc
+Priority: optional
+Architecture: all
+Essential: no
+Depends: python-wxgtk2.8, python-opengl, python-serial, python-numpy, pypy
+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/DEBIAN/postinst b/scripts/linux/debian/DEBIAN/postinst
new file mode 100755
index 0000000000..1a2485251c
--- /dev/null
+++ b/scripts/linux/debian/DEBIAN/postinst
@@ -0,0 +1 @@
+#!/bin/sh
diff --git a/scripts/linux/debian/usr/share/applications/cura.desktop b/scripts/linux/debian/usr/share/applications/cura.desktop
new file mode 100644
index 0000000000..f9be277e35
--- /dev/null
+++ b/scripts/linux/debian/usr/share/applications/cura.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Cura
+Comment=Cura
+Icon=/usr/share/cura/Cura/resources/images/c.png
+Exec=/usr/bin/python /usr/share/cura/cura.py
+StartupNotify=true
+Terminal=false
+Categories=GNOME;GTK;Utility;