merge patched into master
authorJoachim Breitner <mail@joachim-breitner.de>
Thu, 28 Jan 2010 20:08:50 +0000 (21:08 +0100)
committerJoachim Breitner <mail@joachim-breitner.de>
Thu, 28 Jan 2010 20:09:16 +0000 (21:09 +0100)
1  2 
debian/.git-dpm
debian/changelog
debian/patches/0036-Use-assistant-qt4-instead-of-assistant-on-Debian.patch
debian/patches/series

diff --cc debian/.git-dpm
index c2c509e,0000000..1df3db3
mode 100644,000000..100644
--- /dev/null
@@@ -1,8 -1,0 +1,8 @@@
- 1433518108527d7261093fac452a137a72fcdc0b
- 1433518108527d7261093fac452a137a72fcdc0b
 +# see git-dpm(1) from git-dpm package
++2e804ee7a533352d9025b72ab6556c38b12ba46f
++2e804ee7a533352d9025b72ab6556c38b12ba46f
 +69463ebd04cf3cdbb65f12fc156b18d1d93b9fde
 +69463ebd04cf3cdbb65f12fc156b18d1d93b9fde
 +serna-free_0.svn235.orig.tar.gz
 +d2966cf18285b05b638b5eea49298c4ae9ad66e8
 +34315352
index bd96e3a,0000000..de9d9f3
mode 100644,000000..100644
--- /dev/null
@@@ -1,34 -1,0 +1,35 @@@
 +serna-free (0.svn235-3) UNRELEASED; urgency=low
 +
 +  * Package recommends fop now, thx to Mathieu Malaterre for suggesting this
 +    (Closes: #567162) 
 +  * Fix PDF publishing by not setting JAVA_PATH to a non-existant directory.
 +    (Closes: #567160)
 +  * Do not compress machine-readable files in /usr/share/doc/serna
++  * Use assistant-qt4 instead of assistant 
 +
 + -- Joachim Breitner <nomeata@debian.org>  Thu, 28 Jan 2010 19:57:21 +0100
 +
 +serna-free (0.svn235-2) unstable; urgency=low
 +
 +  * Added dependencies on python-qt4 and python-sip (Closes: #566987)
 +  * Manually version dependency on python-sip (Closes: #566823)
 +  * Add VCS-* headers 
 +
 + -- Joachim Breitner <nomeata@debian.org>  Tue, 26 Jan 2010 22:00:21 +0100
 +
 +serna-free (0.svn235-1) unstable; urgency=low
 +
 +  * New upstream version
 +    + QtSingleApplication now treated as a 3rd party component
 +      Thus ship qtsingleapplication-2.6_1-opensource.tar.gz in debian/3rd
 +  * Removed convenience copy of docbook-xsl-1.68.1.tar.bz2 from self-created
 +    orig.tar.gz file (was already removed in my master branch)
 +  * Ship AUTHORS file
 +
 + -- Joachim Breitner <nomeata@debian.org>  Sun, 24 Jan 2010 00:24:44 +0100
 +
 +serna-free (0.svn139-1) unstable; urgency=low
 +
 +  * Initial release. (Closes: #535828)
 +
 + -- Joachim Breitner <nomeata@debian.org>  Sun, 10 Jan 2010 16:51:08 +0100
index 0000000,0000000..f3d5714
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,33 @@@
++From 2e804ee7a533352d9025b72ab6556c38b12ba46f Mon Sep 17 00:00:00 2001
++From: Joachim Breitner <mail@joachim-breitner.de>
++Date: Thu, 28 Jan 2010 21:08:46 +0100
++Subject: Use assistant-qt4 instead of assistant on Debian
++
++---
++ serna/utils/impl/HelpAssistant.cxx |   10 +---------
++ 1 files changed, 1 insertions(+), 9 deletions(-)
++
++diff --git a/serna/utils/impl/HelpAssistant.cxx b/serna/utils/impl/HelpAssistant.cxx
++index a9bb165..42516b4 100644
++--- a/serna/utils/impl/HelpAssistant.cxx
+++++ b/serna/utils/impl/HelpAssistant.cxx
++@@ -62,15 +62,7 @@
++ 
++ using namespace Common;
++ 
++-#ifndef _WIN32
++-# ifndef __APPLE__ 
++-static const char ASSISTANT_EXE[] = NOTR("assistant");
++-# else
++-static const char ASSISTANT_EXE[] = NOTR("Assistant.app/Contents/MacOS/Assistant");
++-# endif
++-#else
++-static const char ASSISTANT_EXE[] = NOTR("assistant.exe");
++-#endif
+++static const char ASSISTANT_EXE[] = NOTR("assistant-qt4");
++ static const char HELP_PATH_PROP[] = NOTR("app/help-path");
++ 
++ static void show_error(const QString& msg)
++-- 
++1.6.6
++
index 518078f,0000000..48e1363
mode 100644,000000..100644
--- /dev/null
@@@ -1,35 -1,0 +1,36 @@@
 +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
++0036-Use-assistant-qt4-instead-of-assistant-on-Debian.patch