[texmaker] 53/103: New upstream version

[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 e7b4021159a3bb8391b812b112903528c3a915b5
Author: Andreas Tille <tille at debian.org>
Date:   Fri Dec 23 14:09:14 2011 +0000

    New upstream version
---
 debian/changelog                              |  7 ++++---
 debian/patches/10_spelling_dict.patch         |  8 ++++----
 debian/patches/20_spelling_default_dict.patch | 18 ------------------
 debian/patches/series                         |  1 -
 4 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7dacb35..5a392d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-texmaker (3.1-2) UNRELEASED; urgency=low
+texmaker (3.2-1) unstable; urgency=low
 
-  * debian/patches/20_gcc_4.6.patch: Patch applied upstream
+  * New upstream version (updated patches and removed patches
+    applied upstream)
 
- -- Andreas Tille <tille at debian.org>  Thu, 10 Nov 2011 13:46:03 +0100
+ -- Andreas Tille <tille at debian.org>  Fri, 23 Dec 2011 13:48:08 +0100
 
 texmaker (3.1-1) unstable; urgency=low
 
diff --git a/debian/patches/10_spelling_dict.patch b/debian/patches/10_spelling_dict.patch
index 6dd8a0b..7745abf 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.1.orig/texmaker.pro
-+++ texmaker-3.1/texmaker.pro
-@@ -268,7 +268,7 @@
+--- texmaker-3.2.orig/texmaker.pro
++++ texmaker-3.2/texmaker.pro
+@@ -277,7 +277,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_spelling_default_dict.patch b/debian/patches/20_spelling_default_dict.patch
deleted file mode 100644
index 8795913..0000000
--- a/debian/patches/20_spelling_default_dict.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Purpose: Adapt default search directory for spelling dictionaries to Debian default
-Closes: #638286
---- texmaker-3.1.orig/texmaker.cpp
-+++ texmaker-3.1/texmaker.cpp
-@@ -3590,8 +3590,12 @@
- #ifdef USB_VERSION
- QString dicDir=QCoreApplication::applicationDirPath() + "/";
- #else
-+#ifdef DEBIAN_SPELLDIR
-+QString dicDir=PREFIX"/share/myspell/dicts/";
-+#else
- QString dicDir=PREFIX"/share/texmaker/";
- #endif
-+#endif
- 
- #endif
- #if defined( Q_WS_MACX )
diff --git a/debian/patches/series b/debian/patches/series
index f67d265..dc14f3e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 10_spelling_dict.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