This is an automated email from the git hooks/post-receive script. nomadium pushed a commit to branch master in repository yecht.
commit 956a5f81a8e0a53c045401c0c6a6a3cebbd49b22 Author: Miguel Landaeta <[email protected]> Date: Sun Apr 10 18:17:30 2016 +0100 Upload to unstable --- debian/changelog | 15 ++++++++++++ debian/control | 17 +++++++++----- debian/copyright | 2 +- debian/libyecht-java.jlibs | 1 - debian/libyecht-java.poms | 27 ++++++++++++++++++++++ debian/maven.cleanIgnoreRules | 1 + debian/maven.ignoreRules | 1 + debian/maven.publishedRules | 1 + debian/maven.rules | 2 ++ .../patches/01_dont_hardcode_yecht_version.patch | 25 -------------------- debian/patches/series | 1 - debian/rules | 20 +++++----------- 12 files changed, 65 insertions(+), 48 deletions(-) diff --git a/debian/changelog b/debian/changelog index c439403..2c19611 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +yecht (1.1-1) unstable; urgency=medium + + * New upstream release. + * Deploy jruby maven artifact. + * Simplify packaging: + - Switch from cdbs to dh. + - Use maven-debian-helper instead of javahelper. + * d/control: Wrap and sort. + * d/copyright: Update dates. + * Bump Standards-Version to 3.9.7. No changes were required. + * Update Vcs-* fields to use https URLs. + * Drop unneeded patch 01_dont_hardcode_yecht_version.patch. + + -- Miguel Landaeta <[email protected]> Sun, 10 Apr 2016 18:16:22 +0100 + yecht (1.0-2) unstable; urgency=medium * Upload to unstable. diff --git a/debian/control b/debian/control index ef9a198..0534828 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,18 @@ Source: yecht Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Torsten Werner <[email protected]>, +Uploaders: + Torsten Werner <[email protected]>, Miguel Landaeta <[email protected]> -Build-Depends: debhelper (>= 9), cdbs, maven-repo-helper, ant, default-jdk, - javahelper, jruby -Standards-Version: 3.9.6 -Vcs-Git: git://anonscm.debian.org/pkg-java/yecht.git -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/yecht.git +Build-Depends: + debhelper (>= 9), + default-jdk, + jruby, + libbuild-helper-maven-plugin-java, + maven-debian-helper +Standards-Version: 3.9.7 +Vcs-Git: https://anonscm.debian.org/git/pkg-java/yecht.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/yecht.git Homepage: https://github.com/jruby/yecht Package: libyecht-java diff --git a/debian/copyright b/debian/copyright index d7233f1..b3451d8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,7 +9,7 @@ License: Expat Files: debian/* Copyright: 2011 Torsten Werner <[email protected]> - 2015 Miguel Landaeta <[email protected]> + 2015-2016 Miguel Landaeta <[email protected]> License: Expat License: Expat diff --git a/debian/libyecht-java.jlibs b/debian/libyecht-java.jlibs deleted file mode 100644 index c46f08f..0000000 --- a/debian/libyecht-java.jlibs +++ /dev/null @@ -1 +0,0 @@ -lib/yecht-*.jar diff --git a/debian/libyecht-java.poms b/debian/libyecht-java.poms index 43e746b..8545d14 100644 --- a/debian/libyecht-java.poms +++ b/debian/libyecht-java.poms @@ -1 +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 --no-parent diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/maven.cleanIgnoreRules @@ -0,0 +1 @@ + diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1 @@ + diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/maven.publishedRules @@ -0,0 +1 @@ + diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..9d87a49 --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,2 @@ + +junit junit jar s/3\..*/3.x/ * * diff --git a/debian/patches/01_dont_hardcode_yecht_version.patch b/debian/patches/01_dont_hardcode_yecht_version.patch deleted file mode 100644 index 0e746ab..0000000 --- a/debian/patches/01_dont_hardcode_yecht_version.patch +++ /dev/null @@ -1,25 +0,0 @@ -Description: Don't hard-code yecht version -Author: Miguel Landaeta <[email protected]> -Forwarded: no -Last-Update: 2015-01-24 - ---- yecht-1.0.orig/build.xml -+++ yecht-1.0/build.xml -@@ -90,7 +90,7 @@ - </target> - - <target name="jar" depends="compile" description="Create the yecht.jar file"> -- <jar destfile="${lib.dir}/yecht-0.0.2.jar"> -+ <jar destfile="${lib.dir}/yecht-${version}.jar"> - <fileset dir="${yecht.classes.dir}"> - <include name="**/*.class"/> - <include name="**/*.properties"/> -@@ -110,7 +110,7 @@ - </target> - - <target name="ext-ruby-jar" depends="ext-ruby-compile" description="Create the yecht-ruby.jar file"> -- <jar destfile="${lib.dir}/yecht-ruby-0.0.2.jar"> -+ <jar destfile="${lib.dir}/yecht-ruby-${version}.jar"> - <fileset dir="${yecht.classes.dir}"> - <include name="**/*.class"/> - <include name="**/*.properties"/> diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index edf79f6..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01_dont_hardcode_yecht_version.patch diff --git a/debian/rules b/debian/rules index a1bc73f..1779706 100755 --- a/debian/rules +++ b/debian/rules @@ -1,19 +1,11 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/class/javahelper.mk -include /usr/share/cdbs/1/class/ant.mk include /usr/share/dpkg/default.mk -JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_BUILD_TARGET := -Djruby.lib=/usr/share/java -Dversion=$(DEB_VERSION_UPSTREAM) ext-ruby-jar +%: + dh $@ --buildsystem=maven -pre-build:: - mkdir -p lib - -binary-post-install/lib$(DEB_SOURCE)-java:: - mh_installpoms -plib$(DEB_SOURCE)-java - mh_installjar -plib$(DEB_SOURCE)-java -l pom.xml lib/$(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM).jar - -clean:: - -$(RM) -r lib - mh_clean +override_dh_install: + dh_install + dh_install target/yecht-$(DEB_VERSION_UPSTREAM)-jruby.jar \ + usr/share/maven-repo/org/jruby/yecht/$(DEB_VERSION_UPSTREAM) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/yecht.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
