This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository cdi-api.
commit e4df5a686d1d750a233204e62e2d042fc6f1b2bb Author: Emmanuel Bourg <[email protected]> Date: Wed Jul 5 11:00:52 2017 +0200 Build with maven-debian-helper instead of javahelper --- debian/changelog | 4 +++- debian/control | 16 +++++++------ debian/javabuild | 1 - debian/libcdi-api-java-doc.install | 1 + debian/libcdi-api-java-doc.javadoc | 1 - debian/libcdi-api-java.jlibs | 1 - debian/libcdi-api-java.poms | 4 +++- debian/maven.rules | 4 ++++ debian/pom.xml | 47 -------------------------------------- debian/rules | 13 ++--------- 10 files changed, 22 insertions(+), 70 deletions(-) diff --git a/debian/changelog b/debian/changelog index f703a66..ecfdf6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -cdi-api (1.0-3) UNRELEASED; urgency=medium +cdi-api (1.2-1) UNRELEASED; urgency=medium * Team upload. + * New upstream release + * Build with maven-debian-helper instead of javahelper * Track and download the new releases from GitHub * Standards-Version updated to 4.0.0 * Switch to debhelper level 10 diff --git a/debian/control b/debian/control index 46ec3a2..dbb7e8a 100644 --- a/debian/control +++ b/debian/control @@ -5,11 +5,13 @@ Maintainer: Debian Java Maintainers <[email protected] Uploaders: Damien Raude-Morvan <[email protected]> Build-Depends: debhelper (>= 10), default-jdk, - maven-repo-helper, - javahelper (>= 0.37), + maven-debian-helper, libatinject-jsr330-api-java, libgeronimo-interceptor-3.0-spec-java, - libservlet3.1-java + libmaven-bundle-plugin-java, + libmaven-javadoc-plugin-java, + libservlet3.1-java, + testng Standards-Version: 4.0.0 Vcs-Git: https://anonscm.debian.org/git/pkg-java/cdi-api.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/cdi-api.git @@ -17,8 +19,8 @@ Homepage: http://cdi-spec.org Package: libcdi-api-java Architecture: all -Depends: ${java:Depends}, ${misc:Depends} -Recommends: ${java:Recommends} +Depends: ${maven:Depends}, ${misc:Depends} +Suggests: ${maven:OptionalDepends} Description: Contexts and Dependency Injection for Java EE Contexts and Dependency Injection (CDI aka JSR 299) defines a set of complementary services to help usage of Inversion of Control (IoC) @@ -30,8 +32,8 @@ Description: Contexts and Dependency Injection for Java EE Package: libcdi-api-java-doc Architecture: all Section: doc -Depends: ${java:Depends}, ${misc:Depends} -Recommends: ${java:Recommends} +Depends: ${maven:DocDepends}, ${misc:Depends} +Recommends: ${maven:DocOptionalDepends} Description: Contexts and Dependency Injection for Java EE - documentation Contexts and Dependency Injection (CDI aka JSR 299) defines a set of complementary services to help usage of Inversion of Control (IoC) diff --git a/debian/javabuild b/debian/javabuild deleted file mode 100644 index ef01257..0000000 --- a/debian/javabuild +++ /dev/null @@ -1 +0,0 @@ -cdi-api.jar src diff --git a/debian/libcdi-api-java-doc.install b/debian/libcdi-api-java-doc.install new file mode 100644 index 0000000..09e9074 --- /dev/null +++ b/debian/libcdi-api-java-doc.install @@ -0,0 +1 @@ +api/target/apidocs/* /usr/share/doc/libcdi-api-java/api/ diff --git a/debian/libcdi-api-java-doc.javadoc b/debian/libcdi-api-java-doc.javadoc deleted file mode 100644 index ce83b25..0000000 --- a/debian/libcdi-api-java-doc.javadoc +++ /dev/null @@ -1 +0,0 @@ -internal diff --git a/debian/libcdi-api-java.jlibs b/debian/libcdi-api-java.jlibs deleted file mode 100644 index bf3737e..0000000 --- a/debian/libcdi-api-java.jlibs +++ /dev/null @@ -1 +0,0 @@ -cdi-api.jar diff --git a/debian/libcdi-api-java.poms b/debian/libcdi-api-java.poms index a3128cd..3cf788e 100644 --- a/debian/libcdi-api-java.poms +++ b/debian/libcdi-api-java.poms @@ -1 +1,3 @@ -debian/pom.xml --no-parent --usj-name=cdi-api +pom.xml --ignore-pom +api/pom.xml --no-parent --has-package-version --java-lib +spec/pom.xml --ignore diff --git a/debian/maven.rules b/debian/maven.rules index ce4a3fd..642c7bc 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -15,3 +15,7 @@ # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., replacing the version with 3.x # junit junit jar s/3\\..*/3.x/ + +javax.el javax.el-api * s/.*/3.0/ * * +org.testng testng jar s/.*/6.x/ s/jdk15// * +s/javax.interceptor/org.apache.geronimo.specs/ s/javax.interceptor-api/geronimo-interceptor_3.0_spec/ * s/.*/debian/ * * diff --git a/debian/pom.xml b/debian/pom.xml deleted file mode 100644 index 79e317b..0000000 --- a/debian/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-api-parent</artifactId> - <version>1.0</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <packaging>jar</packaging> - - <name>CDI APIs</name> - <description>APIs for JSR-299: Contexts and Dependency Injection for Java EE</description> - - <dependencies> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>org.jboss.interceptor</groupId> - <artifactId>jboss-interceptor-api</artifactId> - </dependency> - - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - </dependency> - - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - </dependency> - </dependencies> - -</project> diff --git a/debian/rules b/debian/rules index 295e239..194b340 100755 --- a/debian/rules +++ b/debian/rules @@ -1,16 +1,7 @@ #!/usr/bin/make -f -MAVEN_REPO := http://repo1.maven.org/maven2/javax/enterprise/cdi-api/ -VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed -e 's/-[^-]*$$//') - -export JAVA_HOME=/usr/lib/jvm/default-java -export CLASSPATH=/usr/share/java/atinject-jsr330-api.jar:/usr/share/java/el-api-3.0.jar:/usr/share/java/geronimo-interceptor-3.0-spec.jar - %: - dh $@ --with javahelper --with jh_maven_repo_helper + dh $@ get-orig-source: - uscan --force-download --upstream-version $(VERSION) - -get-orig-pom: - wget --user-agent="" -O debian/pom.xml $(MAVEN_REPO)/$(VERSION)/cdi-api-$(VERSION).pom + uscan --force-download --download-current-version --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/cdi-api.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
