[pkg-java] r10308 - trunk/jetty/debian
Ludovic Claude
ludovicc-guest at alioth.debian.org
Sun Sep 6 23:34:55 UTC 2009
Author: ludovicc-guest
Date: 2009-09-06 23:34:55 +0000 (Sun, 06 Sep 2009)
New Revision: 10308
Added:
trunk/jetty/debian/libjetty-java-doc.install
Removed:
trunk/jetty/debian/libjetty-java-doc.docs
trunk/jetty/debian/libjetty-setuid-java.poms
Modified:
trunk/jetty/debian/changelog
trunk/jetty/debian/control
trunk/jetty/debian/jetty.init
trunk/jetty/debian/jetty.postinst
trunk/jetty/debian/jetty.postrm
trunk/jetty/debian/libjetty-extra-java.poms
trunk/jetty/debian/libjetty-java-doc.doc-base
trunk/jetty/debian/rules
Log:
* Move documentation to /usr/share/doc/libjetty-java
* Better postinst and postrm scripts, aligned with tomcat6 scripts:
- postinst: user jetty is created with its own group
- postrm: better cleanup of temporary data,
thourough remove and purge of data
* debian/changelog:
- fix suggest for package libjetty-java-doc, add libjetty-java-doc
to the list of Suggests for libjetty-java
- add libjetty-extra to the list of Suggests for package jetty.
Modified: trunk/jetty/debian/changelog
===================================================================
--- trunk/jetty/debian/changelog 2009-09-06 21:15:29 UTC (rev 10307)
+++ trunk/jetty/debian/changelog 2009-09-06 23:34:55 UTC (rev 10308)
@@ -1,3 +1,17 @@
+jetty (6.1.20-2) UNRELEASED; urgency=low
+
+ * Move documentation to /usr/share/doc/libjetty-java
+ * Better postinst and postrm scripts, aligned with tomcat6 scripts:
+ - postinst: user jetty is created with its own group
+ - postrm: better cleanup of temporary data,
+ thourough remove and purge of data
+ * debian/changelog:
+ - fix suggest for package libjetty-java-doc, add libjetty-java-doc
+ to the list of Suggests for libjetty-java
+ - add libjetty-extra to the list of Suggests for package jetty.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Mon, 07 Sep 2009 00:22:20 +0100
+
jetty (6.1.20-1) unstable; urgency=medium
[ Niels Thykier ]
Modified: trunk/jetty/debian/control
===================================================================
--- trunk/jetty/debian/control 2009-09-06 21:15:29 UTC (rev 10307)
+++ trunk/jetty/debian/control 2009-09-06 23:34:55 UTC (rev 10308)
@@ -16,7 +16,7 @@
Package: libjetty-java
Architecture: all
Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless, libservlet2.5-java, libslf4j-java
-Suggests: jetty
+Suggests: jetty, libjetty-java-doc
Description: Java servlet engine and webserver -- core libraries
Jetty is an Open Source HTTP Servlet Server written in 100% Java.
It is designed to be light weight, high performance, embeddable,
@@ -27,7 +27,7 @@
Section: doc
Architecture: all
Depends: ${misc:Depends}
-Suggests: jetty
+Suggests: libjetty-java
Description: Javadoc for the Jetty API
Jetty is an Open Source HTTP Servlet Server written in 100% Java.
It is designed to be light weight, high performance, embeddable,
@@ -41,6 +41,7 @@
Depends: ${misc:Depends}, libjetty-java (>= ${source:Version}), libmx4j-java,
libgnumail-java, libgnujaf-java, ant, libslf4j-java, libxerces2-java,
libtomcat6-java (>= 6.0.20-2)
+Recommends: libjetty-extra
Suggests: jetty
Description: Java servlet engine and webserver -- extra libraries
Jetty is an Open Source HTTP Servlet Server written in 100% Java.
@@ -51,23 +52,27 @@
jetty-servlet-tester, jetty-ajp, jetty-java5-threadpool,
jetty-client, jetty-rewrite-handler
-Package: libjetty-setuid-java
+Package: libjetty-extra
+Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libjetty-java (>= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libjetty-extra-java (>= ${source:Version})
+Conflicts: libjetty-setuid-java
Suggests: jetty
Description: Java servlet engine and webserver -- extra libraries
Jetty is an Open Source HTTP Servlet Server written in 100% Java.
It is designed to be light weight, high performance, embeddable,
extensible and flexible, thus making it an ideal platform for serving
dynamic HTTP requests from any Java application.
- Setuid can be used to start Jetty as root so that privileged ports
- may be accessed and then switch to a non-root user for security.
+ This package contains the platform-dependent libraries used by Jetty.
+ Currently it contains libsetuid.so which can be used to start Jetty as root
+ so that privileged ports may be accessed and then switched to a non-root
+ user for security.
Package: jetty
Architecture: all
-Depends: ${misc:Depends}, libjetty-java (>= ${source:Version}),
+Depends: ${misc:Depends}, libjetty-java (>= ${source:Version}),
libjetty-java-doc (>= ${source:Version}), adduser, jsvc, apache2-utils
-Suggests: libjetty-extra-java (>= ${source:Version}), libjetty-setuid-java (>= ${source:Version})
+Suggests: libjetty-extra-java (>= ${source:Version}), libjetty-extra (>= ${source:Version})
Description: Java servlet engine and webserver
Jetty is an Open Source HTTP Servlet Server written in 100% Java.
It is designed to be light weight, high performance, embeddable,
Modified: trunk/jetty/debian/jetty.init
===================================================================
--- trunk/jetty/debian/jetty.init 2009-09-06 21:15:29 UTC (rev 10307)
+++ trunk/jetty/debian/jetty.init 2009-09-06 23:34:55 UTC (rev 10308)
@@ -135,6 +135,7 @@
/usr/lib/j2se/1.4 \
/usr/lib/kaffe/ \
"
+
# Timeout in seconds for the shutdown of all webapps
JETTY_SHUTDOWN=30
Modified: trunk/jetty/debian/jetty.postinst
===================================================================
--- trunk/jetty/debian/jetty.postinst 2009-09-06 21:15:29 UTC (rev 10307)
+++ trunk/jetty/debian/jetty.postinst 2009-09-06 23:34:55 UTC (rev 10308)
@@ -5,7 +5,7 @@
configure)
if ! id jetty > /dev/null 2>&1 ; then
adduser --system --home /usr/share/jetty --no-create-home \
- --ingroup nogroup --disabled-password --shell /bin/false \
+ --group --disabled-password --shell /bin/false \
jetty
fi
chown -R jetty:adm /var/cache/jetty /var/log/jetty /var/lib/jetty
Modified: trunk/jetty/debian/jetty.postrm
===================================================================
--- trunk/jetty/debian/jetty.postrm 2009-09-06 21:15:29 UTC (rev 10307)
+++ trunk/jetty/debian/jetty.postrm 2009-09-06 23:34:55 UTC (rev 10308)
@@ -5,11 +5,38 @@
# Remove cached files
rm -rf /var/cache/jetty/*
+rm -rf /tmp/jetty-temp/*
case "$1" in
+ remove)
+ # Remove ROOT webapp if not modified
+ RWLOC="/var/lib/jetty/webapps/root"
+ RWFILES="$RWLOC/index.html $RWLOC/jetty_banner.gif"
+ if [ "`(cat $RWFILES | md5sum -) 2>/dev/null | cut -d ' ' -f 1`" \
+ = "12471c4b3020defb7ebd30ef84c0f9dd" ] ; then
+ rm $RWFILES
+ rmdir --ignore-fail-on-non-empty \
+ /var/lib/jetty/webapps/root \
+ /var/lib/jetty/webapps \
+ /var/lib/jetty || true
+ fi
+ if [ -d "/var/cache/jetty" ] ; then
+ rm -rf /var/cache/jetty
+ fi
+ if [ -d "/tmp/jetty-temp" ] ; then
+ rm -rf /tmp/jetty-temp
+ fi
+ ;;
+
purge)
- userdel jetty || true
- rm -rf /var/log/jetty
+ # Remove user/group and log files (don't remove everything under
+ # /var/lib/jetty because there might be user-installed webapps)
+ deluser jetty || true
+ rm -rf /var/log/jetty /tmp/jetty-temp
+ if [ -d "/var/lib/jetty" ] ; then
+ rmdir --ignore-fail-on-non-empty /var/lib/jetty || true
+ fi
+ rmdir --ignore-fail-on-non-empty /etc/jetty/contexts /etc/jetty || true
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
Modified: trunk/jetty/debian/libjetty-extra-java.poms
===================================================================
--- trunk/jetty/debian/libjetty-extra-java.poms 2009-09-06 21:15:29 UTC (rev 10307)
+++ trunk/jetty/debian/libjetty-extra-java.poms 2009-09-06 23:34:55 UTC (rev 10308)
@@ -6,4 +6,6 @@
extras/threadpool/pom.xml
extras/client/pom.xml
contrib/jetty-rewrite-handler/pom.xml
+extras/setuid/pom.xml
+extras/setuid/modules/java/pom.xml
Modified: trunk/jetty/debian/libjetty-java-doc.doc-base
===================================================================
--- trunk/jetty/debian/libjetty-java-doc.doc-base 2009-09-06 21:15:29 UTC (rev 10307)
+++ trunk/jetty/debian/libjetty-java-doc.doc-base 2009-09-06 23:34:55 UTC (rev 10308)
@@ -5,5 +5,5 @@
Section: Programming
Format: HTML
-Index: /usr/share/doc/libjetty-java-doc/api/index.html
-Files: /usr/share/doc/libjetty-java-doc/api/*
+Index: /usr/share/doc/libjetty-java/api/index.html
+Files: /usr/share/doc/libjetty-java/api/*
Deleted: trunk/jetty/debian/libjetty-java-doc.docs
===================================================================
--- trunk/jetty/debian/libjetty-java-doc.docs 2009-09-06 21:15:29 UTC (rev 10307)
+++ trunk/jetty/debian/libjetty-java-doc.docs 2009-09-06 23:34:55 UTC (rev 10308)
@@ -1 +0,0 @@
-api/
Added: trunk/jetty/debian/libjetty-java-doc.install
===================================================================
--- trunk/jetty/debian/libjetty-java-doc.install (rev 0)
+++ trunk/jetty/debian/libjetty-java-doc.install 2009-09-06 23:34:55 UTC (rev 10308)
@@ -0,0 +1 @@
+api usr/share/doc/libjetty-java
Deleted: trunk/jetty/debian/libjetty-setuid-java.poms
===================================================================
--- trunk/jetty/debian/libjetty-setuid-java.poms 2009-09-06 21:15:29 UTC (rev 10307)
+++ trunk/jetty/debian/libjetty-setuid-java.poms 2009-09-06 23:34:55 UTC (rev 10308)
@@ -1,3 +0,0 @@
-extras/setuid/pom.xml
-extras/setuid/modules/java/pom.xml
-
Modified: trunk/jetty/debian/rules
===================================================================
--- trunk/jetty/debian/rules 2009-09-06 21:15:29 UTC (rev 10307)
+++ trunk/jetty/debian/rules 2009-09-06 23:34:55 UTC (rev 10308)
@@ -34,6 +34,7 @@
mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-java5-threadpool extras/threadpool/pom.xml lib/ext/jetty-java5-threadpool-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-java5-threadpool.jar
mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-client extras/client/pom.xml lib/ext/jetty-client-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-client.jar
mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-rewrite-handler contrib/jetty-rewrite-handler/pom.xml lib/ext/jetty-rewrite-handler-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-rewrite-handler.jar
+ mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-setuid extras/setuid/modules/java/pom.xml lib/ext/jetty-setuid-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-setuid.jar
extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.c:
cd extras/setuid && install -D modules/native/src/main/native/org_mortbay_setuid_SetUID.c modules/native/target/generated/org_mortbay_setuid_SetUID.c
@@ -46,13 +47,12 @@
-shared modules/native/target/generated/org_mortbay_setuid_SetUID.c -fPIC -O \
-o ../../lib/ext/libsetuid.so
-build/lib$(PACKAGE)-setuid-java:: lib/ext/libsetuid.so
+build/lib$(PACKAGE)-extra:: lib/ext/libsetuid.so
-binary-post-install/lib$(PACKAGE)-setuid-java::
- mh_installpoms -plib$(PACKAGE)-setuid-java
- mh_installjar -plib$(PACKAGE)-setuid-java -l --usj-name=jetty-setuid extras/setuid/modules/java/pom.xml lib/ext/jetty-setuid-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-setuid.jar
- dh_install -plib$(PACKAGE)-setuid-java --sourcedir=lib/ext libsetuid.so /usr/lib/jetty
- dh_link -plib$(PACKAGE)-setuid-java /usr/lib/jetty/libsetuid.so /usr/share/jetty/lib/ext/libsetuid.so
+binary-post-install/lib$(PACKAGE)-extra::
+ mh_installpoms -plib$(PACKAGE)-extra
+ dh_install -plib$(PACKAGE)-extra --sourcedir=lib/ext libsetuid.so /usr/lib/jetty
+ dh_link -plib$(PACKAGE)-extra /usr/lib/jetty/libsetuid.so /usr/share/jetty/lib/ext/libsetuid.so
get-orig-source:
uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
More information about the pkg-java-commits
mailing list