r36840 - in /packages/texmaker/trunk/debian: changelog control patches/ patches/10_spelling_dict.patch patches/series rules

[tille at users.alioth.debian.org]

Author: tille
Date: Thu Aug 26 11:54:53 2010
New Revision: 36840

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36840
Log:
New upstream release; fix #591340

Added:
    packages/texmaker/trunk/debian/patches/
    packages/texmaker/trunk/debian/patches/10_spelling_dict.patch
    packages/texmaker/trunk/debian/patches/series
Modified:
    packages/texmaker/trunk/debian/changelog
    packages/texmaker/trunk/debian/control
    packages/texmaker/trunk/debian/rules

Modified: packages/texmaker/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/changelog?rev=36840&op=diff
==============================================================================
--- packages/texmaker/trunk/debian/changelog (original)
+++ packages/texmaker/trunk/debian/changelog Thu Aug 26 11:54:53 2010
@@ -1,11 +1,14 @@
-texmaker (2.0-1) UNRELEASED; urgency=low
-
-  FIXME: Needs to verify #591340
+texmaker (2.0-1) unstable; urgency=low
+
   * New upstream version
   * Standards-Version bumped to 3.9.1 (no changes)
   * Build-Depends: libpoppler-qt4-dev
-
- -- Andreas Tille <tille at debian.org>  Tue, 17 Aug 2010 15:47:25 +0200
+  * 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>  Thu, 26 Aug 2010 13:17:52 +0200
 
 texmaker (1.9.9-2) unstable; urgency=low
 

Modified: packages/texmaker/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/control?rev=36840&op=diff
==============================================================================
--- packages/texmaker/trunk/debian/control (original)
+++ packages/texmaker/trunk/debian/control Thu Aug 26 11:54:53 2010
@@ -5,7 +5,8 @@
 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/

Added: 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=36840&op=file
==============================================================================
--- packages/texmaker/trunk/debian/patches/10_spelling_dict.patch (added)
+++ packages/texmaker/trunk/debian/patches/10_spelling_dict.patch Thu Aug 26 11:54:53 2010
@@ -1,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");

Added: packages/texmaker/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/patches/series?rev=36840&op=file
==============================================================================
--- packages/texmaker/trunk/debian/patches/series (added)
+++ packages/texmaker/trunk/debian/patches/series Thu Aug 26 11:54:53 2010
@@ -1,0 +1,1 @@
+10_spelling_dict.patch

Modified: packages/texmaker/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/rules?rev=36840&op=diff
==============================================================================
--- packages/texmaker/trunk/debian/rules (original)
+++ packages/texmaker/trunk/debian/rules Thu Aug 26 11:54:53 2010
@@ -4,7 +4,8 @@
 data=$(pkg)-data
 
 %:
-	dh $@
+	dh $@ --with quilt
+
 clean:
 	dh clean --before dh_auto_clean
 	[ ! -f Makefile ] || $(MAKE) distclean