5 files changed, 25 insertions, 37 deletions
diff --git a/www-apps/davical/ChangeLog b/www-apps/davical/ChangeLog
index bfc61df4c..dacc13af8 100644
--- a/www-apps/davical/ChangeLog
+++ b/www-apps/davical/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Nov 2008; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.5.2.ebuild, -files/postinstall-en-0.9.5.txt,
+  +davical-0.9.6.1.ebuild, +files/postinstall-en-0.9.6.1.txt:
+  New version
+
   16 Sep 2008; lebarjack <francois.perichon@univ-lille2.fr>
   -davical-0.9.5.ebuild, +davical-0.9.5.2.ebuild, -files/driver_ldap.patch:
   New version for davical (Ex-rscds)
diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
index 5fcbdc394..7d777b6b6 100644
--- a/www-apps/davical/Manifest
+++ b/www-apps/davical/Manifest
@@ -1,5 +1,6 @@
-AUX postinstall-en-0.9.5.txt 1014 RMD160 8d20edeefbc627bae1d025be057d629530821036 SHA1 7e6c71d17334834924cde3fd234f3bca61073469 SHA256 01c922524a1bd81b7f060fa58d4a0b8766587e1d93c6a6d6452306daaf5abce5
+AUX postinstall-en-0.9.6.1.txt 454 RMD160 70049c183595d07d5c593559ab12deefd6f527af SHA1 2e0a4b910cd1c4d70b3e2e833a4c6e0936e51578 SHA256 f48369f39f64da2ca21167e68d7787c963d118777809c8e5b73862adab0e3794
 AUX rscds.conf 11907 RMD160 bdd38b174cf76e2a2ea76da5ed09706d000ccd20 SHA1 12da666505dd8fb814e775f21f9bc7e623dc7597 SHA256 25d27389f72caf07e9c008bd1cfe791eac69a85309ab226946d9d7e4304ec9b7
-EBUILD davical-0.9.5.2.ebuild 1613 RMD160 3085513863eaa061dc1be35f9d8b0dc30bd3eafa SHA1 d9ffbb8ac028b312ea60c1a81e79b2fe91c99b08 SHA256 e8ba5f7cdfd193987e7858448e63b66ef90b21ab7b4fcd66b9c38029b10712ce
-MISC ChangeLog 552 RMD160 fa187220d7d566161981d57b53cd3f5f530e6417 SHA1 4310f8b8a84550420841dc3608d6aeb63822369d SHA256 3c0bb86e5948c7a06ff299bd576345ef3348d6e2f8212c0c9139ad89e98a4f77
+DIST davical_0.9.6.1.tar.gz 802115 RMD160 e2becba5493b1855b8a0f379d3392872cf35cb60 SHA1 d84e878e2b0984147d830937c5d1ee8ea8a051a5 SHA256 ffae4e384a011e2a202b00eecb23475cf4eeacd7abc529543220c441babdb2d4
+EBUILD davical-0.9.6.1.ebuild 1610 RMD160 b9cf93d54c1de0c71ea0d61cc93a5545f9d463aa SHA1 a5faeb8f616af3cad393da01fcc1b82c96d743fc SHA256 e0ad5bc0a22949ea6136c2f7b8bd0cfecfa39c717dfdffc92e61bf4748a01379
+MISC ChangeLog 749 RMD160 634167ec5df3b4c09d54af4acca8b6c16cae4d99 SHA1 69f831fa5f88a77b39a6517069320463527885e2 SHA256 a4dc44b8f0be612290a36816f9fd93e2237f95adcae704f1a6950c051ed9d1fb
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/www-apps/davical/davical-0.9.5.2.ebuild b/www-apps/davical/davical-0.9.6.1.ebuild
index 950c2de89..a2471edba 100644
--- a/www-apps/davical/davical-0.9.5.2.ebuild
+++ b/www-apps/davical/davical-0.9.6.1.ebuild
@@ -2,12 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils git webapp depend.php versionator
+inherit eutils webapp depend.php versionator
 
 DESCRIPTION="A CalDAV and iCal server"
-HOMEPAGE="http://rscds.sourceforge.net/"
-EGIT_REPO_URI="http://repo.or.cz/r/${PN}.git"
-EGIT_TREE="r${PV}"
+HOMEPAGE="http://davical.org/"
+SRC_URI="http://debian.mcmillan.net.nz/packages/davical/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -16,7 +15,7 @@ DEPEND="doc? ( dev-php/PEAR-PhpDocumentor )"
 RDEPEND="www-servers/apache
 	dev-lang/php
 	app-admin/pwgen
-	dev-php/libawl-php
+	>=dev-php/awl-0.33
 	dev-perl/yaml
 	dev-perl/DBI
 	dev-perl/DBD-Pg"
@@ -42,7 +41,7 @@ src_compile() {
 src_install() {
 	webapp_src_preinst
 
-	local docs="INSTALL README debian/README.debian \
+	local docs="INSTALL README debian/README.Debian \
 		testing/README.regression_tests \
 		TODO debian/changelog"
 	dodoc-php ${docs} || die "dodoc failed"
@@ -65,6 +64,6 @@ src_install() {
 	insinto /etc/davical/
 	newins "${FILESDIR}/rscds.conf" calendar.example.com-conf.php
 
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en-0.9.5.txt"
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en-${PV}.txt"
 	webapp_src_install
 }
diff --git a/www-apps/davical/files/postinstall-en-0.9.5.txt b/www-apps/davical/files/postinstall-en-0.9.5.txt
deleted file mode 100644
index 0565bf1c2..000000000
--- a/www-apps/davical/files/postinstall-en-0.9.5.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-1. You must setup a configuration file in the follow location:
-   /etc/davical/<servername>-conf.php
-
-2. Apache must be configured, here is a template:
-   <VirtualHost *:80>
-        DocumentRoot /var/www/<vhost>/htdocs/rscds/htdocs
-        DirectoryIndex index.php index.html
-        ServerName calendar.example.com
-        ServerAlias calendar.example.com
-        Alias /images/ /var/www/<vhost>/htdocs/images/
-        php_value include_path /usr/share/awl/inc
-        php_value magic_quotes_gpc 0
-        php_value register_globals 0
-        <Directory "/var/www/<vhost>/htdocs/rscds/htdocs">
-             Order deny,allow
-             Allow from all
-        </Directory>
-    </VirtualHost>
-
-3. You must setup a database in PostGreSQL.  Follow these instructions:
-   su postgres -c createuser --no-createdb general
-   su postgres -c \
-      /usr/share/webapps/rscds/<version>/sqlscripts/create-database.sh
-
-
-The full installation documentation can be found here:
-   http://rscds.sourceforge.net/installation.php
diff --git a/www-apps/davical/files/postinstall-en-0.9.6.1.txt b/www-apps/davical/files/postinstall-en-0.9.6.1.txt
new file mode 100644
index 000000000..a98dd8f98
--- /dev/null
+++ b/www-apps/davical/files/postinstall-en-0.9.6.1.txt
@@ -0,0 +1,10 @@
+You will need access to postgresql database to use davical.
+
+Read /usr/share/doc/www-apps/davical-0.9.6.1/INSTALL.gz for installation
+instructions. Full documentation and wiki on http://davical.org
+
+If you are upgrading from a previous version of davical, don't forget to
+upgrade the database structure with
+	cd /usr/share/webapps/davical/0.9.6.1/sqlscripts/
+	chmod u+x update-davical-database
+	./update-davical-database -dbuser xxxxxxx -appuser xxxxxxx