diff --git a/dist/application-x-valentina-pattern.png b/dist/application-x-valentina-pattern.png new file mode 100644 index 000000000..f695df140 Binary files /dev/null and b/dist/application-x-valentina-pattern.png differ diff --git a/dist/debian/changelog b/dist/debian/changelog index 37149d621..2ebd1efd4 100644 --- a/dist/debian/changelog +++ b/dist/debian/changelog @@ -1,5 +1,11 @@ -valentina (0.2.2) saucy; urgency=low +valentina (0.2.2+441+21+201406270651) trusty; urgency=low - * Add new dependions qttools5-dev-tools + * Auto build. - -- Roman Telezhinsky Mon, 10 Feb 2014 09:23:59 +0200 + -- dismine Fri, 27 Jun 2014 09:51:38 +0300 + +valentina (0.2.2) trusty; urgency=low + + * New release + + -- Roman Telezhinsky Tue, 11 Feb 2014 09:00:40 +0200 diff --git a/dist/debian/control b/dist/debian/control index 36a1bcd30..2845199b1 100644 --- a/dist/debian/control +++ b/dist/debian/control @@ -2,16 +2,27 @@ Source: valentina Section: graphics Priority: optional Maintainer: Roman Telezhynskyi -Build-Depends: debhelper (>= 8.0.0), qtbase5-dev (>= 5.2.1), libqt5svg5-dev (>= 5.2.1), ccache, g++ (>= 4.6.0), qt5-default (>= 5.2.1), qttools5-dev-tools (>= 5.2.1), libqt5xmlpatterns5-dev (>= 5.2.1) +Build-Depends: debhelper (>= 8.0.0), + qtbase5-dev (>= 5.2.1), + libqt5svg5-dev (>= 5.2.1), + ccache, + g++ (>= 4.6.0), + qt5-default (>= 5.2.1), + qttools5-dev-tools (>= 5.2.1), + libqt5xmlpatterns5-dev (>= 5.2.1) Standards-Version: 3.9.5 Homepage: http://www.valentina-project.org/ +Vcs-Browser: https://bitbucket.org/dismine/valentina Package: valentina Architecture: i386 amd64 -Depends: ${shlibs:Depends}, ${misc:Depends}, xpdf +Depends: ${shlibs:Depends}, + ${misc:Depends}, + xpdf Description: Pattern making program. Valentina is a cross-platform patternmaking program which allows designers to create and model patterns of clothing. This software allows pattern creation, using either standard sizing tables or an individual’s set of measurements. It blends new technologies with traditional methods to create a unique pattern making tool. + Supported langugages: En, Ru, Ua, Cz, It, Fr, De, Nl diff --git a/dist/debian/copyright b/dist/debian/copyright index 3734339ae..f73e88a01 100644 --- a/dist/debian/copyright +++ b/dist/debian/copyright @@ -3,13 +3,17 @@ Upstream-Name: valentina Source: https://bitbucket.org/dismine/valentina Files: * -Copyright: 2013 Roman Telezhynskyi +Copyright: 2013-2014 Roman Telezhynskyi License: GPL-3.0+ Files: debian/* -Copyright: 2013 Roman Telezhynskyi +Copyright: 2013-2014 Roman Telezhynskyi License: GPL-3.0+ +Files: usr/lib/valentina/qmuparser.so.* +Copyright: 2004-2014 Ingo Berg , 2014 Roman Telezhynskyi +License: MIT + License: GPL-3.0+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,3 +30,25 @@ License: GPL-3.0+ . On Debian systems, the complete text of the GNU General Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +The Debian packaging is © 2014, Roman Telezhynskyi and +is licensed under the GPL-3.0+, see `/usr/share/common-licenses/GPL-3'. diff --git a/dist/debian/files b/dist/debian/files new file mode 100644 index 000000000..7fb640334 --- /dev/null +++ b/dist/debian/files @@ -0,0 +1 @@ +valentina_0.2.2+441+21+201406270651_i386.deb graphics optional diff --git a/dist/debian/rules b/dist/debian/rules index 1e84b2ea9..20d3958e1 100755 --- a/dist/debian/rules +++ b/dist/debian/rules @@ -1,49 +1,55 @@ #!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + APPNAME := Valentina builddir: - mkdir -p builddir + mkdir -p builddir builddir/Makefile: builddir - cd builddir && qmake PREFIX=/usr ../$(APPNAME).pro -r + cd builddir && qmake PREFIX=/usr ../$(APPNAME).pro -r build: build-stamp build-stamp: builddir/Makefile - dh_testdir - # Add here commands to compile the package. - cd builddir && $(MAKE) - touch $@ + dh_testdir + # Add here commands to compile the package. + cd builddir && $(MAKE) + touch $@ clean: - dh_testdir - dh_testroot - rm -f build-stamp - # Add here commands to clean up after the build process. - rm -rf builddir - dh_clean + dh_testdir + dh_testroot + rm -f build-stamp + # Add here commands to clean up after the build process. + rm -rf builddir + dh_clean install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - # Add here commands to install the package into debian/your_appname - cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install + dh_testdir + dh_testroot + dh_prep + dh_installdirs + # Add here commands to install the package into debian/valentina + cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. # Build architecture-dependent files here. binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs - dh_installchangelogs - dh_installexamples - dh_installman + dh_testdir + dh_testroot + dh_installdocs + dh_installchangelogs +# dh_installexamples + dh_install --sourcedir=$(CURDIR) -v + dh_installman + dh_installmime dh_installmenu - dh_link - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb + dh_link + dh_compress + dh_fixperms + dh_installdeb +# LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):/usr/lib dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure diff --git a/dist/debian/shlibs.local b/dist/debian/shlibs.local new file mode 100644 index 000000000..7bfe3a1de --- /dev/null +++ b/dist/debian/shlibs.local @@ -0,0 +1 @@ +libqmuparser 2 libqmuparser2 diff --git a/dist/debian/source/format b/dist/debian/source/format index 163aaf8d8..89ae9db8f 100644 --- a/dist/debian/source/format +++ b/dist/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff --git a/dist/debian/substvars b/dist/debian/substvars new file mode 100644 index 000000000..abd3ebebc --- /dev/null +++ b/dist/debian/substvars @@ -0,0 +1 @@ +misc:Depends= diff --git a/dist/debian/valentina.dirs b/dist/debian/valentina.dirs new file mode 100644 index 000000000..916b0601d --- /dev/null +++ b/dist/debian/valentina.dirs @@ -0,0 +1,6 @@ +/usr/lib/valentina +/usr/share/valentina/translations +/usr/share/valentina/tables/standard +/usr/share/mime/packages +/usr/share/applications + diff --git a/dist/debian/valentina.install b/dist/debian/valentina.install new file mode 100644 index 000000000..302a1fb52 --- /dev/null +++ b/dist/debian/valentina.install @@ -0,0 +1,7 @@ +usr/bin/* +usr/lib/valentina/lib* +usr/share/valentina/translations/* +usr/share/valentina/tables/standard/* +usr/share/pixmaps/* +usr/share/applications/* +dist/application-x-valentina-pattern.png usr/share/pixmaps diff --git a/dist/debian/valentina.mime b/dist/debian/valentina.mime new file mode 100644 index 000000000..33c6a7c7b --- /dev/null +++ b/dist/debian/valentina.mime @@ -0,0 +1 @@ +application/x-valentina-pattern; valentina %s; nametemplate=%s.val; description="Valentina pattern format" edit=valentina '%s'; priority=6 diff --git a/dist/debian/postinst b/dist/debian/valentina.postinst old mode 100644 new mode 100755 similarity index 69% rename from dist/debian/postinst rename to dist/debian/valentina.postinst index aa511c6a6..5e234d4d8 --- a/dist/debian/postinst +++ b/dist/debian/valentina.postinst @@ -17,27 +17,16 @@ set -e # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package +echo "ldconfig..." >&2 +ldconfig -case "$1" in - configure) +if [ -x update-desktop-database ]; then + update-desktop-database +fi - echo "ldocnfig..." >&2 - ldconfig - ;; - - if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ] ; then - update-menus - fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac +if [ -x update-mime-database ]; then + update-mime-database /usr/share/mime +fi # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. diff --git a/dist/debian/valentina.postrm b/dist/debian/valentina.postrm new file mode 100755 index 000000000..35b04fe38 --- /dev/null +++ b/dist/debian/valentina.postrm @@ -0,0 +1,37 @@ +#!/bin/sh +# postrm script for valentina +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +echo "ldconfig..." >&2 +ldconfig + +if [ -x update-desktop-database ]; then + update-desktop-database +fi + +if [ -x update-mime-database ]; then + update-mime-database /usr/share/mime +fi + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/dist/debian/valentina.sharedmimeinfo b/dist/debian/valentina.sharedmimeinfo new file mode 100644 index 000000000..55242c69c --- /dev/null +++ b/dist/debian/valentina.sharedmimeinfo @@ -0,0 +1,96 @@ + + + + <_comment>Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina лекала + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + OValentina pattern format + OValentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina викрійки + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + Valentina pattern format + + + + diff --git a/src/app/app.pro b/src/app/app.pro index 0a5375203..03b6b361d 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -606,9 +606,9 @@ DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\" #MAKE INSTALL target.path = $$BINDIR desktop.path = $$DATADIR/applications/ -desktop.files += dist/$${TARGET}.desktop +desktop.files += ../../dist/$${TARGET}.desktop pixmaps.path = $$DATADIR/pixmaps/ -pixmaps.files += dist/$${TARGET}.png +pixmaps.files += ../../dist/$${TARGET}.png translations.path = $$DATADIR/$${TARGET}/translations/ translations.files = $$INSTALL_TRANSLATIONS standard.path = $$DATADIR/$${TARGET}/tables/standard/ diff --git a/src/libs/qmuparser/qmuparser.pro b/src/libs/qmuparser/qmuparser.pro index eef8fca92..797f9845d 100644 --- a/src/libs/qmuparser/qmuparser.pro +++ b/src/libs/qmuparser/qmuparser.pro @@ -480,7 +480,7 @@ isEmpty(PREFIX) { } LIBDIR = $$PREFIX/lib #MAKE INSTALL -target.path = $$LIBDIR/$${TARGET}/ +target.path = $$LIBDIR/ INSTALLS += \ target }