This is an automated email from the git hooks/post-receive script. pini pushed a commit to branch master in repository json-simple.
commit 98f0c96da5c912f49b277530d16090bad5a1959c Author: Gilles Filippini <[email protected]> Date: Sat May 10 00:15:52 2014 +0200 Switch to CDBS + maven-debian-helper --- debian/changelog | 1 + debian/control | 5 +++-- debian/libjson-simple-doc.install | 2 +- debian/libjson-simple-java.jlibs | 1 - debian/libjson-simple-java.links | 1 - debian/libjson-simple-java.poms | 27 +++++++++++++++++++++++++++ debian/maven.cleanIgnoreRules | 1 + debian/maven.ignoreRules | 1 + debian/maven.publishedRules | 1 + debian/rules | 21 ++------------------- 10 files changed, 37 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4c34511..5b2c575 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ json-simple (1.1.1-2) UNRELEASED; urgency=medium + * Switch to CDBS + maven-debian-helper * New patch junit-scope-test.patch: Set scope 'test' for the junit maven dependency, so that it doesn't propagate into the installed pom file. diff --git a/debian/control b/debian/control index 7e8e45e..b72b7d4 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,9 @@ Section: java Priority: extra Maintainer: Debian Java maintainers <[email protected]> Uploaders: Gilles Filippini <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), javahelper, default-jdk, ant, - default-jdk-doc, maven-repo-helper (>= 1.6~) +Build-Depends: debhelper (>= 7.0.50~), cdbs, maven-debian-helper, default-jdk, + ant, default-jdk-doc, maven-repo-helper (>= 1.6~), + libmaven-bundle-plugin-java, libmaven-javadoc-plugin-java Standards-Version: 3.9.4 Homepage: http://code.google.com/p/json-simple/ Vcs-Git: git://anonscm.debian.org/pkg-java/json-simple.git diff --git a/debian/libjson-simple-doc.install b/debian/libjson-simple-doc.install index 4e7771f..b478829 100644 --- a/debian/libjson-simple-doc.install +++ b/debian/libjson-simple-doc.install @@ -1 +1 @@ -docs/* usr/share/doc/libjson-simple-java/api +target/apidocs/* usr/share/doc/libjson-simple-java/api diff --git a/debian/libjson-simple-java.jlibs b/debian/libjson-simple-java.jlibs deleted file mode 100644 index dab05bf..0000000 --- a/debian/libjson-simple-java.jlibs +++ /dev/null @@ -1 +0,0 @@ -target/json-simple-1.1.1.jar diff --git a/debian/libjson-simple-java.links b/debian/libjson-simple-java.links deleted file mode 100644 index 0d54c3c..0000000 --- a/debian/libjson-simple-java.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/java/json-simple.jar usr/share/java/json_simple.jar diff --git a/debian/libjson-simple-java.poms b/debian/libjson-simple-java.poms index 3f4bf6e..caee999 100644 --- a/debian/libjson-simple-java.poms +++ b/debian/libjson-simple-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 --usj-name=json-simple 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/rules b/debian/rules index 9646f9b..d586a7d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,28 +1,11 @@ #!/usr/bin/make -f # -*- makefile -*- -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# This has to be exported to make some magic below work. -export DH_OPTIONS +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/maven.mk export JAVA_HOME=/usr/lib/jvm/default-java -%: - dh $@ --with javahelper --with jh_maven_repo_helper - -override_dh_auto_build: - dh_auto_build - javadoc -windowtitle "Javadoc of json-simple" \ - -sourcepath src/main/java -d docs \ - -link /usr/share/doc/default-jdk-doc/api \ - org.json.simple - -override_dh_auto_clean: - [ ! -d target ] || dh_auto_clean - rm -fr docs - get-orig-source: destdir=$(CURDIR) && \ cd $(shell dirname $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))/.. && \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/json-simple.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
