This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jetty9.
commit f2963bd45b4667fa42d69b6a91e2433ccd6bca67 Author: Emmanuel Bourg <[email protected]> Date: Wed Nov 25 16:21:43 2015 +0100 Build with the DH sequencer instead of CDBS --- debian/changelog | 2 +- debian/control | 2 +- debian/libjetty8-extra-java.links | 9 ++++ debian/libjetty8-extra-java.poms | 7 --- debian/libjetty8-java.links | 26 ++++++++++- debian/libjetty8-java.poms | 92 +++++++++++++++++++++++++-------------- debian/rules | 61 ++++---------------------- debian/source/lintian-overrides | 1 + 8 files changed, 105 insertions(+), 95 deletions(-) diff --git a/debian/changelog b/debian/changelog index 43b8429..11befae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ jetty8 (8.1.18-2) UNRELEASED; urgency=medium * Added the missing build dependency on asm * Replaced the dependency on libasm3-java with libasm4-java and fixed the compatibility with servlets containing Java 8 lambda expressions. - * debian/rules: Removed the install/libjetty8-java-doc target + * Build with the DH sequencer instead of CDBS -- Emmanuel Bourg <[email protected]> Wed, 25 Nov 2015 09:43:59 +0100 diff --git a/debian/control b/debian/control index 1e24844..12e23ba 100644 --- a/debian/control +++ b/debian/control @@ -4,10 +4,10 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Jakub Adam <[email protected]>, Emmanuel Bourg <[email protected]> Build-Depends: ant-optional, - cdbs (>> 0.4.5.3), debhelper (>= 9), default-jdk, default-jdk-doc, + dh-exec, glassfish-jmac-api (>= 1:2.1.1-b31g-2), javahelper, junit, diff --git a/debian/libjetty8-extra-java.links b/debian/libjetty8-extra-java.links old mode 100644 new mode 100755 index 3844f33..dd9eb3f --- a/debian/libjetty8-extra-java.links +++ b/debian/libjetty8-extra-java.links @@ -1,3 +1,12 @@ +#!/usr/bin/dh-exec + +usr/share/java/jetty8-ajp.jar usr/share/jetty8/lib/jetty-ajp-${VERSION}.jar +usr/share/java/jetty8-annotations.jar usr/share/jetty8/lib/jetty-annotations-${VERSION}.jar +usr/share/java/jetty8-client.jar usr/share/jetty8/lib/jetty-client-${VERSION}.jar +usr/share/java/jetty8-monitor.jar usr/share/jetty8/lib/monitor/jetty-monitor-${VERSION}.jar +usr/share/java/jetty8-plus.jar usr/share/jetty8/lib/jetty-plus-${VERSION}.jar +usr/share/java/jetty8-test-servlet.jar usr/share/jetty8/lib/test-jetty-servlet-${VERSION}.jar + usr/share/tomcat7/lib/annotations-api.jar usr/share/jetty8/lib/annotations/javax.annotation.jar usr/share/java/asm4.jar usr/share/jetty8/lib/annotations/org.objectweb.asm.jar usr/share/java/asm4-commons.jar usr/share/jetty8/lib/annotations/org.objectweb.asm.commons.jar diff --git a/debian/libjetty8-extra-java.poms b/debian/libjetty8-extra-java.poms deleted file mode 100644 index 9abae3a..0000000 --- a/debian/libjetty8-extra-java.poms +++ /dev/null @@ -1,7 +0,0 @@ -jetty-ajp/pom.xml --java-lib --usj-name=jetty8-ajp -jetty-annotations/pom.xml --java-lib --usj-name=jetty8-annotations -jetty-client/pom.xml --java-lib --usj-name=jetty8-client -jetty-jndi/pom.xml --java-lib --usj-name=jetty8-jndi -jetty-monitor/pom.xml --java-lib --usj-name=jetty8-monitor -jetty-plus/pom.xml --java-lib --usj-name=jetty8-plus -test-jetty-servlet/pom.xml --java-lib --usj-name=jetty8-test-servlet diff --git a/debian/libjetty8-java.links b/debian/libjetty8-java.links old mode 100644 new mode 100755 index 5fc22b9..2321173 --- a/debian/libjetty8-java.links +++ b/debian/libjetty8-java.links @@ -1 +1,25 @@ -usr/share/java/servlet-api-3.0.jar usr/share/jetty8/lib/servlet-api-3.0.jar +#!/usr/bin/dh-exec + +usr/share/java/jetty8-start.jar usr/share/jetty8/start.jar + +usr/share/java/jetty8-continuation.jar usr/share/jetty8/lib/jetty-continuation-${VERSION}.jar +usr/share/java/jetty8-deploy.jar usr/share/jetty8/lib/jetty-deploy-${VERSION}.jar +usr/share/java/jetty8-http.jar usr/share/jetty8/lib/jetty-http-${VERSION}.jar +usr/share/java/jetty8-io.jar usr/share/jetty8/lib/jetty-io-${VERSION}.jar +usr/share/java/jetty8-jaspi.jar usr/share/jetty8/lib/jetty-jaspi-${VERSION}.jar +usr/share/java/jetty8-jmx.jar usr/share/jetty8/lib/jetty-jmx-${VERSION}.jar +usr/share/java/jetty8-jsp.jar usr/share/jetty8/lib/jetty-jsp-${VERSION}.jar +usr/share/java/jetty8-nested.jar usr/share/jetty8/lib/jetty-nested-${VERSION}.jar +usr/share/java/jetty8-overlay-deployer.jar usr/share/jetty8/lib/jetty-overlay-deployer-${VERSION}.jar +usr/share/java/jetty8-policy.jar usr/share/jetty8/lib/jetty-policy-${VERSION}.jar +usr/share/java/jetty8-rewrite.jar usr/share/jetty8/lib/jetty-rewrite-${VERSION}.jar +usr/share/java/jetty8-security.jar usr/share/jetty8/lib/jetty-security-${VERSION}.jar +usr/share/java/jetty8-server.jar usr/share/jetty8/lib/jetty-server-${VERSION}.jar +usr/share/java/jetty8-servlet.jar usr/share/jetty8/lib/jetty-servlet-${VERSION}.jar +usr/share/java/jetty8-servlets.jar usr/share/jetty8/lib/jetty-servlets-${VERSION}.jar +usr/share/java/jetty8-util.jar usr/share/jetty8/lib/jetty-util-${VERSION}.jar +usr/share/java/jetty8-webapp.jar usr/share/jetty8/lib/jetty-webapp-${VERSION}.jar +usr/share/java/jetty8-websocket.jar usr/share/jetty8/lib/jetty-websocket-${VERSION}.jar +usr/share/java/jetty8-xml.jar usr/share/jetty8/lib/jetty-xml-${VERSION}.jar + +usr/share/java/servlet-api-3.0.jar usr/share/jetty8/lib/servlet-api-3.0.jar diff --git a/debian/libjetty8-java.poms b/debian/libjetty8-java.poms index 90ad63a..a90d0a5 100644 --- a/debian/libjetty8-java.poms +++ b/debian/libjetty8-java.poms @@ -1,34 +1,62 @@ +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install. [mh_install] +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=<name>: name to use when installing the library in /usr/share/java +# --usj-version=<version>: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=<path>: the destination for the real jar. +# It will be installed with mh_install. [mh_install] +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] +# pom.xml --no-parent -jetty-webapp/pom.xml --java-lib --usj-name=jetty8-webapp -jetty-policy/pom.xml --java-lib --usj-name=jetty8-policy -jetty-jsp/pom.xml -jetty-security/pom.xml --java-lib --usj-name=jetty8-security -jetty-server/pom.xml --java-lib --usj-name=jetty8-server -jetty-jndi/pom.xml --ignore-pom -jetty-xml/pom.xml --java-lib --usj-name=jetty8-xml -jetty-aggregate/pom.xml -jetty-aggregate/jetty-websocket/pom.xml --java-lib --usj-name=jetty8-websocket -jetty-aggregate/jetty-servlet/pom.xml --java-lib --usj-name=jetty8-servlet -jetty-ajp/pom.xml --ignore-pom -jetty-continuation/pom.xml --java-lib --usj-name=jetty8-continuation -jetty-annotations/pom.xml --ignore-pom -jetty-nosql/pom.xml --ignore-pom -jetty-monitor/pom.xml --ignore-pom -jetty-client/pom.xml --ignore-pom -jetty-overlay-deployer/pom.xml --java-lib --usj-name=jetty8-overlay-deployer -jetty-rewrite/pom.xml --java-lib --usj-name=jetty8-rewrite -jetty-plus/pom.xml --ignore-pom -jetty-deploy/pom.xml --java-lib --usj-name=jetty8-deploy -jetty-distribution/pom.xml -jetty-http/pom.xml --java-lib --usj-name=jetty8-http -jetty-nested/pom.xml -jetty-websocket/pom.xml -jetty-start/pom.xml --java-lib --usj-name=jetty8-start -jetty-http-spi/pom.xml -jetty-io/pom.xml --java-lib --usj-name=jetty8-io -jetty-util/pom.xml --java-lib --usj-name=jetty8-util -jetty-jaspi/pom.xml -jetty-jmx/pom.xml --java-lib --usj-name=jetty8-jmx -jetty-servlets/pom.xml --java-lib --usj-name=jetty8-servlets -jetty-servlet/pom.xml --java-lib --usj-name=jetty8-servlet +jetty-aggregate/pom.xml --ignore +jetty-continuation/pom.xml --java-lib --usj-name=jetty8-continuation +jetty-deploy/pom.xml --java-lib --usj-name=jetty8-deploy +jetty-distribution/pom.xml --ignore +jetty-http-spi/pom.xml --java-lib --usj-name=jetty8-http-spi +jetty-http/pom.xml --java-lib --usj-name=jetty8-http +jetty-io/pom.xml --java-lib --usj-name=jetty8-io +jetty-jaspi/pom.xml --java-lib --usj-name=jetty8-jaspi +jetty-jmx/pom.xml --java-lib --usj-name=jetty8-jmx +jetty-jsp/pom.xml --java-lib --usj-name=jetty8-jsp +jetty-nested/pom.xml --java-lib --usj-name=jetty8-nested +jetty-nosql/pom.xml --ignore +jetty-osgi/pom.xml --ignore +jetty-overlay-deployer/pom.xml --java-lib --usj-name=jetty8-overlay-deployer +jetty-policy/pom.xml --java-lib --usj-name=jetty8-policy +jetty-rewrite/pom.xml --java-lib --usj-name=jetty8-rewrite +jetty-security/pom.xml --java-lib --usj-name=jetty8-security +jetty-server/pom.xml --java-lib --usj-name=jetty8-server +jetty-servlet/pom.xml --java-lib --usj-name=jetty8-servlet +jetty-servlets/pom.xml --java-lib --usj-name=jetty8-servlets +jetty-start/pom.xml --java-lib --usj-name=jetty8-start +jetty-util/pom.xml --java-lib --usj-name=jetty8-util +jetty-webapp/pom.xml --java-lib --usj-name=jetty8-webapp +jetty-websocket/pom.xml --java-lib --usj-name=jetty8-websocket +jetty-xml/pom.xml --java-lib --usj-name=jetty8-xml +# Extras +jetty-ajp/pom.xml --java-lib --usj-name=jetty8-ajp --package=libjetty8-extra-java +jetty-annotations/pom.xml --java-lib --usj-name=jetty8-annotations --package=libjetty8-extra-java +jetty-client/pom.xml --java-lib --usj-name=jetty8-client --package=libjetty8-extra-java +jetty-jndi/pom.xml --java-lib --usj-name=jetty8-jndi --package=libjetty8-extra-java +jetty-monitor/pom.xml --java-lib --usj-name=jetty8-monitor --package=libjetty8-extra-java +jetty-plus/pom.xml --java-lib --usj-name=jetty8-plus --package=libjetty8-extra-java +test-jetty-servlet/pom.xml --java-lib --usj-name=jetty8-test-servlet --package=libjetty8-extra-java diff --git a/debian/rules b/debian/rules index 93029a5..153c5eb 100755 --- a/debian/rules +++ b/debian/rules @@ -1,58 +1,13 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/javahelper.mk -include /usr/share/cdbs/1/class/maven.mk +export JAVA_HOME := /usr/lib/jvm/default-java -JAVA_HOME := /usr/lib/jvm/default-java +%: + dh $@ --buildsystem=maven --with javahelper -DEB_MAVEN_INSTALL_TARGET := -DEB_MAVEN_INSTALL_DOC_TARGET := -DEB_MAVEN_DOC_TARGET := javadoc:aggregate -DEB_MAVEN_ARGS := -P-aggregates -P-osgi -DEB_INSTALL_CHANGELOGS_ALL := VERSION.txt +override_dh_link: + VERSION=$(shell grep 'debian.originalVersion' pom.xml | head -1 | sed -e 's/.*<debian.originalVersion>\(.*\)<\/debian.originalVersion>.*/\1/') \ + dh_link -LIBJETTY_JARS := continuation deploy http io jaspi jmx jsp nested \ - overlay-deployer policy rewrite security server servlet servlets start util \ - webapp websocket xml - - -LIBJETTY_EXTRA_JARS := ajp annotations client jndi monitor plus - -# Some java sources contain UTF-8 characters, build fails with C locale -export LC_ALL=C.UTF-8 - -install/libjetty8-java:: - mh_installpoms -plibjetty8-java - version=$(shell grep 'debian.originalVersion' pom.xml | head -1 | sed -e 's/.*<debian.originalVersion>\(.*\)<\/debian.originalVersion>.*/\1/'); \ - for lib in $(LIBJETTY_JARS); do \ - mh_installjar -plibjetty8-java --java-lib --usj-name=jetty8-$$lib \ - jetty-$$lib/pom.xml jetty-$$lib/target/jetty-$$lib-*.jar; \ - if [ $$lib = "start" ]; then \ - continue; \ - fi; \ - jar=jetty-$$lib-$$version.jar; \ - jar8=jetty8-$$lib-$$version.jar; \ - dh_link -plibjetty8-java usr/share/java/$$jar8 usr/share/jetty8/lib/$$jar; \ - done; \ - dh_link -plibjetty8-java usr/share/java/jetty8-start-$$version.jar usr/share/jetty8/start.jar - -install/libjetty8-extra-java:: - mh_installpoms -plibjetty8-extra-java - version=$(shell grep 'debian.originalVersion' pom.xml | head -1 | sed -e 's/.*<debian.originalVersion>\(.*\)<\/debian.originalVersion>.*/\1/'); \ - for lib in $(LIBJETTY_EXTRA_JARS); do \ - mh_installjar -plibjetty8-extra-java --java-lib --usj-name=jetty8-$$lib \ - jetty-$$lib/pom.xml jetty-$$lib/target/jetty-$$lib-*.jar; \ - if [ $$lib = "monitor" ]; then \ - continue; \ - fi; \ - jar=jetty-$$lib-$$version.jar; \ - jar8=jetty8-$$lib-$$version.jar; \ - dh_link -plibjetty8-extra-java usr/share/java/$$jar8 usr/share/jetty8/lib/$$jar; \ - done; \ - dh_link -plibjetty8-extra-java usr/share/java/jetty8-monitor-$$version.jar usr/share/jetty8/lib/monitor/jetty-monitor.jar; \ - # Add also test-jetty-servlet \ - mh_installjar -plibjetty8-extra-java --java-lib --usj-name=jetty8-test-servlet \ - test-jetty-servlet/pom.xml test-jetty-servlet/target/test-jetty-servlet-*.jar; \ - dh_link -plibjetty8-extra-java usr/share/java/jetty8-test-servlet-$$version.jar \ - usr/share/jetty8/lib/test-jetty-servlet-$$version.jar; +override_dh_installchangelogs: + dh_installchangelogs VERSION.txt diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 0000000..dc5b26f --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1 @@ +jetty8 source: dh-exec-subst-unknown-variable * VERSION -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
