Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jenkins-json
Commits: 24b4cb9c by Emmanuel Bourg at 2021-01-26T19:26:19+01:00 Standards-Version updated to 4.5.1 - - - - - 31dffc3e by Emmanuel Bourg at 2021-01-26T19:27:09+01:00 Wrap and sort - - - - - e25b1c35 by Emmanuel Bourg at 2021-01-26T19:27:24+01:00 Switch to debhelper level 13 - - - - - 0297bf5e by Emmanuel Bourg at 2021-01-26T19:27:28+01:00 Use salsa.debian.org Vcs-* URLs - - - - - 5e08dc62 by Emmanuel Bourg at 2021-01-26T19:30:39+01:00 Removed the -java-doc package - - - - - 828464b0 by Emmanuel Bourg at 2021-01-26T19:37:56+01:00 Build with the DH sequencer instead of CDBS - - - - - da13ae04 by Emmanuel Bourg at 2021-01-26T19:39:07+01:00 Removed debian/orig-tar.sh - - - - - 1a844c38 by Emmanuel Bourg at 2021-01-26T19:40:25+01:00 Upload to unstable - - - - - 10 changed files: - debian/changelog - − debian/compat - debian/control - debian/copyright - − debian/libjenkins-json-java-doc.doc-base.api - − debian/libjenkins-json-java-doc.install - debian/libjenkins-json-java.poms - − debian/orig-tar.sh - debian/rules - debian/watch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,15 @@ +jenkins-json (2.4-jenkins-3-6) unstable; urgency=medium + + * Team upload. + * Build with the DH sequencer instead of CDBS + * Removed the -java-doc package + * Standards-Version updated to 4.5.1 + * Switch to debhelper level 13 + * Use salsa.debian.org Vcs-* URLs + * Removed debian/orig-tar.sh + + -- Emmanuel Bourg <[email protected]> Tue, 26 Jan 2021 19:40:07 +0100 + jenkins-json (2.4-jenkins-3-5) unstable; urgency=medium * Team upload. ===================================== debian/compat deleted ===================================== @@ -1 +0,0 @@ -9 ===================================== debian/control ===================================== @@ -4,53 +4,31 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: James Page <[email protected]> Build-Depends: - cdbs, - debhelper (>= 9), + debhelper-compat (= 13), default-jdk, - javahelper, - maven-debian-helper -Build-Depends-Indep: - default-jdk-doc, groovy, - groovy-doc, + javahelper, libcommons-beanutils-java, - libcommons-beanutils-java-doc, libcommons-collections3-java (>= 3.2.1-7~), libcommons-httpclient-java, - libcommons-httpclient-java-doc, libcommons-lang-java, libcommons-logging-java, - libcommons-logging-java-doc, libezmorph-java, - liblog4j1.2-java-doc, - libmaven-javadoc-plugin-java, liboro-java, libxmlunit-java, - libxom-java -Standards-Version: 3.9.8 -Vcs-Git: https://anonscm.debian.org/git/pkg-java/jenkins-json.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jenkins-json.git + libxom-java, + maven-debian-helper +Standards-Version: 4.5.1 +Vcs-Git: https://salsa.debian.org/java-team/jenkins-json.git +Vcs-Browser: https://salsa.debian.org/java-team/jenkins-json Homepage: https://github.com/jenkinsci/json-lib Package: libjenkins-json-java Architecture: all Depends: ${maven:Depends}, libcommons-collections3-java (>= 3.2.1-7~), ${misc:Depends} Recommends: ${maven:OptionalDepends} -Suggests: libjenkins-json-java-doc Description: Library for transforming Java objects between XML and JSON JSON-lib is a java library for transforming beans, maps, collections, java arrays and XML to JSON and back again to beans and DynaBeans. . This package contains the branch used/maintained by jenkins. - -Package: libjenkins-json-java-doc -Architecture: all -Section: doc -Depends: ${maven:DocDepends}, ${misc:Depends} -Recommends: ${maven:DocOptionalDepends} -Suggests: libjenkins-json-java -Description: Documentation for libjenkins-json-java - JSON-lib is a java library for transforming beans, maps, collections, - java arrays and XML to JSON and back again to beans and DynaBeans. - . - This package provides the API documentation for libjenkins-json-java. ===================================== debian/copyright ===================================== @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: json-lib (Hudson/Jenkins branch) Upstream-Contact: Douglas Crockford <json at JSON.org> as Original source code developer Andres Almiray <[email protected]> as Java Developer ===================================== debian/libjenkins-json-java-doc.doc-base.api deleted ===================================== @@ -1,10 +0,0 @@ -Document: libjenkins-json-java -Title: API Javadoc for json-lib (Hudson/Jenkins branch) -Author: Json-lib developers -Abstract: This is the API Javadoc provided for the - libjenkins-json-java library. -Section: Programming - -Format: HTML -Index: /usr/share/doc/libjenkins-json-java/api/index.html -Files: /usr/share/doc/libjenkins-json-java/api/* ===================================== debian/libjenkins-json-java-doc.install deleted ===================================== @@ -1 +0,0 @@ -target/apidocs/* usr/share/doc/libjenkins-json-java/api ===================================== debian/libjenkins-json-java.poms ===================================== @@ -25,4 +25,4 @@ # --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 +pom.xml --has-package-version --java-lib --usj-name=jenkins-json-lib ===================================== debian/orig-tar.sh deleted ===================================== @@ -1,15 +0,0 @@ -#!/bin/sh -e - -VERSION=$2 -TAR=../jenkins-json_$VERSION.orig.tar.gz -DIR=jenkins-json-$VERSION -mkdir -p $DIR -# Expand the upstream tarball -tar -xzf $TAR -C $DIR --strip-components=1 -# Repack excluding stuff we don't need -DATE="Fri Oct 21 12:29:52 BST 2011" -tar -c --exclude '*.jar' --exclude '*.class' \ - --exclude 'CVS' --exclude '.svn' --mtime="$DATE" $DIR | \ - gzip -9fn -c - > $TAR - -rm -rf $DIR ===================================== debian/rules ===================================== @@ -1,25 +1,10 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk +%: + dh $@ --buildsystem=maven --with javahelper -JAVA_HOME := /usr/lib/jvm/default-java -DEB_MAVEN_INSTALL_TO_USJ := false -PACKAGE := jenkins-json -JAR := json +override_dh_auto_configure: + dh_auto_configure -# Install branch specific named version in /usr/share/java -# This works around the fact that maven-debian-helper does -# not pass --usj-name from debian/*.poms -binary-post-install/lib$(PACKAGE)-java:: - mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java pom.xml -l \ - target/$(JAR)-lib-$(DEB_UPSTREAM_VERSION).jar --usj-name=$(PACKAGE)-lib - jh_classpath -plib$(PACKAGE)-java - -# Re-locate java 5 source code into main java directory -before-mvn-build:: - cp -r src/main/jdk15/* src/main/java/ - -get-orig-source: - uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename + # Re-locate java 5 source code into main java directory + cp -r src/main/jdk15/* src/main/java/ ===================================== debian/watch ===================================== @@ -1,2 +1,3 @@ -version=3 -https://github.com/jenkinsci/json-lib/tags .*/json-lib-(.*).tar.gz debian debian/orig-tar.sh +version=4 +opts="repack,compression=xz" \ +https://github.com/jenkinsci/json-lib/tags .*/json-lib-(.*).tar.gz View it on GitLab: https://salsa.debian.org/java-team/jenkins-json/-/compare/362773d69f10c5d59dfc11d82b16d82ca9d109d6...1a844c3807398b10481543b239dec6ba29584aa0 -- View it on GitLab: https://salsa.debian.org/java-team/jenkins-json/-/compare/362773d69f10c5d59dfc11d82b16d82ca9d109d6...1a844c3807398b10481543b239dec6ba29584aa0 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
