[jetty9] 119/135: Removed the contexts directory and added start.d

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jetty9.

commit 74f0e1eab41d0a098e4310a0016382a8f76073fe
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 3 17:24:57 2015 +0100

    Removed the contexts directory and added start.d
---
 debian/jetty9.dirs    | 2 +-
 debian/jetty9.install | 1 -
 debian/jetty9.links   | 2 +-
 debian/jetty9.postrm  | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/jetty9.dirs b/debian/jetty9.dirs
index 7747c6d..539086d 100644
--- a/debian/jetty9.dirs
+++ b/debian/jetty9.dirs
@@ -1,5 +1,5 @@
 etc/jetty9
-etc/jetty9/contexts
+etc/jetty9/start.d
 usr/share/jetty9
 usr/share/jetty9/lib/ext
 usr/share/doc/jetty9
diff --git a/debian/jetty9.install b/debian/jetty9.install
index d576530..3da47dd 100644
--- a/debian/jetty9.install
+++ b/debian/jetty9.install
@@ -17,7 +17,6 @@ debian/root-webapp/*                                 usr/share/jetty9/default-ro
 test-jetty-webapp/src/main/webapp/jetty_banner.gif   usr/share/jetty9/default-root
 jetty-distribution/src/main/resources/start.ini      etc/jetty9
 jetty-distribution/src/main/resources/etc/*          etc/jetty9
-jetty-distribution/src/main/resources/contexts       etc/jetty9
 jetty-distribution/src/main/resources/resources      usr/share/jetty9
 jetty-start/target/classes/org/eclipse/jetty/start/start.config etc/jetty9
 
diff --git a/debian/jetty9.links b/debian/jetty9.links
index 880c4ed..423ccba 100755
--- a/debian/jetty9.links
+++ b/debian/jetty9.links
@@ -3,7 +3,7 @@
 var/lib/jetty9/webapps                          usr/share/jetty9/webapps
 var/log/jetty9                                  usr/share/jetty9/logs
 etc/jetty9                                      usr/share/jetty9/etc
-etc/jetty9/contexts                             usr/share/jetty9/contexts
+etc/jetty9/start.d                              usr/share/jetty9/start.d
 etc/jetty9/start.ini                            usr/share/jetty9/start.ini
 etc/jetty9/policy                               usr/share/jetty9/lib/policy
 
diff --git a/debian/jetty9.postrm b/debian/jetty9.postrm
index 32bea99..9e01290 100644
--- a/debian/jetty9.postrm
+++ b/debian/jetty9.postrm
@@ -26,7 +26,7 @@ case "$1" in
         if [ -d "/var/lib/jetty9" ] ; then
             rmdir --ignore-fail-on-non-empty /var/lib/jetty9 || true
         fi
-        rmdir --ignore-fail-on-non-empty /etc/jetty9/contexts /etc/jetty9 || true
+        rmdir --ignore-fail-on-non-empty /etc/jetty9/start.d /etc/jetty9 || true
 
         # clean up /etc/authbind after conffiles have been removed
         rmdir --ignore-fail-on-non-empty /etc/authbind/byuid /etc/authbind || true

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git