merge patched into master
authorJoachim Breitner <mail@joachim-breitner.de>
Thu, 28 Jan 2010 18:55:54 +0000 (19:55 +0100)
committerJoachim Breitner <mail@joachim-breitner.de>
Thu, 28 Jan 2010 18:55:56 +0000 (19:55 +0100)
1  2 
debian/.git-dpm
debian/patches/0035-Do-not-set-JAVA_HOME-environment-variable.patch
debian/patches/series

diff --cc debian/.git-dpm
index 78b5e40,0000000..c2c509e
mode 100644,000000..100644
--- /dev/null
@@@ -1,8 -1,0 +1,8 @@@
- 7381cc02118aa5920ed9093e4c47e7fc1c3cd499
- 7381cc02118aa5920ed9093e4c47e7fc1c3cd499
 +# see git-dpm(1) from git-dpm package
++1433518108527d7261093fac452a137a72fcdc0b
++1433518108527d7261093fac452a137a72fcdc0b
 +69463ebd04cf3cdbb65f12fc156b18d1d93b9fde
 +69463ebd04cf3cdbb65f12fc156b18d1d93b9fde
 +serna-free_0.svn235.orig.tar.gz
 +d2966cf18285b05b638b5eea49298c4ae9ad66e8
 +34315352
index 0000000,0000000..c5bbd55
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,62 @@@
++From 1433518108527d7261093fac452a137a72fcdc0b Mon Sep 17 00:00:00 2001
++From: Joachim Breitner <mail@joachim-breitner.de>
++Date: Thu, 28 Jan 2010 19:55:02 +0100
++Subject: Do not set JAVA_HOME environment variable
++
++On Debian, it is fine to just use the java binary from the user path.
++Therefore, do not set the JAVA_HOME environment variable.
++---
++ serna/core/qt/QtSerna.cxx                         |    9 ---------
++ serna/dist/config-template.ent                    |    1 -
++ serna/dist/plugins/publishing/PublishingPlugin.py |    3 ---
++ 3 files changed, 0 insertions(+), 13 deletions(-)
++
++diff --git a/serna/core/qt/QtSerna.cxx b/serna/core/qt/QtSerna.cxx
++index ff126ff..e0754ea 100644
++--- a/serna/core/qt/QtSerna.cxx
+++++ b/serna/core/qt/QtSerna.cxx
++@@ -226,15 +226,6 @@ int Serna::exec(int& argc, char** argv)
++ 
++     PropertyNode* cfgRoot = config().root();
++ 
++-#if defined(_WIN32) || defined(linux) && (!defined(_DEBUG) || defined(NDEBUG))
++-    String javaHome(cfgRoot->getString(NOTR("vars/java_home")));
++-    if (javaHome.empty()) {
++-        javaHome.append(config().getDataDir());
++-        javaHome.append(1, PathName::DIR_SEP).append(NOTR("jre"));
++-    }
++-    set_env(from_latin1(NOTR("JAVA_HOME")), javaHome);
++-#endif
++-
++     const bool isActiveX = ax_serna().isStartedByCOM();
++     if (isActiveX)
++         config().root()->makeDescendant(NOTR("#is-ax"))->setBool(true);
++diff --git a/serna/dist/config-template.ent b/serna/dist/config-template.ent
++index 6237ebb..47137d2 100644
++--- a/serna/dist/config-template.ent
+++++ b/serna/dist/config-template.ent
++@@ -2,7 +2,6 @@
++     <!-- Serna Variables. schemas and stylesheets may be a paths, delimited
++     by ';' in Windows and ':' in Unix. -->
++     <data_dir>$DATA_DIR</data_dir> 
++-    <java_home>$DATA_DIR/jre</java_home>
++     <schemas>&data-path;/xml/schemas</schemas>
++     <stylesheets>&data-path;/xml/stylesheets</stylesheets>
++     <templates>$DATA_DIR/xml/templates</templates>
++diff --git a/serna/dist/plugins/publishing/PublishingPlugin.py b/serna/dist/plugins/publishing/PublishingPlugin.py
++index 228415f..348425d 100755
++--- a/serna/dist/plugins/publishing/PublishingPlugin.py
+++++ b/serna/dist/plugins/publishing/PublishingPlugin.py
++@@ -70,9 +70,6 @@ class PublishingPlugin(DocumentPlugin):
++         pp = self.pluginProperties()
++         self._pluginDir = unicode(pp.getProperty("resolved-path").getString())
++         self._dialog = None
++-        config_root = SernaConfig.root()
++-        java_home = config_root.getProperty("vars/java_home").getString()
++-        set_java_home(unicode(java_home))
++ 
++     def __str__(self):
++         return PLUGIN_ID
++-- 
++1.6.6
++
index cb52d74,0000000..518078f
mode 100644,000000..100644
--- /dev/null
@@@ -1,34 -1,0 +1,35 @@@
 +0001-Change-make-to-gmake.patch
 +0002-Template-function-overlap.patch
 +0003-Atomic-increment-decrement-defined-for-amd64.patch
 +0004-Fix-som-bison-errors.patch
 +0005-Work-around-including-two-bison-parsers-in-Tokenizer.patch
 +0006-Enable-SIP_FEATURE_TYPE_STRUCT.patch
 +0007-Use-void-when-debug-outputting-a-pointer.patch
 +0008-Fix-aspell.hpp-import-why-did-it-not-work.patch
 +0009-libsp-adjustments-for-64-bits.patch
 +0010-In-find_package_by_files-return-undef-upon-failure.patch
 +0011-Make-find_header-also-search-in-usr-include-qt4.patch
 +0012-Creating-necessary-empty-directories-in-3rd.patch
 +0013-Add-patches-to-make-antlr-compile.patch
 +0014-Add-imports-of-stdio.h.patch
 +0015-Make-base-classes-public-where-required.patch
 +0016-Working-exports.lst-even-if-list-is-empty.patch
 +0017-dash-compliance-Do-not-use-echo-e.patch
 +0018-Set-rpath-for-serna-executable.patch
 +0019-Hardcode-usr-lib-serna-as-DataDir.patch
 +0020-Cast-via-intptr_t-in-refCntData-new.patch
 +0021-Cast-to-intptr_t-in-Dav-DavManager-lock-calls.patch
 +0022-Cast-to-intptr_t-in-String-number-calls.patch
 +0023-Cast-to-intptr_t-in-xslt-impl-Instance.cxx.patch
 +0024-Cast-to-intptr_t-in-PackedPtrSet.h.patch
 +0025-Remove-__int__-method-from-SimpleWrappedObject.patch
 +0026-Implement-PropertyNode-set-get-Ptr-and-String-toPtr.patch
 +0027-Use-set-getPtr-in-pyconsole-code.patch
 +0028-Allow-using-the-system-wide-docbook-xsl-installation.patch
 +0029-Use-system-wide-xsltproc-in-scripts.patch
 +0030-Use-system-wide-xsltproc-in-publishing-plugin.patch
 +0031-Refer-to-usr-share-doc-serna-in-config-template.patch
 +0032-Refer-to-usr-share-xml-docbook-stylesheet-docbook-xs.patch
 +0033-Fix-Syntax-error-Unterminated-quoted-string.patch
 +0034-Do-not-clean-3rd-qt-icons.patch
++0035-Do-not-set-JAVA_HOME-environment-variable.patch