Update debian files.

--HG--
branch : develop

dist/debian/menu

@@ -1,2 +1,2 @@
-?package(valentina):needs="X11|text|vc|wm" section="Applications/Graphics"\
+?package(valentina): needs="X11|text|vc" section="Applications/Graphics" title="Valentina" command="valentina"
-  title="valentina" command="/usr/bin/valentina"
+?package(valentina): needs="X11|text|vc" section="Applications/Data Management" title="Tape" command="tape" 

dist/debian/valentina.dirs

@@ -1,3 +1,4 @@
+/usr/share/valentina
 /usr/share/valentina/translations
 /usr/share/valentina/tables/standard
 /usr/share/valentina/tables/templates

dist/debian/valentina.install

@@ -1,5 +1,6 @@
 usr/bin/*
 usr/lib/*
+usr/share/valentina/*
 usr/share/valentina/translations/*
 usr/share/valentina/tables/standard/*
 usr/share/valentina/tables/templates/*

src/app/tape/tape.pro

@@ -171,52 +171,75 @@ include(../tables.pri)
 copyToDestdir($$INSTALL_STANDARD_TEMPLATES, $$shell_path($${OUT_PWD}/$${DESTDIR}/tables/templates))
 include(../translations.pri)
 
-macx{
+# Set "make install" command for Unix-like systems.
-    # Some macx stuff
+unix{
-    QMAKE_MAC_SDK = macosx
+    # Prefix for binary file.
+    isEmpty(PREFIX){
+        PREFIX = $$DEFAULT_PREFIX
+    }
 
-    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
+    unix:!macx{
-    # Path to resources in app bundle
+        DATADIR =$$PREFIX/share
-    #RESOURCES_DIR = "Contents/Resources" defined in translation.pri
+        DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"
-    FRAMEWORKS_DIR = "Contents/Frameworks"
-    MACOS_DIR = "Contents/MacOS"
-    # On macx we will use app bundle. Bundle doesn't need bin directory inside.
-    # See issue #166: Creating OSX Homebrew (Mac OS X package manager) formula.
-    target.path = $$MACOS_DIR
 
-    #languages added inside translations.pri
+        # Path to bin file after installation
+        target.path = $$PREFIX/bin
 
-    # Symlinks also good names for copying. Make will take origin file and copy them with using symlink name.
+        rcc_diagrams.path = /usr/share/valentina/
-    # For bundle this names more then enough. We don't need care much about libraries versions.
+        rcc_diagrams.files = $${OUT_PWD}/$${DESTDIR}/diagrams.rcc
-    libraries.path = $$FRAMEWORKS_DIR
+        rcc_diagrams.CONFIG = no_check_exist
-    libraries.files += $${OUT_PWD}/../../libs/qmuparser/$${DESTDIR}/libqmuparser.2.dylib
-    libraries.files += $${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}/libvpropertyexplorer.1.dylib
 
-    # logo on macx.
+        INSTALLS += \
-    ICON = $$PWD/../../../dist/Tape.icns
+            target \
+            rcc_diagrams
+    }
+    macx{
+        # Some macx stuff
+        QMAKE_MAC_SDK = macosx
 
-    QMAKE_INFO_PLIST = $$PWD/../../../dist/macx/tape/Info.plist
+        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
+        # Path to resources in app bundle
+        #RESOURCES_DIR = "Contents/Resources" defined in translation.pri
+        FRAMEWORKS_DIR = "Contents/Frameworks"
+        MACOS_DIR = "Contents/MacOS"
+        # On macx we will use app bundle. Bundle doesn't need bin directory inside.
+        # See issue #166: Creating OSX Homebrew (Mac OS X package manager) formula.
+        target.path = $$MACOS_DIR
 
-    # Copy to bundle standard measurements files
+        #languages added inside translations.pri
-    standard.path = $$RESOURCES_DIR/tables/standard/
-    standard.files = $$INSTALL_STANDARD_MEASHUREMENTS
 
-    # Copy to bundle templates files
+        # Symlinks also good names for copying. Make will take origin file and copy them with using symlink name.
-    templates.path = $$RESOURCES_DIR/tables/templates/
+        # For bundle this names more then enough. We don't need care much about libraries versions.
-    templates.files = $$INSTALL_STANDARD_TEMPLATES
+        libraries.path = $$FRAMEWORKS_DIR
+        libraries.files += $${OUT_PWD}/../../libs/qmuparser/$${DESTDIR}/libqmuparser.2.dylib
+        libraries.files += $${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}/libvpropertyexplorer.1.dylib
 
-    # Copy to bundle standard measurements files
+        # logo on macx.
-    # We cannot add none exist files to bundle through QMAKE_BUNDLE_DATA. That's why we must do this manually.
+        ICON = $$PWD/../../../dist/Tape.icns
-    forceCopyToDestdir($${OUT_PWD}/$${DESTDIR}/diagrams.rcc, $$shell_path($${OUT_PWD}/$$DESTDIR/$${TARGET}.app/$$RESOURCES_DIR/))
 
-    format.path = $$RESOURCES_DIR/
+        QMAKE_INFO_PLIST = $$PWD/../../../dist/macx/tape/Info.plist
-    format.files = $$PWD/../../../dist/macx/measurements.icns
 
-    QMAKE_BUNDLE_DATA += \
+        # Copy to bundle standard measurements files
-        templates \
+        standard.path = $$RESOURCES_DIR/tables/standard/
-        standard \
+        standard.files = $$INSTALL_STANDARD_MEASHUREMENTS
-        libraries \
+
-        format
+        # Copy to bundle templates files
+        templates.path = $$RESOURCES_DIR/tables/templates/
+        templates.files = $$INSTALL_STANDARD_TEMPLATES
+
+        # Copy to bundle standard measurements files
+        # We cannot add none exist files to bundle through QMAKE_BUNDLE_DATA. That's why we must do this manually.
+        forceCopyToDestdir($${OUT_PWD}/$${DESTDIR}/diagrams.rcc, $$shell_path($${OUT_PWD}/$$DESTDIR/$${TARGET}.app/$$RESOURCES_DIR/))
+
+        format.path = $$RESOURCES_DIR/
+        format.files = $$PWD/../../../dist/macx/measurements.icns
+
+        QMAKE_BUNDLE_DATA += \
+            templates \
+            standard \
+            libraries \
+            format
+    }
 }
 
 # Compilation will fail without this files after we added them to this section.

src/app/valentina/valentina.pro

@@ -235,9 +235,6 @@ unix{
         templates.path = /usr/share/$${TARGET}/tables/templates/
         templates.files = $$INSTALL_STANDARD_TEMPLATES
 
-        diagrams.path = /usr/share/$${TARGET}/
-        diagrams.files = $${OUT_PWD}/../tape/$${DESTDIR}/diagrams.rcc
-
         INSTALLS += \
             target \
             tape \
@@ -245,8 +242,7 @@ unix{
             pixmaps \
             translations \
             standard \
-            templates \
+            templates
-            diagrams
     }
     macx{
         # Some macx stuff
@@ -289,10 +285,6 @@ unix{
         templates.path = $$RESOURCES_DIR/tables/templates/
         templates.files = $$INSTALL_STANDARD_TEMPLATES
 
-        # Copy to bundle standard measurements files
-        diagrams.path = $$RESOURCES_DIR/
-        diagrams.files = $${OUT_PWD}/../tape/$${DESTDIR}/diagrams.rcc
-
         format.path = $$RESOURCES_DIR/
         format.files = $$PWD/../../../dist/macx/measurements.icns
 
@@ -302,7 +294,6 @@ unix{
             libraries \
             tape \
             xpdf \
-            diagrams \
             format
     }
 }