[texmaker] 45/103: Prepare new upstream version (does not yet build correctly)

[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 c88ef58e97d878d3c1752b45166ebb1ed639aa07
Author: Andreas Tille <tille at debian.org>
Date:   Wed Apr 6 06:29:54 2011 +0000

    Prepare new upstream version (does not yet build correctly)
---
 debian/changelog                              |   7 ++
 debian/patches/10_spelling_dict.patch         |  12 +--
 debian/patches/series                         |   1 -
 debian/patches/spelling-error-in-binary.patch | 122 --------------------------
 4 files changed, 13 insertions(+), 129 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 786f44a..ee73d31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+texmaker (3.0-1) UNRELEASED; urgency=low
+
+  * New upstream version
+    (adapted patch, removed patches applied upstream)
+
+ -- Andreas Tille <tille at debian.org>  Tue, 05 Apr 2011 22:03:49 +0200
+
 texmaker (2.3-1) unstable; urgency=low
 
   * New upstream version (adapted patches)
diff --git a/debian/patches/10_spelling_dict.patch b/debian/patches/10_spelling_dict.patch
index c10ed11..b8d5a82 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-2.3.orig/configdialog.cpp
-+++ texmaker-2.3/configdialog.cpp
-@@ -121,7 +121,7 @@
- #ifdef USB_VERSION
- QDir spelldir(QCoreApplication::applicationDirPath());
+--- 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
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 5444965..dc14f3e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 10_spelling_dict.patch
-spelling-error-in-binary.patch
diff --git a/debian/patches/spelling-error-in-binary.patch b/debian/patches/spelling-error-in-binary.patch
deleted file mode 100644
index 07fe807..0000000
--- a/debian/patches/spelling-error-in-binary.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-Description: Fixing some spelling errors
-Author: Ruben Molina <rmolina at udea.edu.co>
-Last-Update: 2010-12-13
---- texmaker-2.3.orig/texmaker.cpp
-+++ texmaker-2.3/texmaker.cpp
-@@ -4556,7 +4556,7 @@
- tag+="}\n";
- InsertTag(tag,9,0);
- OutputTextEdit->insertLine("Bib fields - Article in Journal");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib2()
- {
-@@ -4581,7 +4581,7 @@
- tag+="}\n";
- InsertTag(tag,15,0);
- OutputTextEdit->insertLine("Bib fields - Article in Conference Proceedings");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib3()
- {
-@@ -4608,7 +4608,7 @@
- tag+="}\n";
- InsertTag(tag,14,0);
- OutputTextEdit->insertLine("Bib fields - Article in a Collection");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib4()
- {
-@@ -4634,7 +4634,7 @@
- InsertTag(tag,8,0);
- OutputTextEdit->insertLine("Bib fields - Chapter or Pages in a Book");
- OutputTextEdit->insertLine( "ALT.... : you have the choice between these two fields");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib5()
- {
-@@ -4655,7 +4655,7 @@
- tag+="}\n";
- InsertTag(tag,13,0);
- OutputTextEdit->insertLine("Bib fields - Conference Proceedings");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib6()
- {
-@@ -4678,7 +4678,7 @@
- InsertTag(tag,6,0);
- OutputTextEdit->insertLine("Bib fields - Book");
- OutputTextEdit->insertLine( "ALT.... : you have the choice between these two fields");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib7()
- {
-@@ -4695,7 +4695,7 @@
- tag+="}\n";
- InsertTag(tag,9,0);
- OutputTextEdit->insertLine("Bib fields - Booklet");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib8()
- {
-@@ -4713,7 +4713,7 @@
- tag+="}\n";
- InsertTag(tag,11,0);
- OutputTextEdit->insertLine("Bib fields - PhD. Thesis");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib9()
- {
-@@ -4731,7 +4731,7 @@
- tag+="}\n";
- InsertTag(tag,15,0);
- OutputTextEdit->insertLine("Bib fields - Master's Thesis");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib10()
- {
-@@ -4750,7 +4750,7 @@
- tag+="}\n";
- InsertTag(tag,12,0);
- OutputTextEdit->insertLine("Bib fields - Technical Report");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib11()
- {
-@@ -4768,7 +4768,7 @@
- tag+="}\n";
- InsertTag(tag,8,0);
- OutputTextEdit->insertLine("Bib fields - Technical Manual");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib12()
- {
-@@ -4783,7 +4783,7 @@
- tag+="}\n";
- InsertTag(tag,13,0);
- OutputTextEdit->insertLine("Bib fields - Unpublished");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- void Texmaker::InsertBib13()
- {
-@@ -4799,7 +4799,7 @@
- tag+="}\n";
- InsertTag(tag,6,0);
- OutputTextEdit->insertLine("Bib fields - Miscellaneous");
--OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
-+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
- }
- 
- void Texmaker::CleanBib()

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