Merge branch '0.98'

Conflicts:
	build.xml

build.xml

@@ -10,14 +10,13 @@
   <property file="html.properties" />
 
   <property name="version-m"  value="0.98" />
-  <property name="version"    value="0.98.2" />
+  <property name="version"    value="0.98.3" />
   <property name="stability"  value="beta" />
   <property name="releasenotes" value="
-- Fix bug #3385724: Rename tag ends with XML Parsing Error
+- Fix bug #3388456: Missing scripts/fix-unfiled-tags.php
-- Fix bug #3386178: 'system:unfiled' secret tag does not work
+
-- Fix bug #3384416: Update documentation to explain HTTP/HTTPS root problem
+The script was only missing in the .zip file; the PEAR package
-- Fix bug #3382126: Linked tags does not work for tags with spaces
+contained it - thus no 0.98.3 PEAR package.
-- Fix delicious API help page link
 " />
   <property name="zipfile"     value="${phing.project.name}-${version}.zip" />
   <property name="pkgfile"     value="${phing.project.name}-${version}.tgz" />
@@ -32,6 +31,8 @@
    <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"/>

data/templates/default/about.tpl.php

@@ -17,7 +17,7 @@ $this->includeTemplate($GLOBALS['top_include']);
 
 
 <?php if(!is_null($currentUser) && $currentUser->isAdmin()): ?>
-<li>SemanticScuttle v0.98.2</li>
+<li>SemanticScuttle v0.98.3</li>
 <?php endif ?>
 </ul>
 

doc/ChangeLog

@@ -3,6 +3,14 @@ ChangeLog for SemantiScuttle
 
 .. contents::
 
+0.98.3 - 2011-08-09
+-------------------
+- Fix bug #3388456: Missing scripts/fix-unfiled-tags.php
+
+The script was only missing in the .zip file; the PEAR package
+contained it - thus no 0.98.3 PEAR package.
+
+
 0.98.2 - 2011-08-08
 -------------------
 - Fix bug #3385724: Rename tag ends with XML Parsing Error

doc/README.rst

@@ -1,5 +1,5 @@
 ======================
-SemanticScuttle 0.98.2
+SemanticScuttle 0.98.3
 ======================
 A social bookmarking tool experimenting with new features
 like structured tags or collaborative descriptions of tags.

doc/UPGRADE.txt

@@ -4,7 +4,7 @@ Upgrading SemanticScuttle from a previous version
 
 .. contents::
 
-From version 0.94-0.98.1 to 0.98.2
+From version 0.94-0.98.1 to 0.98.3
 ==================================
 Run ``scripts/fix-unfiled-tags.php`` to fix old bookmarks that miss the
 ``system:unfiled`` tags.