From: Christian Weiske <cweiske@cweiske.de>
Date: Tue, 9 Aug 2011 06:17:35 +0000 (+0200)
Subject: Merge branch '0.98'
X-Git-Tag: v0.98.6~79
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=efe5988df3eb4b4603c5e3b81d12819c3f667a5f;p=semanticscuttle.git

Merge branch '0.98'

Conflicts:
	build.xml
---

efe5988df3eb4b4603c5e3b81d12819c3f667a5f
diff --cc build.xml
index d7735c8,e60e861..f50499b
--- a/build.xml
+++ b/build.xml
@@@ -27,32 -26,6 +26,34 @@@ contained it - thus no 0.98.3 PEAR pack
    <property name="sffilepath"  value="s/se/semanticscuttle/" />
    <property name="svnpath"     value="https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/" />
  
 +  <fileset id="fs.zip" dir=".">
 +   <include name="data/**"/>
 +   <include name="doc/**"/>
 +   <include name="src/**"/>
 +   <include name="www/**"/>
++   <include name="scripts/avahi-export.php"/>
++   <include name="scripts/fix-unfiled-tags.php"/>
 +   <exclude name="**/.gitignore/"/>
 +   <exclude name="**/.svn/"/>
 +   <exclude name="data/config.php"/>
 +   <exclude name="data/config.testing.php"/>
 +   <exclude name="data/config.testing-tmp.php"/>
 +   <exclude name="data/locales/messages.po"/>
 +   <exclude name="data/locales/*/LC_MESSAGES/messages.po"/>
 +   <exclude name="src/php-gettext/examples/" />
 +   <exclude name="src/php-gettext/tests/"/>
 +  </fileset>
 +
 +  <fileset id="fs.doc" dir="doc">
 +   <include name="ChangeLog"/>
 +   <include name="**.txt"/>
 +   <include name="**.rst"/>
 +   <include name="**/*.rst"/>
 +   <exclude name="LICENSE.txt"/>
 +   <exclude name="developers/TODO.rst"/>
 +   <exclude name="allinone.rst"/>
 +  </fileset>
 +
    <taskdef name="rST" classname="phing.tasks.ext.rSTTask" />
    <taskdef name="d51pearpkg2" classname="phing.tasks.ext.d51PearPkg2Task" />