This is an automated email from the git hooks/post-receive script. henrich pushed a commit to branch master in repository jcodings.
commit 04540b590594e3f0719aa42724a31cdeeb6a3c0b Author: Hideki Yamane <[email protected]> Date: Wed Jan 15 19:51:33 2014 +0900 re-introduce changes I've not noticed Emmanuel Bourg's changes in git repo and pushed local changes. so merged changes with previous one --- debian/{README.Debian-source => README.source} | 0 debian/ant.properties | 6 ----- debian/changelog | 18 ++++++++++++++ debian/compat | 2 +- debian/control | 10 ++++---- debian/libjcodings-java.poms | 28 ++++++++++++++++++++++ debian/maven.ignoreRules | 3 +++ debian/maven.rules | 2 ++ debian/orig-tar.sh | 12 ---------- debian/patches/remove_unnecessary_dependency.patch | 20 ++++++++++++++++ debian/patches/series | 1 + debian/rules | 7 +----- 12 files changed, 79 insertions(+), 30 deletions(-) diff --git a/debian/README.Debian-source b/debian/README.source similarity index 100% rename from debian/README.Debian-source rename to debian/README.source diff --git a/debian/ant.properties b/debian/ant.properties deleted file mode 100644 index c13a929..0000000 --- a/debian/ant.properties +++ /dev/null @@ -1,6 +0,0 @@ -# Ensure that source and target are 1.6 -# For backwards compat on Java 7 -# see https://lists.debian.org/debian-java/2012/12/msg00026.html -# -ant.build.javac.source=1.6 -ant.build.javac.target=1.6 diff --git a/debian/changelog b/debian/changelog index 3981876..7df665d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +jcodings (1.0.11-2) unstable; urgency=medium + + [ Emmanuel Bourg ] + * Team upload. + * Build with Maven instead of Ant + * Switch to debhelper level 9 + * debian/control: + - Standards-Version updated to 3.9.5 (no changes) + - Use canonical URLs for the Vcs-* fields + * Removed the unused debian/orig-tar.sh script + * Renamed debian/README.Debian-source to README.source + + [ Hideki Yamane ] + * debian/patches + - add remove_unnecessary_dependency.patch + + -- Hideki Yamane <[email protected]> Mon, 13 Jan 2014 23:02:32 +0900 + jcodings (1.0.11-1) unstable; urgency=medium * New upstream release diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index cdd3749..123fa38 100644 --- a/debian/control +++ b/debian/control @@ -3,11 +3,11 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]>, Hideki Yamane <[email protected]> -Build-Depends: debhelper (>= 7), cdbs, maven-repo-helper -Build-Depends-Indep: ant, default-jdk -Standards-Version: 3.9.4 -Vcs-Git: git://git.debian.org/pkg-java/jcodings.git -Vcs-Browser: http://git.debian.org/?p=pkg-java/jcodings.git +Build-Depends: default-jdk, debhelper (>= 9), cdbs, maven-debian-helper +Build-Depends-Indep: junit4 +Standards-Version: 3.9.5 +Vcs-Git: git://anonscm.debian.org/pkg-java/jcodings.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/jcodings.git Homepage: http://github.com/jruby/jcodings Package: libjcodings-java diff --git a/debian/libjcodings-java.poms b/debian/libjcodings-java.poms new file mode 100644 index 0000000..1d885c3 --- /dev/null +++ b/debian/libjcodings-java.poms @@ -0,0 +1,28 @@ +# 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 --has-package-version --java-lib diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..2001412 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,3 @@ +org.apache.maven.plugins maven-javadoc-plugin * * * * +org.apache.maven.plugins maven-source-plugin * * * * +org.apache.maven.wagon wagon-webdav-jackrabbit * * * * diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..e85291e --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,2 @@ + +junit junit jar s/4\..*/4.x/ * * diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh deleted file mode 100755 index 9fa7791..0000000 --- a/debian/orig-tar.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -e - -# called by uscan with '--upstream-version' <version> <file> - -DIR=jcodings-$2 - -git clone http://github.com/jruby/jcodings.git $DIR -(cd $DIR && git checkout $2) - -tar cfz ../jcodings_$2.orig.tar.gz --exclude .git $DIR - -rm -rf $DIR ../$2 diff --git a/debian/patches/remove_unnecessary_dependency.patch b/debian/patches/remove_unnecessary_dependency.patch new file mode 100644 index 0000000..04ec152 --- /dev/null +++ b/debian/patches/remove_unnecessary_dependency.patch @@ -0,0 +1,20 @@ +Description: avoid unnecessary dependency to deal with FTBFS +Author: Hideki Yamane <[email protected]> +Forwarded: not-needed +Last-Update: 2014-01-15 + +--- jcodings-1.0.11.orig/pom.xml ++++ jcodings-1.0.11/pom.xml +@@ -9,12 +9,6 @@ + Byte based encoding support library for java + </description> + +- <parent> +- <groupId>org.sonatype.oss</groupId> +- <artifactId>oss-parent</artifactId> +- <version>7</version> +- </parent> +- + <issueManagement> + <system>Github</system> + <url>https://github.com/jruby/jcodings/issues</url> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..633d282 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +remove_unnecessary_dependency.patch diff --git a/debian/rules b/debian/rules index 5bff79c..b76c54a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,9 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/class/maven.mk JAVA_HOME := /usr/lib/jvm/default-java -ANT := ant -propertyfile $(CURDIR)/debian/ant.properties - -install/libjcodings-java:: - mh_installpom -plibjcodings-java pom.xml - mh_installjar -plibjcodings-java pom.xml -l target/jcodings.jar get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jcodings.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
