[jetty9] 116/135: Install the /usr/share/jetty9/lib/ links in the jetty9 package instead of the library packages
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Dec 17 14:53:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jetty9.
commit 0e849cc3eb89a7d8945882f583f6b6ee34e26992
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Dec 2 13:58:59 2015 +0100
Install the /usr/share/jetty9/lib/ links in the jetty9 package instead of the library packages
---
debian/jetty9.dirs | 1 +
debian/jetty9.links | 56 ++++++++++++++++++++++++++++++++++-----
debian/libjetty9-extra-java.links | 21 ---------------
debian/libjetty9-java.dirs | 3 ---
debian/libjetty9-java.links | 25 -----------------
5 files changed, 51 insertions(+), 55 deletions(-)
diff --git a/debian/jetty9.dirs b/debian/jetty9.dirs
index 80e9281..7747c6d 100644
--- a/debian/jetty9.dirs
+++ b/debian/jetty9.dirs
@@ -1,6 +1,7 @@
etc/jetty9
etc/jetty9/contexts
usr/share/jetty9
+usr/share/jetty9/lib/ext
usr/share/doc/jetty9
var/lib/jetty9/webapps
var/log/jetty9
diff --git a/debian/jetty9.links b/debian/jetty9.links
old mode 100644
new mode 100755
index 13a2802..880c4ed
--- a/debian/jetty9.links
+++ b/debian/jetty9.links
@@ -1,6 +1,50 @@
-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.ini usr/share/jetty9/start.ini
-etc/jetty9/policy usr/share/jetty9/lib/policy
+#!/usr/bin/dh-exec
+
+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.ini usr/share/jetty9/start.ini
+etc/jetty9/policy usr/share/jetty9/lib/policy
+
+usr/share/java/jetty9-start.jar usr/share/jetty9/start.jar
+
+usr/share/java/jetty9-ajp.jar usr/share/jetty9/lib/jetty-ajp-${VERSION}.jar
+usr/share/java/jetty9-annotations.jar usr/share/jetty9/lib/jetty-annotations-${VERSION}.jar
+usr/share/java/jetty9-client.jar usr/share/jetty9/lib/jetty-client-${VERSION}.jar
+usr/share/java/jetty9-continuation.jar usr/share/jetty9/lib/jetty-continuation-${VERSION}.jar
+usr/share/java/jetty9-deploy.jar usr/share/jetty9/lib/jetty-deploy-${VERSION}.jar
+usr/share/java/jetty9-http.jar usr/share/jetty9/lib/jetty-http-${VERSION}.jar
+usr/share/java/jetty9-io.jar usr/share/jetty9/lib/jetty-io-${VERSION}.jar
+usr/share/java/jetty9-jaspi.jar usr/share/jetty9/lib/jetty-jaspi-${VERSION}.jar
+usr/share/java/jetty9-jmx.jar usr/share/jetty9/lib/jetty-jmx-${VERSION}.jar
+usr/share/java/jetty9-jsp.jar usr/share/jetty9/lib/jetty-jsp-${VERSION}.jar
+usr/share/java/jetty9-monitor.jar usr/share/jetty9/lib/monitor/jetty-monitor-${VERSION}.jar
+usr/share/java/jetty9-nested.jar usr/share/jetty9/lib/jetty-nested-${VERSION}.jar
+usr/share/java/jetty9-overlay-deployer.jar usr/share/jetty9/lib/jetty-overlay-deployer-${VERSION}.jar
+usr/share/java/jetty9-plus.jar usr/share/jetty9/lib/jetty-plus-${VERSION}.jar
+usr/share/java/jetty9-policy.jar usr/share/jetty9/lib/jetty-policy-${VERSION}.jar
+usr/share/java/jetty9-rewrite.jar usr/share/jetty9/lib/jetty-rewrite-${VERSION}.jar
+usr/share/java/jetty9-security.jar usr/share/jetty9/lib/jetty-security-${VERSION}.jar
+usr/share/java/jetty9-server.jar usr/share/jetty9/lib/jetty-server-${VERSION}.jar
+usr/share/java/jetty9-servlet.jar usr/share/jetty9/lib/jetty-servlet-${VERSION}.jar
+usr/share/java/jetty9-servlets.jar usr/share/jetty9/lib/jetty-servlets-${VERSION}.jar
+usr/share/java/jetty9-test-servlet.jar usr/share/jetty9/lib/test-jetty-servlet-${VERSION}.jar
+usr/share/java/jetty9-util.jar usr/share/jetty9/lib/jetty-util-${VERSION}.jar
+usr/share/java/jetty9-webapp.jar usr/share/jetty9/lib/jetty-webapp-${VERSION}.jar
+usr/share/java/jetty9-websocket.jar usr/share/jetty9/lib/jetty-websocket-${VERSION}.jar
+usr/share/java/jetty9-xml.jar usr/share/jetty9/lib/jetty-xml-${VERSION}.jar
+
+usr/share/java/servlet-api-3.0.jar usr/share/jetty9/lib/servlet-api-3.0.jar
+usr/share/tomcat7/lib/annotations-api.jar usr/share/jetty9/lib/annotations/javax.annotation.jar
+usr/share/java/asm4.jar usr/share/jetty9/lib/annotations/org.objectweb.asm.jar
+usr/share/java/asm4-commons.jar usr/share/jetty9/lib/annotations/org.objectweb.asm.commons.jar
+usr/share/java/javax.mail.jar usr/share/jetty9/lib/jndi/javax.mail.jar
+usr/share/java/jsp-api-2.2.jar usr/share/jetty9/lib/jsp/javax.servlet.jsp.jar
+usr/share/tomcat7/lib/jasper.jar usr/share/jetty9/lib/jsp/jasper.jar
+usr/share/tomcat7/lib/jasper-el.jar usr/share/jetty9/lib/jsp/jasper-el.jar
+usr/share/tomcat7/lib/tomcat-api.jar usr/share/jetty9/lib/jsp/tomcat-api.jar
+usr/share/java/tomcat-juli.jar usr/share/jetty9/lib/jsp/tomcat-juli.jar
+usr/share/java/jstl1.1.jar usr/share/jetty9/lib/jsp/javax.servlet.jsp.jstl.jar
+usr/share/java/el-api-2.2.jar usr/share/jetty9/lib/jsp/javax.el.jar
+usr/share/java/standard.jar usr/share/jetty9/lib/jsp/org.apache.taglibs.standard.jar
diff --git a/debian/libjetty9-extra-java.links b/debian/libjetty9-extra-java.links
deleted file mode 100644
index 8ab5e9b..0000000
--- a/debian/libjetty9-extra-java.links
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/dh-exec
-
-usr/share/java/jetty9-ajp.jar usr/share/jetty9/lib/jetty-ajp-${VERSION}.jar
-usr/share/java/jetty9-annotations.jar usr/share/jetty9/lib/jetty-annotations-${VERSION}.jar
-usr/share/java/jetty9-client.jar usr/share/jetty9/lib/jetty-client-${VERSION}.jar
-usr/share/java/jetty9-monitor.jar usr/share/jetty9/lib/monitor/jetty-monitor-${VERSION}.jar
-usr/share/java/jetty9-plus.jar usr/share/jetty9/lib/jetty-plus-${VERSION}.jar
-usr/share/java/jetty9-test-servlet.jar usr/share/jetty9/lib/test-jetty-servlet-${VERSION}.jar
-
-usr/share/tomcat7/lib/annotations-api.jar usr/share/jetty9/lib/annotations/javax.annotation.jar
-usr/share/java/asm4.jar usr/share/jetty9/lib/annotations/org.objectweb.asm.jar
-usr/share/java/asm4-commons.jar usr/share/jetty9/lib/annotations/org.objectweb.asm.commons.jar
-usr/share/java/javax.mail.jar usr/share/jetty9/lib/jndi/javax.mail.jar
-usr/share/java/jsp-api-2.2.jar usr/share/jetty9/lib/jsp/javax.servlet.jsp.jar
-usr/share/tomcat7/lib/jasper.jar usr/share/jetty9/lib/jsp/jasper.jar
-usr/share/tomcat7/lib/jasper-el.jar usr/share/jetty9/lib/jsp/jasper-el.jar
-usr/share/tomcat7/lib/tomcat-api.jar usr/share/jetty9/lib/jsp/tomcat-api.jar
-usr/share/java/tomcat-juli.jar usr/share/jetty9/lib/jsp/tomcat-juli.jar
-usr/share/java/jstl1.1.jar usr/share/jetty9/lib/jsp/javax.servlet.jsp.jstl.jar
-usr/share/java/el-api-2.2.jar usr/share/jetty9/lib/jsp/javax.el.jar
-usr/share/java/standard.jar usr/share/jetty9/lib/jsp/org.apache.taglibs.standard.jar
diff --git a/debian/libjetty9-java.dirs b/debian/libjetty9-java.dirs
deleted file mode 100644
index e02a32d..0000000
--- a/debian/libjetty9-java.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/jetty9
-usr/share/jetty9/lib
-usr/share/jetty9/lib/ext
diff --git a/debian/libjetty9-java.links b/debian/libjetty9-java.links
deleted file mode 100644
index 2efd2bd..0000000
--- a/debian/libjetty9-java.links
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/dh-exec
-
-usr/share/java/jetty9-start.jar usr/share/jetty9/start.jar
-
-usr/share/java/jetty9-continuation.jar usr/share/jetty9/lib/jetty-continuation-${VERSION}.jar
-usr/share/java/jetty9-deploy.jar usr/share/jetty9/lib/jetty-deploy-${VERSION}.jar
-usr/share/java/jetty9-http.jar usr/share/jetty9/lib/jetty-http-${VERSION}.jar
-usr/share/java/jetty9-io.jar usr/share/jetty9/lib/jetty-io-${VERSION}.jar
-usr/share/java/jetty9-jaspi.jar usr/share/jetty9/lib/jetty-jaspi-${VERSION}.jar
-usr/share/java/jetty9-jmx.jar usr/share/jetty9/lib/jetty-jmx-${VERSION}.jar
-usr/share/java/jetty9-jsp.jar usr/share/jetty9/lib/jetty-jsp-${VERSION}.jar
-usr/share/java/jetty9-nested.jar usr/share/jetty9/lib/jetty-nested-${VERSION}.jar
-usr/share/java/jetty9-overlay-deployer.jar usr/share/jetty9/lib/jetty-overlay-deployer-${VERSION}.jar
-usr/share/java/jetty9-policy.jar usr/share/jetty9/lib/jetty-policy-${VERSION}.jar
-usr/share/java/jetty9-rewrite.jar usr/share/jetty9/lib/jetty-rewrite-${VERSION}.jar
-usr/share/java/jetty9-security.jar usr/share/jetty9/lib/jetty-security-${VERSION}.jar
-usr/share/java/jetty9-server.jar usr/share/jetty9/lib/jetty-server-${VERSION}.jar
-usr/share/java/jetty9-servlet.jar usr/share/jetty9/lib/jetty-servlet-${VERSION}.jar
-usr/share/java/jetty9-servlets.jar usr/share/jetty9/lib/jetty-servlets-${VERSION}.jar
-usr/share/java/jetty9-util.jar usr/share/jetty9/lib/jetty-util-${VERSION}.jar
-usr/share/java/jetty9-webapp.jar usr/share/jetty9/lib/jetty-webapp-${VERSION}.jar
-usr/share/java/jetty9-websocket.jar usr/share/jetty9/lib/jetty-websocket-${VERSION}.jar
-usr/share/java/jetty9-xml.jar usr/share/jetty9/lib/jetty-xml-${VERSION}.jar
-
-usr/share/java/servlet-api-3.0.jar usr/share/jetty9/lib/servlet-api-3.0.jar
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git
More information about the pkg-java-commits
mailing list