# HG changeset patch
# User chris <chris@marvin>
# Date 1246438102 -7200
# Node ID 1090e21417988147d2ef7004337730c7a16aed20
# Parent  6fceb66e1ad7e70dbd98679966c7cd512c151f01
sonews/0.5.1 fixes merged

diff -r 6fceb66e1ad7 -r 1090e2141798 DEBIAN/control
--- a/DEBIAN/control	Fri Jun 26 16:48:50 2009 +0200
+++ b/DEBIAN/control	Wed Jul 01 10:48:22 2009 +0200
@@ -4,7 +4,7 @@
 Maintainer: Christian Lins <cli@openoffice.org>
 Homepage: http://www.sonews.org/
 Package: sonews
-Version: 0.5.0
+Version: 0.6.0beta
 Architecture: all
 Depends: openjdk-6-jre-headless | openjdk-6-jre | sun-java6-jre | cacao | jamvm, glassfish-mail, libmysql-java
 Suggests: kitten, libpg-java, mysql-server, libjchart2d-java
diff -r 6fceb66e1ad7 -r 1090e2141798 doc/sonews.xml
--- a/doc/sonews.xml	Fri Jun 26 16:48:50 2009 +0200
+++ b/doc/sonews.xml	Wed Jul 01 10:48:22 2009 +0200
@@ -12,6 +12,16 @@
     database as backend.
   </para>
   <para>
+    <emphasis role="bold">2009/07/01</emphasis>:
+    <emphasis>sonews/0.5.1</emphasis>
+    (<ulink url="files/sonews-0.5.1.tar.bz2">binary tarball</ulink>,
+    <ulink url="files/sonews-0.5.1-src.tar.bz2">source tarball</ulink>) bugfix
+    release.
+    Broken Cancel-mechanism and broken buildscript fixed.
+    See <ulink url="http://code.xerxys.info:8000/hgwebdir.cgi/sonews-0.5/log/287">
+      changelog</ulink> for more details.
+  </para>
+  <para>
     <emphasis role="bold">2009/06/29</emphasis>: 
     <emphasis>sonews/0.5.0</emphasis> 
     (<ulink url="files/sonews-0.5.0.tar.bz2">binary tarball</ulink>,
diff -r 6fceb66e1ad7 -r 1090e2141798 makedeb
--- a/makedeb	Fri Jun 26 16:48:50 2009 +0200
+++ b/makedeb	Wed Jul 01 10:48:22 2009 +0200
@@ -11,7 +11,7 @@
 jar -cf test.jar -C classes/ test/ 
 jar -ufe test.jar test.TestBench
 jar -cf sonews-helpers.jar helpers/
-jar -uf sonews.jar org/sonews/web/*.tmpl
+jar -uf sonews.jar org/sonews/web/tmpl/*.tmpl
 
 # Create faked root for packaging
 sudo rm -r $PACKAGE_ROOT/
diff -r 6fceb66e1ad7 -r 1090e2141798 org/sonews/daemon/Main.java
--- a/org/sonews/daemon/Main.java	Fri Jun 26 16:48:50 2009 +0200
+++ b/org/sonews/daemon/Main.java	Wed Jul 01 10:48:22 2009 +0200
@@ -42,7 +42,7 @@
   }
 
   /** Version information of the sonews daemon */
-  public static final String VERSION = "sonews/0.5.0";
+  public static final String VERSION = "sonews/0.6.0beta1";
   public static final Date   STARTDATE = new Date();
   
   /**
diff -r 6fceb66e1ad7 -r 1090e2141798 org/sonews/daemon/storage/Database.java
--- a/org/sonews/daemon/storage/Database.java	Fri Jun 26 16:48:50 2009 +0200
+++ b/org/sonews/daemon/storage/Database.java	Wed Jul 01 10:48:22 2009 +0200
@@ -482,8 +482,7 @@
       this.conn.setAutoCommit(false);
       
       this.pstmtDeleteArticle0.setString(1, messageID);
-      ResultSet rs = this.pstmtDeleteArticle0.executeQuery();
-      rs.next();
+      int rs = this.pstmtDeleteArticle0.executeUpdate();
       
       // We trust the ON DELETE CASCADE functionality to delete
       // orphaned references