From 1028e6d3285825fb83e1db29a9da53bd563e30efdab138d7c6b2315f39ce3ccc Mon Sep 17 00:00:00 2001 From: Daniel Rahn Date: Thu, 20 Aug 2015 08:49:36 +0000 Subject: [PATCH 1/2] Accepting request 324526 from home:insilmaril Update to 2.4.6, various bugfixes OBS-URL: https://build.opensuse.org/request/show/324526 OBS-URL: https://build.opensuse.org/package/show/editors/vym?expand=0&rev=40 --- debian.changelog | 46 ++++++++++++++++++++++++++++++++++++++++++++-- makedist.config | 4 ++-- vym-2.3.24.tar.bz2 | 3 --- vym-2.4.6.tar.bz2 | 3 +++ vym.changes | 35 ++++++++++++++++++++++++++++++++--- vym.dsc | 6 +++--- vym.spec | 39 ++++++++++++++++++++++++++------------- 7 files changed, 110 insertions(+), 26 deletions(-) delete mode 100644 vym-2.3.24.tar.bz2 create mode 100644 vym-2.4.6.tar.bz2 diff --git a/debian.changelog b/debian.changelog index d9e35b6..357cfd5 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,8 +1,50 @@ +vym (2.4.6.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Tue, 18 Aug 2015 12:10:00 +0100 + +vym (2.4.5.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Fri, 24 Jul 2015 16:10:00 +0100 + +vym (2.4.3.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Sun, 17 May 2015 11:30:00 +0100 + +vym (2.4.1.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Tue, 05 May 2015 16:30:00 +0100 + +vym (2.4.0.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Sat, 26 Apr 2015 16:30:00 +0100 + +vym (2.4.0.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Mon, 28 Oct 2014 16:30:00 +0100 + vym (2.3.24.1) unstable; urgency=low * New upstream release - -- Uwe Drechsel Tue, 29 Jul 2014 14:28:00 +0100 + -- Uwe Drechsel Mon, 28 Jul 2014 15:00:00 +0100 + +vym (2.3.22.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Wed, 12 Feb 2014 15:00:00 +0100 vym (2.3.20.1) unstable; urgency=low @@ -428,4 +470,4 @@ vym (1.7.0-1) unstable; urgency=low -- Steffen Joeris Thu, 4 Aug 2005 17:58:32 +0200 - + \ No newline at end of file diff --git a/makedist.config b/makedist.config index cff4d8a..571ecbd 100644 --- a/makedist.config +++ b/makedist.config @@ -1,3 +1,3 @@ -VERSION=2.3.24 -BRANCH="master" +VERSION=2.4.6 +BRANCH="qt5" REMOTE="sf" diff --git a/vym-2.3.24.tar.bz2 b/vym-2.3.24.tar.bz2 deleted file mode 100644 index ebd4fcb..0000000 --- a/vym-2.3.24.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b719521b97cd1cf1ab881a46325519bd9c48191537eadac8d4251a08a0741e06 -size 6738245 diff --git a/vym-2.4.6.tar.bz2 b/vym-2.4.6.tar.bz2 new file mode 100644 index 0000000..b912bea --- /dev/null +++ b/vym-2.4.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:725528da6b271233a660b41cbdff6c758b33d62b7ed459ea54f8a0bb3d19b043 +size 6726126 diff --git a/vym.changes b/vym.changes index 92bcf07..91fc773 100644 --- a/vym.changes +++ b/vym.changes @@ -1,6 +1,36 @@ -------------------------------------------------------------------- +Tue Aug 18 13:10:00 CEST 2015 - vym@insilmaril.de +- Version 2.4.6 + +Fri Jul 24 16:10:00 CEST 2015 - vym@insilmaril.de +- Version 2.4.5 + +Sun May 17 11:30:00 CET 2015 - vym@insilmaril.de +- Version 2.4.3 + +Tue May 05 16:30:00 CET 2015 - vym@insilmaril.de +- Version 2.4.2 + +Mon Oct 27 16:30:00 CET 2014 - uwedr@suse.de +- Version 2.4.0 +- Update to Qt 5 +- Preliminary support of checking for updates + and release notes online + +Mon Oct 27 15:30:00 CEST 2014 - uwedr@suse.de +- Version 2.3.24 +- Added updated translation by Pavel Fric +- When changing sleep time of finished task, also set task state to 'WIP'. +- Bugfix: Restore saved toolbar configuration +- Bugfix: #65 Missing break statemens in parser + Fri Sep 5 00:57:51 UTC 2014 - chris@computersalat.de +- Version 2.3.22 +- French translation by Marc Sert +- Feature: Improved xlinks with arrowheads +- Feature: Task priority increases slightly with age of tasks +- Some more includes to ease Debian packaging (by p0llux) +- Patch to allow hardening in Debian by p0llux - update to 2.3.24 * Added updated translation by Pavel Fric * Bugfix: Restore saved toolbar configuration @@ -27,8 +57,7 @@ Fri Sep 5 00:57:51 UTC 2014 - chris@computersalat.de * Some more includes to ease Debain packaging (by p0llux) * Patch to allow hardening in Debian by p0llux * Fixed project file - -------------------------------------------------------------------- + Fri Sep 13 15:50:00 CEST 2013 - uwedr@suse.de - Version 2.3.20 diff --git a/vym.dsc b/vym.dsc index 2fc1b09..0925b9d 100644 --- a/vym.dsc +++ b/vym.dsc @@ -1,9 +1,9 @@ Format: 1.0 Source: vym -Version: 2.3.24 +Version: 2.4.0 Binary: vym Maintainer: Uwe Drechsel Architecture: any -Build-Depends: debhelper (>= 4.1.16),g++, libqt4-dev +Build-Depends: debhelper (>= 4.1.16),g++, libqt5-dev Files: - af20857e1561468436ec9e738867bc74 20140729 vym-2.3.24.tar.bz2 + 4116086282d260056458a8b96b2d5459 20171606 vym-1.13.32.tar.bz2 \ No newline at end of file diff --git a/vym.spec b/vym.spec index a1b93b9..cfd1d82 100644 --- a/vym.spec +++ b/vym.spec @@ -1,7 +1,7 @@ # # spec file for package vym # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,14 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: vym + +BuildRequires: libQt5Core-devel +BuildRequires: libQt5Gui-devel +BuildRequires: libqt5-qtbase-devel +#BuildRequires: libqt5-qtbase-common-devel +BuildRequires: libqt5-qtsvg-devel +BuildRequires: libqt5-linguist-devel +BuildRequires: update-desktop-files +Requires: unzip +Requires: zip +Url: http://www.insilmaril.de/vym/index.html +BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: View Your Mind - generate and manipulate maps which show your thoughts License: GPL-2.0 Group: Productivity/Office/Other -Version: 2.3.24 +Version: 2.4.6 Release: 0 -Url: http://www.insilmaril.de/vym/index.html Source0: %name-%version.tar.bz2 Source1: %name.xml Source2: %name.desktop @@ -30,11 +40,6 @@ Source3: x-%name.desktop Source4: debian.dirs Source5: debian.docs Source6: makedist.config -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libqt4-devel -BuildRequires: update-desktop-files -Requires: unzip -Requires: zip %description VYM (View Your Mind) is a tool to generate and manipulate maps which @@ -43,21 +48,28 @@ and effectivity. You can use them for time management, to organize tasks, to get an overview over complex contexts, to sort your ideas etc. Some people even think it is fun to work with such maps... + + +Authors: +-------- + Uwe Drechsel + %prep %setup -q %build -qmake -o Makefile vym.pro PREFIX=%_prefix CONFIG+=RELEASE +qmake-qt5 -o Makefile vym.pro PREFIX=%_prefix/share BINDIR=%_prefix/bin CONFIG+=RELEASE make -lrelease vym.pro +lrelease-qt5 vym.pro %install +mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/vym mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/pixmaps install -m 0644 icons/vym.png $RPM_BUILD_ROOT%{_prefix}/share/pixmaps mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} -install -m 0644 README.txt LICENSE.txt INSTALL.txt $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} +install -m 0644 README.md LICENSE.txt INSTALL.txt $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} install -m 0644 doc/*.pdf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} -%makeinstall INSTALL_ROOT=$RPM_BUILD_ROOT +%makeinstall INSTALL_ROOT=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/usr/share/applications install -Dm644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/applications @@ -83,6 +95,7 @@ fi /usr/share/pixmaps/* /usr/bin/vym /usr/share/vym + %doc %{_docdir}/%{name} %doc %{_mandir}/*/* %{_datadir}/mime/packages/vym.xml From 4489ad3ea230b8828e4bbd3a8f0cb0fb9672a2da1069af9299dab70ca68e25d2 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Thu, 3 Sep 2015 15:18:18 +0000 Subject: [PATCH 2/2] Accepting request 326436 from home:insilmaril Readded --- to .changes to (hopefully) fix format OBS-URL: https://build.opensuse.org/request/show/326436 OBS-URL: https://build.opensuse.org/package/show/editors/vym?expand=0&rev=41 --- debian.changelog | 6 ++++++ makedist.config | 2 +- vym-2.4.6.tar.bz2 | 3 --- vym-2.4.7.tar.bz2 | 3 +++ vym.changes | 11 +++++++++++ vym.spec | 2 +- 6 files changed, 22 insertions(+), 5 deletions(-) delete mode 100644 vym-2.4.6.tar.bz2 create mode 100644 vym-2.4.7.tar.bz2 diff --git a/debian.changelog b/debian.changelog index 357cfd5..b4b125e 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,9 @@ +vym (2.4.7.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Mon, 24 Aug 2015 12:10:00 +0100 + vym (2.4.6.1) unstable; urgency=low * New upstream release diff --git a/makedist.config b/makedist.config index 571ecbd..f97d9ca 100644 --- a/makedist.config +++ b/makedist.config @@ -1,3 +1,3 @@ -VERSION=2.4.6 +VERSION=2.4.7 BRANCH="qt5" REMOTE="sf" diff --git a/vym-2.4.6.tar.bz2 b/vym-2.4.6.tar.bz2 deleted file mode 100644 index b912bea..0000000 --- a/vym-2.4.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:725528da6b271233a660b41cbdff6c758b33d62b7ed459ea54f8a0bb3d19b043 -size 6726126 diff --git a/vym-2.4.7.tar.bz2 b/vym-2.4.7.tar.bz2 new file mode 100644 index 0000000..63fc2ec --- /dev/null +++ b/vym-2.4.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f8824db7b4b3c2f92e7cf13b5c209e42db3f38046cabdacd9ff8186c757b804 +size 6740396 diff --git a/vym.changes b/vym.changes index 91fc773..4e3e09c 100644 --- a/vym.changes +++ b/vym.changes @@ -1,21 +1,31 @@ +------------------------------------------------------------------- +Mon Aug 24 13:10:00 CEST 2015 - vym@insilmaril.de +- Version 2.4.7 + +------------------------------------------------------------------- Tue Aug 18 13:10:00 CEST 2015 - vym@insilmaril.de - Version 2.4.6 +------------------------------------------------------------------- Fri Jul 24 16:10:00 CEST 2015 - vym@insilmaril.de - Version 2.4.5 +------------------------------------------------------------------- Sun May 17 11:30:00 CET 2015 - vym@insilmaril.de - Version 2.4.3 +------------------------------------------------------------------- Tue May 05 16:30:00 CET 2015 - vym@insilmaril.de - Version 2.4.2 +------------------------------------------------------------------- Mon Oct 27 16:30:00 CET 2014 - uwedr@suse.de - Version 2.4.0 - Update to Qt 5 - Preliminary support of checking for updates and release notes online +------------------------------------------------------------------- Mon Oct 27 15:30:00 CEST 2014 - uwedr@suse.de - Version 2.3.24 - Added updated translation by Pavel Fric @@ -23,6 +33,7 @@ Mon Oct 27 15:30:00 CEST 2014 - uwedr@suse.de - Bugfix: Restore saved toolbar configuration - Bugfix: #65 Missing break statemens in parser +------------------------------------------------------------------- Fri Sep 5 00:57:51 UTC 2014 - chris@computersalat.de - Version 2.3.22 diff --git a/vym.spec b/vym.spec index cfd1d82..71221c1 100644 --- a/vym.spec +++ b/vym.spec @@ -31,7 +31,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: View Your Mind - generate and manipulate maps which show your thoughts License: GPL-2.0 Group: Productivity/Office/Other -Version: 2.4.6 +Version: 2.4.7 Release: 0 Source0: %name-%version.tar.bz2 Source1: %name.xml