[texmaker] 50/103: New upstream version; make sure path to spelling directory will be found

[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 3cb3ea6d18d9d52dfaca0f755b761bb7e9b001c7
Author: Andreas Tille <tille at debian.org>
Date:   Tue Nov 8 14:54:27 2011 +0000

    New upstream version; make sure path to spelling directory will be found
---
 debian/changelog                      | 13 +++++++++++++
 debian/control                        |  4 ++--
 debian/patches/10_spelling_dict.patch | 20 ++++++++++----------
 debian/patches/20_gcc_4.6.patch       |  4 ++--
 debian/patches/series                 |  1 +
 5 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c1825c6..fccba47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+texmaker (3.1-1) unstable; urgency=low
+
+  * New upstream version
+    Closes: #647948
+  * Fixed Vcs fields
+  * debian/patches/10_spelling_dict.patch: Set variable provided by
+    upstream in config instead of patching real code
+  * debian/patches/20_spelling_default_dict.patch: Seems that there
+    is another place to fix spelling directory:
+    Closes: #638286
+
+ -- Andreas Tille <tille at debian.org>  Tue, 08 Nov 2011 13:43:42 +0100
+
 texmaker (3.0.2-2) unstable; urgency=low
 
   * Enable separate arch all/any builds as it was requested
diff --git a/debian/control b/debian/control
index 7ee1e00..712619e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,8 @@ Uploaders: Andreas Tille <tille at debian.org>,
 Build-Depends: debhelper (>= 8), libqt4-dev (>=4.5.1), libglib2.0-dev, libpoppler-qt4-dev,
  quilt (>= 0.47), libqtwebkit-dev
 Standards-Version: 3.9.2
-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/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-science/packages/texmaker/trunk/
 Homepage: http://www.xm1math.net/texmaker/
 
 Package: texmaker
diff --git a/debian/patches/10_spelling_dict.patch b/debian/patches/10_spelling_dict.patch
index b8d5a82..6dd8a0b 100644
--- a/debian/patches/10_spelling_dict.patch
+++ b/debian/patches/10_spelling_dict.patch
@@ -1,14 +1,14 @@
 Author: Andreas Tille <tille at debian.org>
 Purpose: Adapt default search directory for spelling dictionaries to Debian default
 Closes: #591340
---- texmaker-3.0.orig/configdialog.cpp
-+++ texmaker-3.0/configdialog.cpp
-@@ -124,7 +124,7 @@
- #ifdef DEBIAN_SPELLDIR
- QDir spelldir(PREFIX"/share/myspell/dicts");
- #else
--QDir spelldir(PREFIX"/share/texmaker");
-+QDir spelldir(PREFIX"/share/myspell/dicts");
- #endif
- #endif
+--- texmaker-3.1.orig/texmaker.pro
++++ texmaker-3.1/texmaker.pro
+@@ -268,7 +268,7 @@
+ DEFINES += PREFIX=\\\"$${PREFIX}\\\"
+ target.path = $${PREFIX}/bin
  
+-#DEFINES += DEBIAN_SPELLDIR
++DEFINES += DEBIAN_SPELLDIR
+ 
+ INSTALLS = target
+ HEADERS	+= x11fontdialog.h 
diff --git a/debian/patches/20_gcc_4.6.patch b/debian/patches/20_gcc_4.6.patch
index 3307856..ca4b924 100644
--- a/debian/patches/20_gcc_4.6.patch
+++ b/debian/patches/20_gcc_4.6.patch
@@ -6,8 +6,8 @@ Author: Maia Kozheva <sikon at ubuntu.com>
 Bug-Debian: http://bugs.debian.org/624611
 Last-Update: 2011-04-30
 ---
---- texmaker-3.0.2.orig/hunspell/htypes.hxx
-+++ texmaker-3.0.2/hunspell/htypes.hxx
+--- texmaker-3.1.orig/hunspell/htypes.hxx
++++ texmaker-3.1/hunspell/htypes.hxx
 @@ -1,6 +1,8 @@
  #ifndef _HTYPES_HXX_
  #define _HTYPES_HXX_
diff --git a/debian/patches/series b/debian/patches/series
index 89a07ae..f62e8f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 10_spelling_dict.patch
 20_gcc_4.6.patch
+20_spelling_default_dict.patch

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