This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository json-smart.
commit 6cabd0418935e3f36e85a9b837b20bc65991dc45 Author: Emmanuel Bourg <[email protected]> Date: Tue Aug 2 17:11:36 2016 +0200 Build the new accessors-smart module --- debian/changelog | 7 +++++++ debian/libjson-smart-java.poms | 6 +++--- debian/patches/01-bundle-dependencies.patch | 15 +++++++++++++++ debian/patches/series | 1 + debian/rules | 5 ++--- 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index d049278..3a6b0c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +json-smart (2.2-1) UNRELEASED; urgency=medium + + * New upstream release + - Build the new accessors-smart module + + -- Emmanuel Bourg <[email protected]> Sat, 30 Jul 2016 22:12:10 +0200 + json-smart (1.2-1) unstable; urgency=medium * Initial release (Closes: #819635) diff --git a/debian/libjson-smart-java.poms b/debian/libjson-smart-java.poms index 1c244a6..054fec6 100644 --- a/debian/libjson-smart-java.poms +++ b/debian/libjson-smart-java.poms @@ -26,6 +26,6 @@ # Empty by default. [mh_install] # parent/pom.xml --no-parent --has-package-version -json-smart/pom.xml --has-package-version -json-smart-mini/pom.xml --ignore -json-smart-sample/pom.xml --ignore +accessors-smart/pom.xml --has-package-version --java-lib +json-smart/pom.xml --has-package-version --java-lib +json-smart-backport/pom.xml --ignore diff --git a/debian/patches/01-bundle-dependencies.patch b/debian/patches/01-bundle-dependencies.patch new file mode 100644 index 0000000..46b3040 --- /dev/null +++ b/debian/patches/01-bundle-dependencies.patch @@ -0,0 +1,15 @@ +Description: Set the version and the type of the accessors-smart dependency + to work around a build failure with maven-debian-helper +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/json-smart/pom.xml ++++ b/json-smart/pom.xml +@@ -32,6 +32,8 @@ + <dependency> + <groupId>net.minidev</groupId> + <artifactId>accessors-smart</artifactId> ++ <version>1.1</version> ++ <type>bundle</type> + </dependency> + + </dependencies> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..7cc7468 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01-bundle-dependencies.patch diff --git a/debian/rules b/debian/rules index afba222..761bb83 100755 --- a/debian/rules +++ b/debian/rules @@ -6,14 +6,13 @@ export JAVA_HOME = /usr/lib/jvm/default-java dh $@ --buildsystem=maven override_dh_auto_build: - dh_auto_build -- --file json-smart/pom.xml package + dh_auto_build -- --file parent/pom.xml package override_dh_auto_test: - dh_auto_test -- --file json-smart/pom.xml test + dh_auto_test -- --file parent/pom.xml package override_dh_auto_install: dh_auto_install -- --file parent/pom.xml - dh_auto_install -- --file json-smart/pom.xml get-orig-source: uscan --download-current-version --force-download --no-symlink -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/json-smart.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
