From 83714e3889d846639c24c3e6401eb026969230b8 Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Thu, 21 Jul 2011 22:28:42 +0200
Subject: [PATCH] make release docs more readable, update version to 0.98,
 update pear package changelog, fix pear package inclusion files

---
 build.xml                              | 62 ++++++++++++++++----------
 data/templates/default/about.tpl.php   |  2 +-
 doc/ChangeLog                          |  1 +
 doc/developers/release-new-version.rst | 12 ++---
 4 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/build.xml b/build.xml
index 54456e3..202b3b8 100644
--- a/build.xml
+++ b/build.xml
@@ -9,18 +9,31 @@
   <property file="build.properties" />
   <property file="html.properties" />
 
-  <property name="version-m"  value="0.97" />
-  <property name="version"    value="0.97.0" />
+  <property name="version-m"  value="0.98" />
+  <property name="version"    value="0.98.0" />
   <property name="stability"  value="beta" />
-  <property name="releasenotes" value="- Many SQL optimizations
-- SemanticScuttle shows bookmarks 4 times faster now
-- New config option to skip 'SET NAMES UTF8' call: $dbneedssetnames
-- Do not highlight admin bookmarks when $enableAdminColors is disabled
-- Add russian translation
-- Make HTML export follow the specifications a bit better
-- Fix bug #2953732: faulty error message for duplicate bookmarks
-- Fix bug #2960663: do not send content-type headers twice for ajax/api scripts
-- Fix bug #2976593: fr_FR locale is vietnamese
+  <property name="releasenotes" value="- Switch to jQuery and drop dojo
+- Implement request #2928950: Private keys for RSS feeds (Mark Pemberton)
+- Implement request #3164348: Configurable default privacy (Brett Dee)
+- Implement request #1989987: Theming support
+- Implement request #3054906: Show user's full name instead of nickname
+- Implement patch #3059829: update ``FR_CA`` translation
+- Fix bug #3187177: Wrong URL / Export XML Bookmarks
+- Fix bug #3097187: Using opensearch with two tags does not work in Firefox
+- Fix bug #3251877: French translation JavaScript Bug when editing bookmarks
+- Fix bug #3168521: Title of tag-filtered RSS Feed is broken
+- Fix bug #2853627: Javascript warning
+- Fix bug in ``getTagsForBookmarks()`` that fetched all tags
+- Fix privacy issue when fetching tags of several users
+- Fix Google custom search XML
+- Show error message on mysqli connection errors
+- Update php-gettext library to 1.0.10
+- ``api/posts/add`` respects the 'replace' parameter now
+- Only URLs with an allowed protocol may be added to the database
+- Support HTTPS connections when ``$root`` is not configured
+- SQL schema version table to ease future database upgrades
+- Documentation is written with rST (reStructuredText) now
+- Support per-host configuration files
 " />
   <property name="zipfile"     value="${phing.project.name}-${version}.zip" />
   <property name="pkgfile"     value="${phing.project.name}-${version}.tgz" />
@@ -67,7 +80,6 @@
   <target name="package" depends="check"
    description="Creates the pear package"
   >
-   <!-- fixme: create package.xml with d51pearpkg2 -->
    <d51pearpkg2 dir="." baseinstalldir="/">
      <name>SemanticScuttle</name>
      <summary>A social bookmarking tool</summary>
@@ -109,30 +121,34 @@
      <ignore>**/.svn</ignore>
      <ignore>build*</ignore>
      <ignore>data/config.php</ignore>
+     <ignore>data/config.testing.php</ignore>
+     <ignore>data/config.testing-tmp.php</ignore>
      <ignore>data/locales/messages.po</ignore>
      <ignore>data/locales/*/LC_MESSAGES/messages.po</ignore>
      <ignore>dist/**</ignore>
-     <ignore>doc/developers/**</ignore>
      <ignore>scripts/**</ignore>
      <ignore>src/php-gettext/examples/**</ignore>
-     <ignore>src/php-gettext/bin/**</ignore>
-     <ignore>*.tgz</ignore>
+     <ignore>src/php-gettext/tests/**</ignore>
      <ignore>*.properties</ignore>
+     <ignore>*.sql</ignore>
+     <ignore>*.tgz</ignore>
 
-     <replacement
-      path="src/SemanticScuttle/header.php"
+     <replacement path="src/SemanticScuttle/header.php"
       type="pear-config" from="@data_dir@" to="data_dir"
       />
-     <replacement
-      path="src/SemanticScuttle/header.php"
+     <replacement path="src/SemanticScuttle/header.php"
       type="pear-config" from="@www_dir@" to="www_dir"
       />
-     <replacement
-      path="www/www-header.php"
+     <replacement path="src/SemanticScuttle/Config.php"
       type="pear-config" from="@data_dir@" to="data_dir"
       />
-     <replacement
-      path="tests/prepare.php"
+     <replacement path="src/SemanticScuttle/Config.php"
+      type="pear-config" from="@www_dir@" to="www_dir"
+      />
+     <replacement path="www/www-header.php"
+      type="pear-config" from="@data_dir@" to="data_dir"
+      />
+     <replacement path="tests/prepare.php"
       type="pear-config" from="@data_dir@" to="data_dir"
       />
 
diff --git a/data/templates/default/about.tpl.php b/data/templates/default/about.tpl.php
index 7bff98d..8a9b206 100644
--- a/data/templates/default/about.tpl.php
+++ b/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.97.0</li>
+<li>SemanticScuttle v0.98.0</li>
 <?php endif ?>
 </ul>
 
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 87c1b46..7ed1796 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -26,6 +26,7 @@ ChangeLog for SemantiScuttle
 - Support HTTPS connections when ``$root`` is not configured
 - SQL schema version table to ease future database upgrades
 - Documentation is written with rST (reStructuredText) now
+- Support per-host configuration files
 
 
 0.97.2 - 2011-02-17
diff --git a/doc/developers/release-new-version.rst b/doc/developers/release-new-version.rst
index 4b2540a..a5e77dc 100644
--- a/doc/developers/release-new-version.rst
+++ b/doc/developers/release-new-version.rst
@@ -2,18 +2,18 @@ How to release a new version of SemanticScuttle
 ===============================================
 
 0. Run unit tests and verify that all of them pass
-1. Update doc/ChangeLog
-2. Update doc/UPGRADE.txt
-3. Update version in data/templates/about.tpl.php,
-   build.xml and doc/README.txt
+1. Update ``doc/ChangeLog``
+2. Update ``doc/UPGRADE.txt``
+3. Update version in ``data/templates/about.tpl.php``,
+   ``build.xml`` and ``doc/README.rst``
 4. Create a release zip file via the build script:
-   Just type "phing".
+   Just type "``phing``".
 5. Make a test installation from your zip file with a fresh
    database. Register a user, add bookmarks etc.
 6. When all is fine, it's time to release.
    The build script takes care for most of the
    tasks.
-   Run "phing release", and it will upload the release to
+   Run "``phing release``", and it will upload the release to
    sourceforge and create a svn tag.
 7. Write announcement mail to the SemanticScuttle mailing list
    semanticscuttle-devel@lists.sourceforge.net