Refresh patches and update d/changelog

diff --git a/.gitignore b/.gitignore
index 0bc7feedd9d2155bf47dcfa6862a3c591711536a..abeeb839fae8c8cd488f6a205e8fc435cc22a225 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 CMakeLists.txt.orig
-src/fft.cpp.orig
\ No newline at end of file
+src/fft.cpp.orig

diff --git a/debian/changelog b/debian/changelog
index 0f07307c10e55a67cc4270a5bdae970fb8de1ed1..0ec93f4bb7ca3cbb5e298204ab60175446dbbaaa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-mathgl (2.3.3-1) UNRELEASED; urgency=medium
+mathgl (2.3.3-1) unstable; urgency=medium
 
-  * Imported Upstream version 2.3.3
+  * Imported Upstream version 2.3.3 (Closes: #788776)
+  * Transition from Qt4 to Qt5 (Closes: #784495)
+  * Add libqt5opengl5-dev and libxcursor-dev to BD to achieve build in a sid chroot
+  * Set compat=9
+  * Fix several dep5 related issues in d/copyright
 
- -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Sat, 18 Jul 2015 17:37:08 +0300
+ -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Sat, 29 Aug 2015 03:52:28 +0300
 
 mathgl (2.3.2-1) experimental; urgency=medium
 

diff --git a/debian/patches/CMakeLists.patch b/debian/patches/CMakeLists.patch
index cca3355cdc51ec2a1281e1dfefc6ec688dd15329..f577a3489b4949674c4747cf7cf255f63587cdee 100644 (file)
--- a/debian/patches/CMakeLists.patch
+++ b/debian/patches/CMakeLists.patch
@@ -1,4 +1,4 @@
-Selection of enabled features and implementation of hardening flags during build
+Selection of enabled features during build
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -63,16 +63,16 @@

diff --git a/debian/patches/series b/debian/patches/series
index 879efc60a8a4db097640c5d520443f2b9e7c3eb7..ba9f3313fd222e35290637bfa354fbb4d701add6 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 CMakeLists.patch
+udav.patch

diff --git a/debian/patches/udav.patch b/debian/patches/udav.patch
new file mode 100644 (file)
index 0000000..80b15c0
--- /dev/null
+++ b/debian/patches/udav.patch
@@ -0,0 +1,16 @@
+Add file argument to udav Exec and Keywords entry
+--- a/udav/udav.desktop
++++ b/udav/udav.desktop
+@@ -4,9 +4,10 @@
+ Terminal=false
+ Icon=udav
+ Name=UDAV
+-Exec=udav
++Exec=udav %f
+ MimeType=text/mgl;
+ Comment=Data handling and plotting tool
+ Comment[en_US]=Data handling and plotting tool
+ Comment[ru_RU]=Обработка и отображение данных
+ Categories=Education;Science;Math;
++Keywords=Visualisation;Data;Array;
+\ No newline at end of file

diff --git a/udav/udav.desktop b/udav/udav.desktop
index 3565b805ad61a3d5eaa0b2e2349defb695164282..bec1009d2af0ca1614034ee44c798b0ae991a719 100755 (executable)
--- a/udav/udav.desktop
+++ b/udav/udav.desktop
@@ -4,9 +4,10 @@ Type=Application
 Terminal=false
 Icon=udav
 Name=UDAV
-Exec=udav
+Exec=udav %f
 MimeType=text/mgl;
 Comment=Data handling and plotting tool
 Comment[en_US]=Data handling and plotting tool
 Comment[ru_RU]=Обработка и отображение данных
 Categories=Education;Science;Math;
+Keywords=Visualisation;Data;Array;
\ No newline at end of file