[texmaker] 06/103: Use reasonable default path to spelling dictionary, recommend packages providing dictionaries

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository texmaker.

commit 9dc4eaaa336f68ce24afc08d5f89ba5acc54adb2
Author: Andreas Tille <tille at debian.org>
Date:   Wed Jun 18 11:45:27 2008 +0000

    Use reasonable default path to spelling dictionary, recommend packages providing dictionaries
---
 debian/changelog                   |  9 +++++++--
 debian/control                     |  5 +++--
 debian/patches/10_spell_dict.patch | 22 ++++++++++++++++++++++
 debian/patches/series              |  1 +
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5794077..9c5f125 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
-texmaker (1.7.1-2) UNRELEASED; urgency=low
+texmaker (1.7.1-2) unstable; urgency=low
 
   * Fixed watch file (thanks to Riccardo Stagni <unriccio at email.it>)
     Closes: #483796
+  * Reasonable setting for spelling dictionary and better error
+    message, if dictionary was not found
+  * Recommends: hunspell-dictionary | openoffice.org-spellcheck-de-de |
+     myspell-dictionary | hunspell-en-us
+  * Standards-Version: 3.8.0 (no changes needed)
 
- -- Andreas Tille <tille at debian.org>  Sun, 01 Jun 2008 20:51:36 +0200
+ -- Andreas Tille <tille at debian.org>  Wed, 18 Jun 2008 12:57:21 +0200
 
 texmaker (1.7.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index cfcde60..821ac22 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ DM-Upload-Allowed: yes
 Uploaders: Joseph Smidt <jsmidt at byu.edu>,
  Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 5.0.51), libqt4-dev (>=4.3), libglib2.0-dev, quilt
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/texmaker/trunk/
 Homepage: http://www.xm1math.net/texmaker/
@@ -14,7 +14,8 @@ Homepage: http://www.xm1math.net/texmaker/
 Package: texmaker
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: aspell, gs-gpl | gs-esp | gs-afpl, netpbm, psutils, tetex-extra | texlive-latex-extra
+Recommends: aspell, gs-gpl | gs-esp | gs-afpl, netpbm, psutils, tetex-extra | texlive-latex-extra,
+ hunspell-dictionary | openoffice.org-spellcheck-de-de | myspell-dictionary | hunspell-en-us
 Description: A Cross-Platform LaTeX Editor
  Texmaker is a clean, highly configurable LaTeX editor with good hot key 
  support and extensive Latex documentation. Texmaker integrates many tools 
diff --git a/debian/patches/10_spell_dict.patch b/debian/patches/10_spell_dict.patch
new file mode 100644
index 0000000..f22cf2f
--- /dev/null
+++ b/debian/patches/10_spell_dict.patch
@@ -0,0 +1,22 @@
+--- texmaker-1.7.1.orig/spellerdialog.cpp
++++ texmaker-1.7.1/spellerdialog.cpp
+@@ -55,7 +55,7 @@
+ c = editor->textCursor();
+ QFileInfo fi(SpellDic);
+ if (fi.exists() && fi.isReadable()) spellingInit();
+-else ui.labelMessage->setText("<b>"+tr("Error : Can't open the dictionary")+"</b>");
++else ui.labelMessage->setText("<b>"+tr("Error : Can't open the dictionary ")+SpellDic+"\nYou can set the dictionary in Options / Configure Texmaker / Editor.</b>");
+ }
+ 
+ SpellerDialog::~SpellerDialog(){
+--- texmaker-1.7.1.orig/texmaker.cpp
++++ texmaker-1.7.1/texmaker.cpp
+@@ -2269,7 +2269,7 @@
+ author=config->value("Quick/Author","").toString();
+ 
+ #if defined( Q_WS_X11 )
+-QString dicDir=PREFIX"/share/texmaker/";
++QString dicDir=PREFIX"/share/myspell/dicts/";
+ #endif
+ #if defined( Q_WS_MACX )
+ QString dicDir=QCoreApplication::applicationDirPath() + "/../Resources/";
diff --git a/debian/patches/series b/debian/patches/series
index c4df3fd..5d1469d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 20_texmaker_desktop.patch
+10_spell_dict.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/texmaker.git