Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package texstudio:
texstudio (2.3+debian-4) unstable; urgency=low
* Adding patch to prevent needless latex run when no bib-files are referenced
(Closes: #688558).
* Adding patch to set the default value of "automatically run 'latex, bibtex,
latex' if bib-files were changed" to disabled.
* Adding patch to make 'pdflatex, viewpdf' the default quick build option.
* Adding patch to prevent the config file from growing by unnecessary
whitespace.
* Adding patch to disable the riddle asked when accessing advanced
configuration options.
-- Tom Jampen <t...@cryptography.ch> Sat, 20 Oct 2012 12:21:07 +0200
Thanks
Tom
diff -Nru texstudio-2.3+debian/debian/changelog
texstudio-2.3+debian/debian/changelog
--- texstudio-2.3+debian/debian/changelog 2012-06-24 13:26:24.000000000
+0200
+++ texstudio-2.3+debian/debian/changelog 2012-10-20 15:46:03.000000000
+0200
@@ -1,3 +1,17 @@
+texstudio (2.3+debian-4) unstable; urgency=low
+
+ * Adding patch to prevent needless latex run when no bib-files are referenced
+ (Closes: #688558).
+ * Adding patch to set the default value of "automatically run 'latex, bibtex,
+ latex' if bib-files were changed" to disabled.
+ * Adding patch to make 'pdflatex, viewpdf' the default quick build option.
+ * Adding patch to prevent the config file from growing by unnecessary
+ whitespace.
+ * Adding patch to disable the riddle asked when accessing advanced
+ configuration options.
+
+ -- Tom Jampen <t...@cryptography.ch> Sat, 20 Oct 2012 12:21:07 +0200
+
texstudio (2.3+debian-3) unstable; urgency=low
* Adding build-dependency on zlib1g-dev (Closes: #678583).
diff -Nru texstudio-2.3+debian/debian/patches/06-fix-auto-bibtex.patch
texstudio-2.3+debian/debian/patches/06-fix-auto-bibtex.patch
--- texstudio-2.3+debian/debian/patches/06-fix-auto-bibtex.patch
1970-01-01 01:00:00.000000000 +0100
+++ texstudio-2.3+debian/debian/patches/06-fix-auto-bibtex.patch
2012-10-09 22:09:52.000000000 +0200
@@ -0,0 +1,21 @@
+Author: Tom Jampen <t...@cryptography.ch>
+Description:
+ TeXstudio automatically runs 'latex, bibtex, latex' before compiling the
+ tex-files when referenced bib-files were changed. A bug caused the first of
+ these three commands to run even when no bib-files are referenced or present
+ at all. This patch prevents the needless and possibly harmful (e.g. when using
+ pdflatex instead of latex) 'latex' run.
+
+diff -Naurp a/texmaker.cpp b/texmaker.cpp
+--- a/texmaker.cpp 2012-09-28 15:16:18.796613057 +0200
++++ b/texmaker.cpp 2012-09-28 15:56:11.635616640 +0200
+@@ -3434,6 +3434,9 @@ void Texmaker::RunPreCompileCommand() {
+ foreach (const LatexDocument* doc, docs)
+ foreach (const FileNamePair& bf,
doc->mentionedBibTeXFiles())
+ bibFiles.insert(bf.absolute);
++ if (bibFiles.empty()) {
++ return;
++ }
+ if (bibFiles == master->lastCompiledBibTeXFiles) {
+ QFileInfo
bbl(BuildManager::parseExtendedCommandLine("?am.bbl",
documents.getTemporaryCompileFileName()).first());
+ if (bbl.exists()) {
diff -Nru
texstudio-2.3+debian/debian/patches/07-disable-auto-bibtex-option.patch
texstudio-2.3+debian/debian/patches/07-disable-auto-bibtex-option.patch
--- texstudio-2.3+debian/debian/patches/07-disable-auto-bibtex-option.patch
1970-01-01 01:00:00.000000000 +0100
+++ texstudio-2.3+debian/debian/patches/07-disable-auto-bibtex-option.patch
2012-10-09 22:16:48.000000000 +0200
@@ -0,0 +1,19 @@
+Author: Tom Jampen <t...@cryptography.ch>
+Description:
+ Automatically running 'latex, bibtex, latex' if bib-files were changed
+ shouldn't be the default behavior as most users probably use other tex
+ compilers than latex nowadays (e.g. pdflatex). This patch sets the default
+ value to disabled.
+
+diff -Naurp a/configmanager.cpp b/configmanager.cpp
+--- a/configmanager.cpp 2012-10-09 22:15:18.178361247 +0200
++++ b/configmanager.cpp 2012-10-09 22:16:14.550659283 +0200
+@@ -582,7 +582,7 @@ QSettings* ConfigManager::readSettings()
+ return 0;
+ }
+ buildManager->readSettings(*config);
+- runLaTeXBibTeXLaTeX=config->value("Tools/After BibTeX Change",
"tmx://latex && tmx://bibtex && tmx://latex").toString()!="";
++ runLaTeXBibTeXLaTeX=config->value("Tools/After BibTeX Change",
"").toString()!="";
+
+ //import old key replacements or set default
+ QStringList keyReplace, keyReplaceAfterWord, keyReplaceBeforeWord;
diff -Nru
texstudio-2.3+debian/debian/patches/08-change-default-quickbuild-option.patch
texstudio-2.3+debian/debian/patches/08-change-default-quickbuild-option.patch
---
texstudio-2.3+debian/debian/patches/08-change-default-quickbuild-option.patch
1970-01-01 01:00:00.000000000 +0100
+++
texstudio-2.3+debian/debian/patches/08-change-default-quickbuild-option.patch
2012-10-09 22:24:01.000000000 +0200
@@ -0,0 +1,24 @@
+Author: Tom Jampen <t...@cryptography.ch>
+Description:
+ This patch changes the default quick build command from 'latex, dvips, viewps'
+ to 'pdflatex, viewpdf' which seems more appropriate nowadays.
+
+diff -Naurp a/buildmanager.cpp b/buildmanager.cpp
+--- a/buildmanager.cpp 2012-10-09 07:30:48.152577937 +0200
++++ b/buildmanager.cpp 2012-10-09 07:34:12.268984537 +0200
+@@ -570,12 +570,12 @@ void BuildManager::readSettings(const QS
+ setLatexCommand(i,commands[i]);
+ if (reinterpret_cast<int&>(quickmode)<0) {
+ //choose working default where every necessary command is knownr
+- if (hasLatexCommand(CMD_LATEX) && hasLatexCommand(CMD_DVIPS) &&
hasLatexCommand(CMD_VIEWPS))
++ if (hasLatexCommand(CMD_PDFLATEX) &&
hasLatexCommand(CMD_VIEWPDF))
++ quickmode=3;
++ else if (hasLatexCommand(CMD_LATEX) &&
hasLatexCommand(CMD_DVIPS) && hasLatexCommand(CMD_VIEWPS))
+ quickmode=1;
+ else if (hasLatexCommand(CMD_LATEX) &&
hasLatexCommand(CMD_VIEWDVI))
+ quickmode=2;
+- else if (hasLatexCommand(CMD_PDFLATEX) &&
hasLatexCommand(CMD_VIEWPDF))
+- quickmode=3;
+ else if (hasLatexCommand(CMD_LATEX) &&
hasLatexCommand(CMD_DVIPDF) && hasLatexCommand(CMD_VIEWPDF))
+ quickmode=4;
+ else if (hasLatexCommand(CMD_LATEX) &&
hasLatexCommand(CMD_DVIPS) &&
diff -Nru texstudio-2.3+debian/debian/patches/09-trim-commands.patch
texstudio-2.3+debian/debian/patches/09-trim-commands.patch
--- texstudio-2.3+debian/debian/patches/09-trim-commands.patch 1970-01-01
01:00:00.000000000 +0100
+++ texstudio-2.3+debian/debian/patches/09-trim-commands.patch 2012-10-20
12:14:50.000000000 +0200
@@ -0,0 +1,20 @@
+Author: Tom Jampen <t...@cryptography.ch>
+Description:
+ TeXstudio lets the user configure several commands and command options.
+ Commands without options (the default for some svn commands) let TeXstudio's
+ configuration file grow as TeXstudio adds whitespace after each command name
+ to separate it from its options everytime the configuration is saved. This
+ patch removes unnecessary whitespace.
+
+diff -Naurp a/buildmanager.cpp b/buildmanager.cpp
+--- a/buildmanager.cpp 2012-10-09 22:26:19.745856689 +0200
++++ b/buildmanager.cpp 2012-10-09 22:30:09.031067074 +0200
+@@ -617,7 +617,7 @@ void BuildManager::setLatexCommand(Latex
+ && (QFileInfo(unquote).exists())
+ )
+ ))
+- commands[cmd] = cmdString + " " +
defaultCommandOptions(cmd);
++ commands[cmd] = (cmdString + " " +
defaultCommandOptions(cmd)).trimmed();
+ else
+ commands[cmd] = cmdString;
+ }
diff -Nru texstudio-2.3+debian/debian/patches/10-disable-riddle.patch
texstudio-2.3+debian/debian/patches/10-disable-riddle.patch
--- texstudio-2.3+debian/debian/patches/10-disable-riddle.patch 1970-01-01
01:00:00.000000000 +0100
+++ texstudio-2.3+debian/debian/patches/10-disable-riddle.patch 2012-10-20
12:17:26.000000000 +0200
@@ -0,0 +1,19 @@
+Author: Tom Jampen <t...@cryptography.ch>
+Description:
+ In order to display the advanced configuration options, TeXstudio users are
+ forced to correctly answer a riddle. This patch removes this unnecessary
+ obstacle.
+
+diff -Naurp a/configdialog.cpp b/configdialog.cpp
+--- a/configdialog.cpp 2012-10-02 10:06:14.272933764 +0200
++++ b/configdialog.cpp 2012-10-02 10:06:35.935400890 +0200
+@@ -522,8 +522,7 @@ void ConfigDialog::advancedOptionsToggle
+
+ void ConfigDialog::advancedOptionsClicked(bool on){
+ if (on) {
+- if (!askRiddle())
ui.checkBoxShowAdvancedOptions->setChecked(false);
+- else riddled = true;
++ riddled = true;
+ }
+ }
+
diff -Nru texstudio-2.3+debian/debian/patches/series
texstudio-2.3+debian/debian/patches/series
--- texstudio-2.3+debian/debian/patches/series 2012-05-19 23:22:15.000000000
+0200
+++ texstudio-2.3+debian/debian/patches/series 2012-10-20 12:16:52.000000000
+0200
@@ -3,3 +3,8 @@
03-fix-manpage-version.patch
04-mythes-path.patch
05-gcc4.7.patch
+06-fix-auto-bibtex.patch
+07-disable-auto-bibtex-option.patch
+08-change-default-quickbuild-option.patch
+09-trim-commands.patch
+10-disable-riddle.patch
