[texmaker] 38/103: New upstream release; fix #591340

[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 5afcd00dd04ab6e2ce772e0c3fde0bdc076e3043
Author: Andreas Tille <tille at debian.org>
Date:   Thu Aug 26 11:54:53 2010 +0000

    New upstream release; fix #591340
---
 debian/changelog                      |  9 ++++++---
 debian/control                        |  3 ++-
 debian/patches/10_spelling_dict.patch | 14 ++++++++++++++
 debian/patches/series                 |  1 +
 debian/rules                          |  3 ++-
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7aba1db..d0b2d0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,14 @@
-texmaker (2.0-1) UNRELEASED; urgency=low
+texmaker (2.0-1) unstable; urgency=low
 
-  FIXME: Needs to verify #591340
   * New upstream version
   * Standards-Version bumped to 3.9.1 (no changes)
   * Build-Depends: libpoppler-qt4-dev
+  * Build-Depends quilt and "--with quilt" in debian/rules
+  * debian/patches/10_spelling_dict.patch: set default to seek for
+    a dictionaries to /usr/share/myspell/dicts
+    Closes: #591340
 
- -- Andreas Tille <tille at debian.org>  Tue, 17 Aug 2010 15:47:25 +0200
+ -- Andreas Tille <tille at debian.org>  Thu, 26 Aug 2010 13:17:52 +0200
 
 texmaker (1.9.9-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 45bff9c..4f434af 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,8 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>,
  Ruben Molina <rmolina at udea.edu.co>
-Build-Depends: debhelper (>= 7.0.50~), libqt4-dev (>=4.5.1), libglib2.0-dev, libpoppler-qt4-dev
+Build-Depends: debhelper (>= 7.0.50~), libqt4-dev (>=4.5.1), libglib2.0-dev, libpoppler-qt4-dev,
+ quilt (>= 0.47)
 Standards-Version: 3.9.1
 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/
diff --git a/debian/patches/10_spelling_dict.patch b/debian/patches/10_spelling_dict.patch
new file mode 100644
index 0000000..cb67c24
--- /dev/null
+++ b/debian/patches/10_spelling_dict.patch
@@ -0,0 +1,14 @@
+Author: Andreas Tille <tille at debian.org>
+Purpose: Adapt default search directory for spelling dictionaries to Debian default
+Closes: #591340
+--- texmaker-2.0.orig/configdialog.cpp
++++ texmaker-2.0/configdialog.cpp
+@@ -116,7 +116,7 @@
+ void ConfigDialog::browseAspell()
+ {
+ #if defined( Q_WS_X11 )
+-QDir spelldir(PREFIX"/share/texmaker");
++QDir spelldir(PREFIX"/share/myspell/dicts");
+ #endif
+ #if defined( Q_WS_MACX )
+ QDir spelldir(QCoreApplication::applicationDirPath() + "/../Resources");
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..dc14f3e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10_spelling_dict.patch
diff --git a/debian/rules b/debian/rules
index 603b8e5..3f9d439 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,8 @@ pkg=texmaker
 data=$(pkg)-data
 
 %:
-	dh $@
+	dh $@ --with quilt
+
 clean:
 	dh clean --before dh_auto_clean
 	[ ! -f Makefile ] || $(MAKE) distclean

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