merge patched into master
authorJoachim Breitner <mail@joachim-breitner.de>
Tue, 12 Jan 2010 21:24:56 +0000 (22:24 +0100)
committerJoachim Breitner <mail@joachim-breitner.de>
Tue, 12 Jan 2010 21:24:58 +0000 (22:24 +0100)
1  2 
debian/.git-dpm
debian/patches/0033-Fix-Syntax-error-Unterminated-quoted-string.patch
debian/patches/series

diff --cc debian/.git-dpm
index ba38b96,0000000..a075c93
mode 100644,000000..100644
--- /dev/null
@@@ -1,8 -1,0 +1,8 @@@
- e36eb1c79e6a4f48c481c24b63eb09b461ccbb67
- e36eb1c79e6a4f48c481c24b63eb09b461ccbb67
 +# see git-dpm(1) from git-dpm package
++8bfb73decfa673d1b113094fff1aabe8e1a27fa5
++8bfb73decfa673d1b113094fff1aabe8e1a27fa5
 +1b72d6b9570ab100ba9ca1730b75bc23c41c2b20
 +1b72d6b9570ab100ba9ca1730b75bc23c41c2b20
 +serna-free_0~svn139.orig.tar.gz
 +7652b91fbbeeeb998359d60794850d8585d35913
 +34204126
index 0000000,0000000..7555f50
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,34 @@@
++From 8bfb73decfa673d1b113094fff1aabe8e1a27fa5 Mon Sep 17 00:00:00 2001
++From: Joachim Breitner <mail@joachim-breitner.de>
++Date: Tue, 12 Jan 2010 22:24:48 +0100
++Subject: Fix: Syntax error: Unterminated quoted string
++
++---
++ .../resume/xsl/pdf/country/propogate-params.sh     |    4 ++--
++ 1 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/serna/dist/plugins/resume/xsl/pdf/country/propogate-params.sh b/serna/dist/plugins/resume/xsl/pdf/country/propogate-params.sh
++index a75f04e..e16165f 100755
++--- a/serna/dist/plugins/resume/xsl/pdf/country/propogate-params.sh
+++++ b/serna/dist/plugins/resume/xsl/pdf/country/propogate-params.sh
++@@ -22,7 +22,7 @@ SOURCE=us.xsl
++ echo "======== Checking Files for outdated params..."
++ for country in `ls -1 *.xsl`; do 
++   for param in `grep '<xsl:param' $country | \
++-             perl -p -e 's/.*name=\"(.*)\"\>.*\<\/xsl:param\>/$1/g`; 
+++             perl -p -e 's/.*name=\"(.*)\"\>.*\<\/xsl:param\>/$1/g'`; 
++   do
++     exists=`grep -c $param $SOURCE`
++     if [ "0" = $exists ]; then 
++@@ -34,7 +34,7 @@ done
++ echo "======== Adding params in $SOURCE to other files as necessary..."
++ for country in `ls -1 *.xsl`; do 
++   for param in `grep '<xsl:param' $SOURCE | \
++-             perl -p -e 's/.*name=\"(.*)\"\>.*\<\/xsl:param\>/$1/g`; 
+++             perl -p -e 's/.*name=\"(.*)\"\>.*\<\/xsl:param\>/$1/g'`; 
++   do
++     translated=`grep -c $param $country`
++     if [ "0" = $translated ]; 
++-- 
++1.6.6
++
index c013807,0000000..d6de993
mode 100644,000000..100644
--- /dev/null
@@@ -1,32 -1,0 +1,33 @@@
 +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