merge patched into master
authorJoachim Breitner <mail@joachim-breitner.de>
Sat, 23 Jan 2010 22:02:15 +0000 (23:02 +0100)
committerJoachim Breitner <mail@joachim-breitner.de>
Sat, 23 Jan 2010 22:02:17 +0000 (23:02 +0100)
1  2 
debian/.git-dpm
debian/patches/0034-Do-not-clean-3rd-qt-icons.patch
debian/patches/series

diff --cc debian/.git-dpm
index 5e0cd6a,0000000..78b5e40
mode 100644,000000..100644
--- /dev/null
@@@ -1,8 -1,0 +1,8 @@@
- 7089b4f5b0b3fa093e6b3abd09c84f1633096ff0
- 7089b4f5b0b3fa093e6b3abd09c84f1633096ff0
 +# see git-dpm(1) from git-dpm package
++7381cc02118aa5920ed9093e4c47e7fc1c3cd499
++7381cc02118aa5920ed9093e4c47e7fc1c3cd499
 +69463ebd04cf3cdbb65f12fc156b18d1d93b9fde
 +69463ebd04cf3cdbb65f12fc156b18d1d93b9fde
 +serna-free_0.svn235.orig.tar.gz
 +d2966cf18285b05b638b5eea49298c4ae9ad66e8
 +34315352
index 0000000,0000000..974b305
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,22 @@@
++From 7381cc02118aa5920ed9093e4c47e7fc1c3cd499 Mon Sep 17 00:00:00 2001
++From: Joachim Breitner <mail@joachim-breitner.de>
++Date: Sat, 23 Jan 2010 23:01:54 +0100
++Subject: Do not clean 3rd/qt/icons
++
++---
++ 3rd/qt/qt-defaults.pro |    2 +-
++ 1 files changed, 1 insertions(+), 1 deletions(-)
++
++diff --git a/3rd/qt/qt-defaults.pro b/3rd/qt/qt-defaults.pro
++index 927c073..b25431d 100644
++--- a/3rd/qt/qt-defaults.pro
+++++ b/3rd/qt/qt-defaults.pro
++@@ -87,4 +87,4 @@ CLEANFILES += $(top_srcdir)/MANIFEST $(top_srcdir)/q3porting.xml
++ unix:CLEANFILES += $(top_srcdir)/translations
++ win32:CLEANDIRS = $(top_srcdir)/translations
++ 
++-CLEANDIRS += $(top_srcdir)/icons $(top_srcdir)/include $(top_srcdir)/plugins
+++CLEANDIRS += $(top_srcdir)/include $(top_srcdir)/plugins
++-- 
++1.6.6
++
index d6de993,0000000..cb52d74
mode 100644,000000..100644
--- /dev/null
@@@ -1,33 -1,0 +1,34 @@@
 +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