From 39f1d04abe55bd2fce9e9c81c8776d08add35188 Mon Sep 17 00:00:00 2001 From: Florian Schlichting Date: Tue, 16 Dec 2014 22:59:04 +0100 Subject: [PATCH] Debian: Ship all config examples and user documentation but remove website references since it was moved to its own git repository --- debian/.gitignore | 7 ------- debian/README.Debian | 11 ++++++++--- debian/changelog | 7 +++++++ debian/control | 3 ++- debian/davical-doc.doc-base.website | 12 ------------ debian/davical-doc.docs | 2 +- debian/davical-doc.install | 0 debian/davical.dirs | 1 + debian/davical.install | 9 +++------ debian/ignore_these_files | 1 - debian/keepme | 0 11 files changed, 22 insertions(+), 31 deletions(-) delete mode 100644 debian/.gitignore delete mode 100644 debian/davical-doc.doc-base.website delete mode 100644 debian/davical-doc.install create mode 100644 debian/davical.dirs delete mode 100644 debian/keepme diff --git a/debian/.gitignore b/debian/.gitignore deleted file mode 100644 index 91fe510e..00000000 --- a/debian/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -files -html -rscds -davical -davical-doc -rscds-phpdoc.ini -*.debhelper.log diff --git a/debian/README.Debian b/debian/README.Debian index 7a89091a..05f30a42 100644 --- a/debian/README.Debian +++ b/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 -somewhere below an existing vhost's document root +3. Create an Apache vhost config (e.g. from examples/apache-davical.conf), +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. diff --git a/debian/changelog b/debian/changelog index 2277ec8f..4e4205f4 100644 --- a/debian/changelog +++ b/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 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 diff --git a/debian/control b/debian/control index e2197899..bfbd764d 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,8 @@ Uploaders: Andrew McMillan , 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/ diff --git a/debian/davical-doc.doc-base.website b/debian/davical-doc.doc-base.website deleted file mode 100644 index 87c619df..00000000 --- a/debian/davical-doc.doc-base.website +++ /dev/null @@ -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 diff --git a/debian/davical-doc.docs b/debian/davical-doc.docs index 9b279bb2..70caef13 100644 --- a/debian/davical-doc.docs +++ b/debian/davical-doc.docs @@ -1,2 +1,2 @@ -docs/website/ docs/api/ +docs/davical_en_user_guide.odt diff --git a/debian/davical-doc.install b/debian/davical-doc.install deleted file mode 100644 index e69de29b..00000000 diff --git a/debian/davical.dirs b/debian/davical.dirs new file mode 100644 index 00000000..2a3df928 --- /dev/null +++ b/debian/davical.dirs @@ -0,0 +1 @@ +etc/davical/ diff --git a/debian/davical.install b/debian/davical.install index 886efcc5..ffa3b75f 100644 --- a/debian/davical.install +++ b/debian/davical.install @@ -1,6 +1,3 @@ -dba htdocs inc locale usr/share/davical -debian/keepme etc/davical/.keep -config/example-config.php usr/share/doc/davical/examples/davical-conf.php -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 +dba htdocs inc locale usr/share/davical +config/* usr/share/doc/davical/examples +scripts/*.php usr/share/davical/scripts diff --git a/debian/ignore_these_files b/debian/ignore_these_files index f649908c..94e71d67 100644 --- a/debian/ignore_these_files +++ b/debian/ignore_these_files @@ -1,4 +1,3 @@ -docs/website/wiki htdocs/.gitignore inc/test-RRULE.php inc/test-RRULE-v2.php diff --git a/debian/keepme b/debian/keepme deleted file mode 100644 index e69de29b..00000000