[qtoctave] * Thu Oct 6 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.10.1-4 - fix *.m filters in file dialogs

[Kevin Kofler]

commit a6ae5a7c0c2038b4473821b39534836eb94483c3
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Thu Oct 6 19:21:37 2011 +0200

    * Thu Oct  6 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.10.1-4
    - fix *.m filters in file dialogs (debian#620062, patch by Sébastien Villemot)

 qtoctave-0.10.1-filedialog-filters.patch |   37 ++++++++++++++++++++++++++++++
 qtoctave.spec                            |   10 ++++++-
 2 files changed, 45 insertions(+), 2 deletions(-)
---
diff --git a/qtoctave-0.10.1-filedialog-filters.patch b/qtoctave-0.10.1-filedialog-filters.patch
new file mode 100644
index 0000000..19ddbd2
--- /dev/null
+++ b/qtoctave-0.10.1-filedialog-filters.patch
@@ -0,0 +1,37 @@
+Description: Fix *.m filename filters in file dialogs
+ Not forwarded to upstream since upstream author stopped development.
+Author: Sébastien Villemot <sebastien.villemot at ens.fr>
+Bug-Debian: http://bugs.debian.org/620062
+Forwarded: no
+Last-Update: 2011-08-21
+--- a/qtoctave/src/editor.cpp
++++ b/qtoctave/src/editor.cpp
+@@ -295,7 +295,7 @@
+ {
+   QStringList filters;
+ 
+-  filters << "Octave (*.m; *.M)"
++  filters << "Octave (*.m *.M)"
+ 	  << "Plain text (*.txt)"
+ 	  << "All files (*)";
+ 
+@@ -475,7 +475,7 @@
+ 		QFileDialog openDialog(this, tr("Open") /*Qt::Dialog*/);
+ 
+ 		QStringList filters;
+-		filters << "Octave (*.m; *.M)"
++		filters << "Octave (*.m *.M)"
+ 			<< "Plain text (*.txt)"
+ 			<< "All files (*)";
+ 
+--- a/qtoctave/src/main.cpp
++++ b/qtoctave/src/main.cpp
+@@ -308,7 +308,7 @@
+   QFileDialog openDialog(NULL, tr("Open"), ".");
+   QStringList filters;
+ 
+-  filters << "Octave (*.m; *.M)";
++  filters << "Octave (*.m *.M)";
+ 
+   openDialog.setFilters(filters);
+   openDialog.setAcceptMode(QFileDialog::AcceptOpen);
diff --git a/qtoctave.spec b/qtoctave.spec
index e48ac7d..a12931b 100644
--- a/qtoctave.spec
+++ b/qtoctave.spec
@@ -1,6 +1,6 @@
 Name:           qtoctave
 Version:        0.10.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Frontend for Octave
 
 Group:          Applications/Engineering
@@ -18,13 +18,16 @@ Requires:       octave >= 3.2.0
 
 # place qtoctave_doc and qtoctave-utils in qtoctave datadir
 Patch0:         qtoctave-doc-path.patch
+# fix *.m filters in file dialogs (debian#620062, patch by Sébastien Villemot)
+Patch1:         qtoctave-0.10.1-filedialog-filters.patch
 
 %description
 QtOctave is a frontend for Octave based on Qt4.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .doc-path
+%patch1 -p1 -b .filedialog-filters
 
 sed -i 's|"lrelease"|"lrelease-qt4"|g' qtoctave/src/CMakeLists.txt
 
@@ -85,6 +88,9 @@ fi
 %exclude %{_datadir}/doc/octave-html
 
 %changelog
+* Thu Oct  6 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.10.1-4
+- fix *.m filters in file dialogs (debian#620062, patch by Sébastien Villemot)
+
 * Fri Apr  8 2011 Alexey Kurov <nucleo at fedoraproject.org> - 0.10.1-3
 - require qt4 version used at build time