This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository okio.
commit 7a94045f668bf7e9ea44d169f648d141043c3219 Author: Emmanuel Bourg <[email protected]> Date: Mon May 30 23:58:33 2016 +0200 Removed the patches --- debian/libokio-java.poms | 32 +++++++++++++++++++++++++++++-- debian/patches/dependencies_versions.diff | 22 --------------------- debian/patches/exclude_benchmarks.diff | 14 -------------- debian/patches/series | 2 -- 4 files changed, 30 insertions(+), 40 deletions(-) diff --git a/debian/libokio-java.poms b/debian/libokio-java.poms index 51028c9..0ed4d5d 100644 --- a/debian/libokio-java.poms +++ b/debian/libokio-java.poms @@ -1,2 +1,30 @@ -okio/pom.xml --no-parent --java-lib -pom.xml --no-parent --ignore-pom +# 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 +okio/pom.xml --java-lib --has-package-version +benchmarks/pom.xml --ignore diff --git a/debian/patches/dependencies_versions.diff b/debian/patches/dependencies_versions.diff deleted file mode 100644 index df88ccf..0000000 --- a/debian/patches/dependencies_versions.diff +++ /dev/null @@ -1,22 +0,0 @@ -Description: - okio's POM does not specify any versions for its dependencies which causes - errors. -Author: Kai-Chung Yan <[email protected]> -Last-Update: 2016-05-19 ---- a/okio/pom.xml -+++ b/okio/pom.xml -@@ -16,12 +16,14 @@ - <dependency> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-annotations</artifactId> -+ <version>debian</version> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> -+ <version>4.x</version> - <scope>test</scope> - </dependency> - </dependencies> diff --git a/debian/patches/exclude_benchmarks.diff b/debian/patches/exclude_benchmarks.diff deleted file mode 100644 index 331f138..0000000 --- a/debian/patches/exclude_benchmarks.diff +++ /dev/null @@ -1,14 +0,0 @@ -Description: Using patches to exclude benchmarks module simplies debian/rules. -Author: Kai-Chung Yan <[email protected]> -Last-Update: 2016-05-20 - ---- a/pom.xml -+++ b/pom.xml -@@ -19,7 +19,6 @@ - - <modules> - <module>okio</module> -- <module>benchmarks</module> - </modules> - - <properties> diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index b7c4f8f..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -dependencies_versions.diff -exclude_benchmarks.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/okio.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
