Debian: Ship all config examples and user documentation

but remove website references since it was moved to its own git
repository

debian/.gitignore

@@ -1,7 +0,0 @@
-files
-html
-rscds
-davical
-davical-doc
-rscds-phpdoc.ini
-*.debhelper.log

debian/README.Debian

@@ -2,7 +2,7 @@ Initial DAViCal configuration on Debian
 =======================================
 
 General installation and configuration information is available at
-http://www.davical.org/installation.php Please visit that website for
+http://www.davical.org/installation.php. Please visit that website for
 details and further reading.
 
 After installation, basic configuration with a local database consists
@@ -19,8 +19,9 @@ version, for Debian Jessie try /etc/postgresql/9.4/main/pg_hba.conf):
 
     sudo -u postgres /usr/share/davical/dba/create-database.sh
 
-3. Create an Apache vhost config, or symlink /usr/share/davical/htdocs
+3. Create an Apache vhost config (e.g. from examples/apache-davical.conf),
-somewhere below an existing vhost's document root
+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
 
@@ -28,6 +29,10 @@ somewhere below an existing vhost's document root
       $c->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.
+
 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
 noted in step 2 above, and review the displayed issues, if any. 

debian/changelog

@@ -1,3 +1,10 @@
+davical (1.1.4~pre-1) UNRELEASED; urgency=medium
+
+  * Ship all config examples and user documentation, but remove website
+    references since it was moved to its own git repository.
+
+ -- Florian Schlichting <fsfs@debian.org>  Tue, 16 Dec 2014 22:43:07 +0100
+
 davical (1.1.3.1-1) unstable; urgency=medium
 
   * fix a critical typo in htdocs/always.php

debian/control

@@ -7,7 +7,8 @@ Uploaders: Andrew McMillan <awm@debian.org>,
 Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 9),
  libawl-php (>= 0.55-1~), libawl-php (<< 0.56),
- gettext
+ gettext,
+ php5-cli
 Vcs-git: https://gitlab.com/davical-project/davical.git
 Vcs-browser: https://gitlab.com/davical-project/davical
 Homepage: http://www.davical.org/

debian/davical-doc.doc-base.website

@@ -1,12 +0,0 @@
-Document: davical-website
-Title: DAViCal Website
-Section: Data Management
-Abstract: The DAViCal Website
- The DAViCal CalDAV & CardDAV Server can store calendars and addressbooks in a
- central location, providing shared calendars, free/busy publication and a
- basic administration interface. This offline copy of the website provides
- configuration information for both the server and a diverse range of clients.
-
-Format: HTML
-Index: /usr/share/doc/davical-doc/website/index.php.gz
-Files: /usr/share/doc/davical-doc/website/*.php /usr/share/doc/davical-doc/website/*.php.gz /usr/share/doc/davical-doc/website/*/*.php

debian/davical-doc.docs

@@ -1,2 +1,2 @@
-docs/website/
 docs/api/
+docs/davical_en_user_guide.odt

debian/davical.dirs

@@ -0,0 +1 @@
+etc/davical/

debian/davical.install

@@ -1,6 +1,3 @@
 dba htdocs inc locale   usr/share/davical
-debian/keepme etc/davical/.keep
+config/*                usr/share/doc/davical/examples
-config/example-config.php usr/share/doc/davical/examples/davical-conf.php
+scripts/*.php           usr/share/davical/scripts
-config/example-administration.yml usr/share/doc/davical/examples/administration.yml
-config/debug-config.php config/other-config.php usr/share/doc/davical/examples
-scripts/cron-sync-ldap.php scripts/tz-update.php usr/share/davical/scripts

debian/ignore_these_files

@@ -1,4 +1,3 @@
-docs/website/wiki
 htdocs/.gitignore
 inc/test-RRULE.php
 inc/test-RRULE-v2.php