r44019 - in /packages/texmaker/trunk/debian: changelog control patches/10_spelling_dict.patch patches/20_gcc_4.6.patch patches/series

[tille at users.alioth.debian.org]

Author: tille
Date: Tue Nov  8 14:54:27 2011
New Revision: 44019

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44019
Log:
New upstream version; make sure path to spelling directory will be found

Modified:
    packages/texmaker/trunk/debian/changelog
    packages/texmaker/trunk/debian/control
    packages/texmaker/trunk/debian/patches/10_spelling_dict.patch
    packages/texmaker/trunk/debian/patches/20_gcc_4.6.patch
    packages/texmaker/trunk/debian/patches/series

Modified: packages/texmaker/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/changelog?rev=44019&op=diff
==============================================================================
--- packages/texmaker/trunk/debian/changelog (original)
+++ packages/texmaker/trunk/debian/changelog Tue Nov  8 14:54:27 2011
@@ -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

Modified: packages/texmaker/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/control?rev=44019&op=diff
==============================================================================
--- packages/texmaker/trunk/debian/control (original)
+++ packages/texmaker/trunk/debian/control Tue Nov  8 14:54:27 2011
@@ -8,8 +8,8 @@
 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

Modified: packages/texmaker/trunk/debian/patches/10_spelling_dict.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/patches/10_spelling_dict.patch?rev=44019&op=diff
==============================================================================
--- packages/texmaker/trunk/debian/patches/10_spelling_dict.patch (original)
+++ packages/texmaker/trunk/debian/patches/10_spelling_dict.patch Tue Nov  8 14:54:27 2011
@@ -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 

Modified: packages/texmaker/trunk/debian/patches/20_gcc_4.6.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/patches/20_gcc_4.6.patch?rev=44019&op=diff
==============================================================================
--- packages/texmaker/trunk/debian/patches/20_gcc_4.6.patch (original)
+++ packages/texmaker/trunk/debian/patches/20_gcc_4.6.patch Tue Nov  8 14:54:27 2011
@@ -6,8 +6,8 @@
 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_

Modified: packages/texmaker/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/patches/series?rev=44019&op=diff
==============================================================================
--- packages/texmaker/trunk/debian/patches/series (original)
+++ packages/texmaker/trunk/debian/patches/series Tue Nov  8 14:54:27 2011
@@ -1,2 +1,3 @@
 10_spelling_dict.patch
 20_gcc_4.6.patch
+20_spelling_default_dict.patch