This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository bcel.
commit ca6063116021551e4af3dafdabd81a32e67a919c Author: Emmanuel Bourg <[email protected]> Date: Fri Oct 24 16:02:17 2014 +0200 Build with maven-debian-helper --- debian/ant.properties | 4 ---- debian/changelog | 5 ++++- debian/control | 11 +++++------ debian/libbcel-java-doc.install | 2 +- debian/libbcel-java.poms | 29 ++++++++++++++++++++++++++++- debian/maven.ignoreRules | 3 +++ debian/maven.publishedRules | 3 ++- debian/maven.rules | 5 ++++- debian/pom.xml | 21 --------------------- debian/rules | 22 +++++----------------- 10 files changed, 52 insertions(+), 53 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties deleted file mode 100644 index c1d99c1..0000000 --- a/debian/ant.properties +++ /dev/null @@ -1,4 +0,0 @@ -# Ensure that source and target are 1.5 -# For backwards compat on Java 7 -ant.build.javac.source=1.5 -ant.build.javac.target=1.5 diff --git a/debian/changelog b/debian/changelog index 78fb1ab..9319e34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ -bcel (5.2-11) UNRELEASED; urgency=medium +bcel (6.0~rc3-1) UNRELEASED; urgency=medium + * New upstream release supporting the Java 8 features (Closes: #448868) + * Build with maven-debian-helper + * Removed the patches * Standards-Version updated to 3.9.6 (no changes) * Moved the package to Git * debian/watch: Updated to watch the release tags on Github diff --git a/debian/control b/debian/control index 73e8224..38d8f0c 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]>, Emmanuel Bourg <[email protected]> -Build-Depends-Indep: maven-repo-helper (>= 1.5), default-jdk, default-jdk-doc, javahelper (>= 0.32~) +Build-Depends-Indep: maven-debian-helper, default-jdk, default-jdk-doc Build-Depends: ant (>= 1.6.5), cdbs (>= 0.4.5.3), debhelper (>= 9) Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-java/bcel.git @@ -12,8 +12,8 @@ Homepage: http://commons.apache.org/bcel/ Package: libbcel-java Architecture: all -Depends: ${misc:Depends}, ${java:Depends} -Suggests: libbcel-java-doc +Depends: ${misc:Depends}, ${maven:Depends} +Suggests: libbcel-java-doc, ${maven:OptionalDepends} Description: Analyze, create, and manipulate (binary) Java class files The Byte Code Engineering Library is intended to give users a convenient possibility to analyze, create, and manipulate (binary) Java class files @@ -31,9 +31,8 @@ Description: Analyze, create, and manipulate (binary) Java class files Package: libbcel-java-doc Architecture: all Section: doc -Depends: ${misc:Depends}, ${java:Depends} -Recommends: ${java:Recommends} -Suggests: libbcel-java +Depends: ${maven:DocDepends}, ${misc:Depends} +Suggests: libbcel-java, ${maven:DocOptionalDepends} Description: Documentation for Byte Code Engineering Library (BCEL) The Byte Code Engineering Library is intended to give users a convenient possibility to analyze, create, and manipulate (binary) Java class files diff --git a/debian/libbcel-java-doc.install b/debian/libbcel-java-doc.install index f9b1c82..b772b2d 100644 --- a/debian/libbcel-java-doc.install +++ b/debian/libbcel-java-doc.install @@ -1 +1 @@ -dist/docs/api usr/share/doc/libbcel-java +target/apidocs/* usr/share/doc/libbcel-java/api diff --git a/debian/libbcel-java.poms b/debian/libbcel-java.poms index 06fc76b..64b1188 100644 --- a/debian/libbcel-java.poms +++ b/debian/libbcel-java.poms @@ -1 +1,28 @@ -debian/pom.xml --no-parent --has-package-version --java-lib --artifact=target/bcel-*.jar +# 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 --has-package-version --java-lib diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..d2cedb8 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,3 @@ + +org.apache.maven.plugins maven-assembly-plugin * * * * +org.apache.maven.plugins maven-scm-publish-plugin * * * * diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules index 609e57e..5268f73 100644 --- a/debian/maven.publishedRules +++ b/debian/maven.publishedRules @@ -1 +1,2 @@ -s/bcel/org.apache.bcel/ bcel jar s/5\..*/5.x/ + +org.apache.bcel bcel jar s/.*/5.x/ * * diff --git a/debian/maven.rules b/debian/maven.rules index 437b0e5..901e43b 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1 +1,4 @@ -org.apache.bcel bcel jar s/5\..*/5.x/ + +junit junit jar s/4\..*/4.x/ * * +org.apache.bcel bcel jar s/.*/5.x/ * * +org.apache.commons commons-parent pom s/.*/debian/ * * diff --git a/debian/pom.xml b/debian/pom.xml deleted file mode 100644 index 654ff48..0000000 --- a/debian/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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> - - <groupId>org.apache.bcel</groupId> - <artifactId>bcel</artifactId> - <packaging>jar</packaging> - <version>5.2</version> - - <dependencies> - <dependency> - <groupId>jakarta-regexp</groupId> - <artifactId>jakarta-regexp</artifactId> - <version>1.4</version> - </dependency> - </dependencies> - -</project> diff --git a/debian/rules b/debian/rules index c4a6ecd..e9dd55b 100755 --- a/debian/rules +++ b/debian/rules @@ -1,23 +1,11 @@ #!/usr/bin/make -f -# debian/rules file for libbcel-java (uses cdbs) include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/javahelper.mk -include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/class/maven.mk -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar -DEB_ANT_BUILD_TARGET := dist +JAVA_HOME := /usr/lib/jvm/default-java -install/lib$(PACKAGE)-java:: - mh_install - -clean:: - rm -rf target dist - mh_clean - -get-orig-pom: - wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/org/apache/bcel/bcel/$(VERSION)/bcel-$(VERSION).pom +DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt +get-orig-source: + uscan --download-current-version --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bcel.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
