[texmaker] 44/103: New upstream version (with adapted patches), fix FTBFS bug by applying Ubuntu patch
Andreas Tille
tille at debian.org
Sun Sep 10 17:38:28 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository texmaker.
commit ebf6a00e8ddccd143ac6796bb07dc9aba89a3082
Author: Andreas Tille <tille at debian.org>
Date: Mon Mar 14 09:07:38 2011 +0000
New upstream version (with adapted patches), fix FTBFS bug by applying Ubuntu patch
---
debian/changelog | 9 ++++++++
debian/compat | 4 +---
debian/control | 4 ++--
debian/patches/10_spelling_dict.patch | 18 +++++++--------
debian/patches/spelling-error-in-binary.patch | 32 +++++++++++++--------------
5 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b866fe0..786f44a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+texmaker (2.3-1) unstable; urgency=low
+
+ * New upstream version (adapted patches)
+ * Build-Depends: libqtwebkit-dev =adapted Ubuntu patch which
+ Closes: #618140
+ * Debhelper 8 (control+compat)
+
+ -- Andreas Tille <tille at debian.org> Mon, 14 Mar 2011 09:54:20 +0100
+
texmaker (2.2.1-1) unstable; urgency=low
* New upstream version
diff --git a/debian/compat b/debian/compat
index db61822..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1,3 +1 @@
-5
-
-
+8
diff --git a/debian/control b/debian/control
index 4f434af..2b07ff7 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
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,
- quilt (>= 0.47)
+Build-Depends: debhelper (>= 8), libqt4-dev (>=4.5.1), libglib2.0-dev, libpoppler-qt4-dev,
+ quilt (>= 0.47), libqtwebkit-dev
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/
diff --git a/debian/patches/10_spelling_dict.patch b/debian/patches/10_spelling_dict.patch
index faf8b16..c10ed11 100644
--- a/debian/patches/10_spelling_dict.patch
+++ b/debian/patches/10_spelling_dict.patch
@@ -1,16 +1,14 @@
Author: Andreas Tille <tille at debian.org>
Purpose: Adapt default search directory for spelling dictionaries to Debian default
Closes: #591340
-Index: texmaker-2.2.1/configdialog.cpp
-===================================================================
---- texmaker-2.2.1.orig/configdialog.cpp 2011-02-08 22:47:16.407228050 -0500
-+++ texmaker-2.2.1/configdialog.cpp 2011-02-08 22:47:23.244230026 -0500
-@@ -116,7 +116,7 @@
- void ConfigDialog::browseAspell()
- {
- #if defined( Q_WS_X11 )
+--- texmaker-2.3.orig/configdialog.cpp
++++ texmaker-2.3/configdialog.cpp
+@@ -121,7 +121,7 @@
+ #ifdef USB_VERSION
+ QDir spelldir(QCoreApplication::applicationDirPath());
+ #else
-QDir spelldir(PREFIX"/share/texmaker");
+QDir spelldir(PREFIX"/share/myspell/dicts");
#endif
- #if defined( Q_WS_MACX )
- QDir spelldir(QCoreApplication::applicationDirPath() + "/../Resources");
+
+ #endif
diff --git a/debian/patches/spelling-error-in-binary.patch b/debian/patches/spelling-error-in-binary.patch
index 046de1f..07fe807 100644
--- a/debian/patches/spelling-error-in-binary.patch
+++ b/debian/patches/spelling-error-in-binary.patch
@@ -1,11 +1,9 @@
Description: Fixing some spelling errors
Author: Ruben Molina <rmolina at udea.edu.co>
Last-Update: 2010-12-13
-Index: texmaker-2.2.1/texmaker.cpp
-===================================================================
---- texmaker-2.2.1.orig/texmaker.cpp 2011-02-08 22:47:12.723226809 -0500
-+++ texmaker-2.2.1/texmaker.cpp 2011-02-08 22:47:28.980244875 -0500
-@@ -3839,7 +3839,7 @@
+--- 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");
@@ -14,7 +12,7 @@ Index: texmaker-2.2.1/texmaker.cpp
}
void Texmaker::InsertBib2()
{
-@@ -3864,7 +3864,7 @@
+@@ -4581,7 +4581,7 @@
tag+="}\n";
InsertTag(tag,15,0);
OutputTextEdit->insertLine("Bib fields - Article in Conference Proceedings");
@@ -23,7 +21,7 @@ Index: texmaker-2.2.1/texmaker.cpp
}
void Texmaker::InsertBib3()
{
-@@ -3891,7 +3891,7 @@
+@@ -4608,7 +4608,7 @@
tag+="}\n";
InsertTag(tag,14,0);
OutputTextEdit->insertLine("Bib fields - Article in a Collection");
@@ -32,7 +30,7 @@ Index: texmaker-2.2.1/texmaker.cpp
}
void Texmaker::InsertBib4()
{
-@@ -3917,7 +3917,7 @@
+@@ -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");
@@ -41,7 +39,7 @@ Index: texmaker-2.2.1/texmaker.cpp
}
void Texmaker::InsertBib5()
{
-@@ -3938,7 +3938,7 @@
+@@ -4655,7 +4655,7 @@
tag+="}\n";
InsertTag(tag,13,0);
OutputTextEdit->insertLine("Bib fields - Conference Proceedings");
@@ -50,7 +48,7 @@ Index: texmaker-2.2.1/texmaker.cpp
}
void Texmaker::InsertBib6()
{
-@@ -3961,7 +3961,7 @@
+@@ -4678,7 +4678,7 @@
InsertTag(tag,6,0);
OutputTextEdit->insertLine("Bib fields - Book");
OutputTextEdit->insertLine( "ALT.... : you have the choice between these two fields");
@@ -59,7 +57,7 @@ Index: texmaker-2.2.1/texmaker.cpp
}
void Texmaker::InsertBib7()
{
-@@ -3978,7 +3978,7 @@
+@@ -4695,7 +4695,7 @@
tag+="}\n";
InsertTag(tag,9,0);
OutputTextEdit->insertLine("Bib fields - Booklet");
@@ -68,7 +66,7 @@ Index: texmaker-2.2.1/texmaker.cpp
}
void Texmaker::InsertBib8()
{
-@@ -3996,7 +3996,7 @@
+@@ -4713,7 +4713,7 @@
tag+="}\n";
InsertTag(tag,11,0);
OutputTextEdit->insertLine("Bib fields - PhD. Thesis");
@@ -77,7 +75,7 @@ Index: texmaker-2.2.1/texmaker.cpp
}
void Texmaker::InsertBib9()
{
-@@ -4014,7 +4014,7 @@
+@@ -4731,7 +4731,7 @@
tag+="}\n";
InsertTag(tag,15,0);
OutputTextEdit->insertLine("Bib fields - Master's Thesis");
@@ -86,7 +84,7 @@ Index: texmaker-2.2.1/texmaker.cpp
}
void Texmaker::InsertBib10()
{
-@@ -4033,7 +4033,7 @@
+@@ -4750,7 +4750,7 @@
tag+="}\n";
InsertTag(tag,12,0);
OutputTextEdit->insertLine("Bib fields - Technical Report");
@@ -95,7 +93,7 @@ Index: texmaker-2.2.1/texmaker.cpp
}
void Texmaker::InsertBib11()
{
-@@ -4051,7 +4051,7 @@
+@@ -4768,7 +4768,7 @@
tag+="}\n";
InsertTag(tag,8,0);
OutputTextEdit->insertLine("Bib fields - Technical Manual");
@@ -104,7 +102,7 @@ Index: texmaker-2.2.1/texmaker.cpp
}
void Texmaker::InsertBib12()
{
-@@ -4066,7 +4066,7 @@
+@@ -4783,7 +4783,7 @@
tag+="}\n";
InsertTag(tag,13,0);
OutputTextEdit->insertLine("Bib fields - Unpublished");
@@ -113,7 +111,7 @@ Index: texmaker-2.2.1/texmaker.cpp
}
void Texmaker::InsertBib13()
{
-@@ -4082,7 +4082,7 @@
+@@ -4799,7 +4799,7 @@
tag+="}\n";
InsertTag(tag,6,0);
OutputTextEdit->insertLine("Bib fields - Miscellaneous");
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/texmaker.git
More information about the debian-science-commits
mailing list