diff --git a/debian/README.Debian b/debian/README.Debian index 25e09c09..dcaead7c 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -21,19 +21,11 @@ Don't forget to restart postgres for the change to take effect! sudo -u postgres /usr/share/davical/dba/create-database.sh -3. Create an Apache vhost config (e.g. from examples/apache-davical.conf), +3. Review and activate the default Apache config ('a2ensite davical'), or symlink /usr/share/davical/htdocs somewhere below an existing vhost's document root. -4. Create /etc/davical/config.php containing at least the lines - - pg_connect[] = 'dbname=davical user=davical_app'; - ?> - -See example-config.php and the other config snippets in the examples -directory, as well as the DAViCal website and wiki, for a wealth of -possible customizations. +4. Customize /etc/davical/config.php if you want. 5. Point your browser to /setup.php (or wherever you symlinked the htdocs directory in step 3), log in as user admin with the password diff --git a/debian/control b/debian/control index fa27b2eb..e786f712 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Uploaders: Andrew McMillan , Florian Schlichting Standards-Version: 3.9.8 Build-Depends: debhelper (>= 9), + dh-exec, libawl-php (>= 0.57-1~), libawl-php (<< 0.58), gettext, php-apigen, diff --git a/debian/davical.dirs b/debian/davical.dirs deleted file mode 100644 index 2a3df928..00000000 --- a/debian/davical.dirs +++ /dev/null @@ -1 +0,0 @@ -etc/davical/ diff --git a/debian/davical.install b/debian/davical.install old mode 100644 new mode 100755 index 9c790fb8..2969c4a8 --- a/debian/davical.install +++ b/debian/davical.install @@ -1,4 +1,7 @@ +#! /usr/bin/dh-exec dba htdocs inc locale usr/share/davical +config/apache-davical.conf => etc/apache2/sites-available/davical.conf +config/example-config.php => etc/davical/config.php config/* usr/share/doc/davical/examples scripts/*.php usr/share/davical/scripts scripts/davical-cli usr/share/davical/scripts diff --git a/debian/rules b/debian/rules index b64fd8d3..1f5dc827 100755 --- a/debian/rules +++ b/debian/rules @@ -16,4 +16,6 @@ override_dh_auto_build: override_dh_installchangelogs: dh_installchangelogs ChangeLog rm debian/davical/usr/share/davical/htdocs/.htaccess || true + rm -f debian/davical/usr/share/doc/davical/examples/apache-davical.conf \ + debian/davical/usr/share/doc/davical/examples/example-config.php