start preparing 0.9.20 release

diff --git a/ChangeLog b/ChangeLog
index 542d08b..65d2561 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Diogenes 0.9.20pre2
+Diogenes 0.9.20
  * added - add RSS feeds describing changes to barrels
  * added - offer preset style sheets for barrels
  * fixed - fix a warning when a barrel's menu is empty

diff --git a/Makefile b/Makefile
index 56009e4..ef335b9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # definitions
 
-VERSION = 0.9.20pre2
+VERSION = 0.9.20
 PKG_DIST = diogenes-$(VERSION)
 LIB_DIST = libdiogenes-$(VERSION)
 

diff --git a/debian/changelog b/debian/changelog
index 347cc15..e26dbe8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-diogenes (0.9.19+0.9.20pre2-1) unstable; urgency=low
+diogenes (0.9.20-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Jeremy Lainé <jeremy.laine@m4x.org>  Thu, 20 Jul 2006 23:22:38 +0200
+ -- Jeremy Lainé <jeremy.laine@m4x.org>  Thu, 27 Jul 2006 22:56:30 +0200
 
 diogenes (0.9.19-1) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 6ffbfc3..b302d90 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,6 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 
-# definitions
-SCRIPTDIR := usr/share/diogenes/scripts
-
 # documentation
 DEB_INSTALL_DOCS_ALL :=
 DEB_INSTALL_DOCS_diogenes := AUTHORS README
@@ -25,16 +22,18 @@ binary-install/diogenes::
                config/apache.conf \
                usr/share/diogenes/config
        
-       # files for db installation
-       cat debian/prefix.sql config/db/diogenes.sql > debian/diogenes/$(SCRIPTDIR)/diogenes.tables.sql.in
-       cat debian/prefix.sql config/db/diogenes.logactions.sql > debian/diogenes/$(SCRIPTDIR)/diogenes.logactions.sql.in
-
        # PHP files, templates, locales et al.
        dh_install -X.svn -pdiogenes -Xdiogenes.globals.inc.php.in \
                cvs.pl \
                htdocs include locale plugins scripts styles templates \
                usr/share/diogenes
        
+       # files for db installation
+       cat debian/prefix.sql config/db/diogenes.sql \
+         > debian/diogenes/usr/share/diogenes/scripts/diogenes.tables.sql.in
+       cat debian/prefix.sql config/db/diogenes.logactions.sql \
+         > debian/diogenes/usr/share/diogenes/scripts/diogenes.logactions.sql.in
+       
        # remove library files
        rm -rf debian/diogenes/usr/share/diogenes/include/diogenes