diff --git a/debian.changelog b/debian.changelog
index 9a22d49..90a9410 100644
--- a/debian.changelog
+++ b/debian.changelog
@@ -1,3 +1,69 @@
+vym (2.2.0.1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Uwe Drechsel <vym@insilmaril.de> Wed, 13 Jun 2012 11:21:00 +0100
+
+vym (2.1.12.1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Uwe Drechsel <vym@insilmaril.de> Wed, 06 Jun 2012 14:00:00 +0100
+
+vym (2.1.11.1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Uwe Drechsel <vym@insilmaril.de> Mon, 20 Apr 2012 16:28:00 +0100
+
+vym (2.1.8.1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Uwe Drechsel <vym@insilmaril.de> Mon, 16 Apr 2012 16:22:00 +0100
+
+vym (2.1.7.1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Uwe Drechsel <vym@insilmaril.de> Fri, 13 Apr 2012 10:22:00 +0100
+
+vym (2.0.12-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Uwe Drechsel <vym@insilmaril.de> Thu, 10 Apr 2012 10:22:00 +0100
+
+vym (2.0.11-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Uwe Drechsel <vym@insilmaril.de> Thu, 05 Apr 2012 16:45:00 +0100
+
+vym (2.0.10-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Uwe Drechsel <vym@insilmaril.de> Wed, 28 Nov 2012 11:00:00 +0100
+
+vym (2.0.6-1) unstable; urgency=low
+
+ * Bugfix: Disappearing Umlauts when changing locale
+
+ -- Uwe Drechsel <vym@insilmaril.de> Tue, 22 Nov 2011 19:00:00 +0100
+
+vym (2.0.5-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Uwe Drechsel <vym@insilmaril.de> Tue, 22 Nov 2011 19:00:00 +0100
+
+vym (2.0.4-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Uwe Drechsel <vym@insilmaril.de> Sat, 18 Nov 2011 08:00:00 +0100
+
vym (2.0.1-1) unstable; urgency=low
* New upstream release
diff --git a/debian.dirs b/debian.dirs
new file mode 100644
index 0000000..9f77a62
--- /dev/null
+++ b/debian.dirs
@@ -0,0 +1,4 @@
+usr/bin
+usr/share
+usr/share/vym
+usr/share/pixmaps
diff --git a/debian.docs b/debian.docs
new file mode 100644
index 0000000..f957229
--- /dev/null
+++ b/debian.docs
@@ -0,0 +1,4 @@
+demos
+README.txt
+LICENSE.txt
+INSTALL.txt
\ No newline at end of file
diff --git a/debian.rules b/debian.rules
index ed26888..53bb56a 100644
--- a/debian.rules
+++ b/debian.rules
@@ -20,7 +20,8 @@ build-stamp:
dh_testdir
# Add here commands to compile the package.
- qmake -o Makefile vym.pro PREFIX=/usr/src/packages/BUILD/debian/vym CONFIG+=RELEASE
+ #qmake -o Makefile vym.pro PREFIX=/usr/src/packages/BUILD/debian/vym CONFIG+=RELEASE PREFIX=/usr/src/packages/BUILD/debian/vym/usr
+ qmake -o Makefile vym.pro CONFIG+=RELEASE PREFIX=/usr/src/packages/BUILD/debian/vym/usr
make
# --- end custom part for compiling
@@ -38,16 +39,18 @@ clean:
dh_clean
install: build
+ # Test for correct directory and existing control file
dh_testdir
+
+ # Ensure package is built as root
dh_testroot
+
dh_clean -k
dh_installdirs
# Add here commands to install the package
# The DESTDIR Has To Be Exactly /usr/src/packages/BUILD/debian/<nameOfPackage>
- make install DESTDIR=/usr/src/packages/BUILD/debian/vym
- #make install DESTDIR=/usr/src/packages/BUILD/debian/vym PREFIX=/usr/src/packages/BUILD/debian/vym
- #cp /usr/src/packages/BUILD/vym /usr/src/packages/BUILD/debian/vym
+ make install PREFIX=/usr/src/packages/BUILD/debian/vym/usr
# --- end custom part for installing
# Build architecture-independent files here.
@@ -56,33 +59,31 @@ binary-indep: build install
# Build architecture-dependent files here.
binary-arch: build install
- dh_testdir
- dh_testroot
# dh_installdebconf
- dh_installdocs
- dh_installexamples
+# dh_installdocs
+ #echo $(CURDIR)
+ #ls -lh /usr/src/packages/BUILD/debian/vym
+
+ #dh_installdocs *.txt
+ #dh_installdocs demos
+
+ # install binary at least
+ #install -m 0755 tmp/vym debian/vym/usr/bin
+ #mv vym debian/vym/usr/bin
+
+ #dh_install vym debian/vym/usr/bin
+ #dh_installexamples /usr/src/packages/BUILD/demos
dh_installmenu
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
- dh_installcron
- dh_installman
- dh_installinfo
-# dh_undocumented
dh_installchangelogs
dh_link
dh_strip
dh_compress
dh_fixperms
-# dh_makeshlibs
- dh_installdeb
-# dh_perl
+# dh_installdeb
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
\ No newline at end of file
+#.PHONY: build clean binary-indep binary-arch binary install
\ No newline at end of file
diff --git a/gcc47.patch b/gcc47.patch
deleted file mode 100644
index d31b9f8..0000000
--- a/gcc47.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: vym-2.0.1/mainwindow.cpp
-===================================================================
---- vym-2.0.1.orig/mainwindow.cpp
-+++ vym-2.0.1/mainwindow.cpp
-@@ -4,6 +4,7 @@
-
- #include <iostream>
- #include <typeinfo>
-+#include <unistd.h>
-
- #include "aboutdialog.h"
- #include "branchpropwindow.h"
diff --git a/makedist.config b/makedist.config
new file mode 100644
index 0000000..254e163
--- /dev/null
+++ b/makedist.config
@@ -0,0 +1,3 @@
+VERSION=2.2.0
+BRANCH="master"
+REMOTE="sf"
diff --git a/vym-2.0.1.tar.bz2 b/vym-2.0.1.tar.bz2
deleted file mode 100644
index 03ce64b..0000000
--- a/vym-2.0.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a281280ac867bb86aaa5162bdd0901fc549a012c03e28b8a84a3162f45012e10
-size 4291867
diff --git a/vym-2.2.0.tar.bz2 b/vym-2.2.0.tar.bz2
new file mode 100644
index 0000000..b1ac3fc
--- /dev/null
+++ b/vym-2.2.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:98ebf4f134a8e3ea0de8ce5853177edcdbef76a11a1156268fc167d2da40c6d1
+size 5166628
diff --git a/vym.changes b/vym.changes
index ab87375..ab03f21 100644
--- a/vym.changes
+++ b/vym.changes
@@ -1,7 +1,88 @@
-------------------------------------------------------------------
-Thu Mar 22 12:17:01 UTC 2012 - aj@suse.de
+Wed Jun 13 11:21:12 CEST 2012 - uwedr@suse.de
-- Fix build with gcc 4.7.
+- Version 2.2.0
+
+-------------------------------------------------------------------
+Tue Jun 12 20:23:53 CEST 2012 - uwedr@suse.de
+
+- Version 2.1.13
+
+-------------------------------------------------------------------
+Wed Jun 6 14:02:34 CEST 2012 - uwedr@suse.de
+
+- Version 2.1.12
+
+-------------------------------------------------------------------
+Fri Apr 20 16:27:10 CEST 2012 - uwedr@suse.de
+
+- Version 2.1.11
+
+-------------------------------------------------------------------
+Mon Apr 13 16:37:10 CEST 2012 - uwedr@suse.de
+
+- Version 2.1.8
+
+-------------------------------------------------------------------
+Fri Apr 13 13:37:10 CEST 2012 - uwedr@suse.de
+
+- Version 2.1.7
+
+-------------------------------------------------------------------
+Tue Apr 10 10:22:27 CEST 2012 - uwedr@suse.de
+
+- Version 2.0.12
+- On windows store settings local to app by Scott
+- Windows patches by Patrick Spendrin
+- Removed debug option
+- Replaced most of remaining cout by qDebug
+- Transparent background for vym icons
+
+-------------------------------------------------------------------
+Thu Apr 5 16:44:27 CEST 2012 - uwedr@suse.de
+
+- Version 2.0.11
+- Bugfix: Increasing number of (unused) images in zipfile
+
+-------------------------------------------------------------------
+Wed Mar 28 11:27:06 CEST 2012 - uwedr@suse.de
+
+- Version 2.0.10
+- Bugfix: gcc 4.7 by Andreas Jaeger
+- Bugfix: Qt 4.8 compilation issue with setDirectory
+- Feature: Czech translation by Pavel Fric
+- Bugfix: segmentation fault after deleting an xLink (vym-Bugs-3460040)
+- Bugfix: Filename must not change when saving only part of map (vym-Bugs-3459882)
+
+-------------------------------------------------------------------
+Wed Dec 14 19:17:06 CET 2011 - uwedr@suse.de
+
+- Version 2.0.6
+- Bugfix: Disappearing Umlauts when changing locale
+
+-------------------------------------------------------------------
+Tue Nov 22 19:16:41 CET 2011 - uwedr@suse.de
+
+- Version 2.0.5
+- added Giovanni Sora also to credits list
+
+-------------------------------------------------------------------
+Fri Nov 18 14:20:25 CET 2011 - uwedr@suse.de
+
+- Version 2.0.4
+- added Italian by Giovanni Sora
+
+-------------------------------------------------------------------
+Mon Nov 14 11:14:54 CET 2011 - uwedr@suse.de
+
+- Version 2.0.3
+- added Interlingua by Giovanni Sora
+
+-------------------------------------------------------------------
+Fri Oct 21 16:23:58 CEST 2011 - uwedr@suse.de
+
+- Version 2.0.2
+- Bugfix: ensure showing of complete LineEdit
-------------------------------------------------------------------
Sat Oct 15 13:30:19 CEST 2011 - uwedr@suse.de
diff --git a/vym.desktop b/vym.desktop
index 9338abe..64d3123 100644
--- a/vym.desktop
+++ b/vym.desktop
@@ -6,7 +6,15 @@ Name=VYM - View Your Mind
Name[de]=VYM - View Your Mind
Name[zh_TW]=心智檢視
GenericName=Planning and Brainstorming Tool
-Icon=vym
+Icon=vym.png
MimeType=application/x-vym;
Comment=Planning and brainstorming
Comment[zh_TW]=VYM 腦力激盪工具
+
+X-AppInstall-Package=vym
+X-AppInstall-Popcon=430
+X-AppInstall-Section=universe
+X-Ubuntu-Gettext-Domain=app-install-data
+Categories=Qt;KDE;Office;
+
+
diff --git a/vym.spec b/vym.spec
index 1149f44..7222496 100644
--- a/vym.spec
+++ b/vym.spec
@@ -1,5 +1,5 @@
#
-# spec file for package vym
+# spec file for package vym
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -15,26 +15,23 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
Name: vym
-
-BuildRequires: libqt4-devel
+BuildRequires: libqt4-devel
BuildRequires: update-desktop-files
+Requires: zip
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.0.1
-Release: 0
-#Patch: fix-midbutton.diff
+Url: http://www.insilmaril.de/vym/index.html
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+AutoReqProv: on
+Summary: View Your Mind - generate and manipulate maps which show your thoughts
+Version: 2.2.0
+Release: 1
Source0: %name-%version.tar.bz2
Source1: %name.xml
Source2: %name.desktop
Source3: x-%name.desktop
-Patch1: gcc47.patch
%description
VYM (View Your Mind) is a tool to generate and manipulate maps which
@@ -51,7 +48,6 @@ Authors:
%prep
%setup -q
-%patch1 -p1
%build
qmake -o Makefile vym.pro PREFIX=%_prefix CONFIG+=RELEASE