[Pkg-octave-commit] [SCM] Debian packaging for qtoctave branch, master, updated. 0d68594af4970d820d8eb4918a0f64866919870e

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 0dd97aaa1a244834ce3ee5f6796afce704104b53
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Sun Aug 21 16:40:08 2011 +0200

    Fix *.m filename filters in file dialogs

diff --git a/debian/changelog b/debian/changelog
index 2066781..870a141 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ qtoctave (0.10.1-2) UNRELEASED; urgency=low
 
   * Fix name of stub manpage for qtoctave-info-reader (was incorrectly
     named qtinfo.1)
+  * debian/patches/filedialog-filters: new patch, fixes *.m filename
+    filters in file dialogs (closes: #620062)
 
- -- Sébastien Villemot <sebastien.villemot at ens.fr>  Sun, 21 Aug 2011 16:09:01 +0200
+ -- Sébastien Villemot <sebastien.villemot at ens.fr>  Sun, 21 Aug 2011 16:32:05 +0200
 
 qtoctave (0.10.1-1) unstable; urgency=low
 
diff --git a/debian/patches/filedialog-filters b/debian/patches/filedialog-filters
new file mode 100644
index 0000000..19ddbd2
--- /dev/null
+++ b/debian/patches/filedialog-filters
@@ -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/debian/patches/series b/debian/patches/series
index eaf77e2..116a674 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 use_octave_htmldoc
 build-out-of-source
 build-widgetserver
+filedialog-filters

-- 
Debian packaging for qtoctave