r38177 - in /packages/texmaker/trunk/debian: changelog compat control patches/10_spelling_dict.patch patches/spelling-error-in-binary.patch
tille at users.alioth.debian.org
tille at users.alioth.debian.org
Mon Mar 14 09:07:45 UTC 2011
Author: tille
Date: Mon Mar 14 09:07:38 2011
New Revision: 38177
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38177
Log:
New upstream version (with adapted patches), fix FTBFS bug by applying Ubuntu patch
Modified:
packages/texmaker/trunk/debian/changelog
packages/texmaker/trunk/debian/compat
packages/texmaker/trunk/debian/control
packages/texmaker/trunk/debian/patches/10_spelling_dict.patch
packages/texmaker/trunk/debian/patches/spelling-error-in-binary.patch
Modified: packages/texmaker/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/changelog?rev=38177&op=diff
==============================================================================
--- packages/texmaker/trunk/debian/changelog (original)
+++ packages/texmaker/trunk/debian/changelog Mon Mar 14 09:07:38 2011
@@ -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
Modified: packages/texmaker/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/compat?rev=38177&op=diff
==============================================================================
--- packages/texmaker/trunk/debian/compat (original)
+++ packages/texmaker/trunk/debian/compat Mon Mar 14 09:07:38 2011
@@ -1,3 +1,1 @@
-5
-
-
+8
Modified: packages/texmaker/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/control?rev=38177&op=diff
==============================================================================
--- packages/texmaker/trunk/debian/control (original)
+++ packages/texmaker/trunk/debian/control Mon Mar 14 09:07:38 2011
@@ -5,8 +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,
- 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/
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=38177&op=diff
==============================================================================
--- packages/texmaker/trunk/debian/patches/10_spelling_dict.patch (original)
+++ packages/texmaker/trunk/debian/patches/10_spelling_dict.patch Mon Mar 14 09:07:38 2011
@@ -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
Modified: packages/texmaker/trunk/debian/patches/spelling-error-in-binary.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/patches/spelling-error-in-binary.patch?rev=38177&op=diff
==============================================================================
--- packages/texmaker/trunk/debian/patches/spelling-error-in-binary.patch (original)
+++ packages/texmaker/trunk/debian/patches/spelling-error-in-binary.patch Mon Mar 14 09:07:38 2011
@@ -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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
void Texmaker::InsertBib13()
{
-@@ -4082,7 +4082,7 @@
+@@ -4799,7 +4799,7 @@
tag+="}\n";
InsertTag(tag,6,0);
OutputTextEdit->insertLine("Bib fields - Miscellaneous");
More information about the debian-science-commits
mailing list