diff -Nru jglobus-2.1.0/debian/changelog jglobus-2.1.0/debian/changelog --- jglobus-2.1.0/debian/changelog 2015-08-14 05:33:44.000000000 +0000 +++ jglobus-2.1.0/debian/changelog 2015-12-07 18:56:14.000000000 +0000 @@ -1,3 +1,11 @@ +jglobus (2.1.0-3) unstable; urgency=medium + + * Replace mvn-debian with maven-debian-helper (Closes: #805003) + * Replace debian/patches/jglobus-no-sonatype.patch with rules in + debian/maven.ignoreRules + + -- Mattias Ellert Mon, 07 Dec 2015 19:42:28 +0100 + jglobus (2.1.0-2) unstable; urgency=medium * Update maven-surefire-plugin version diff -Nru jglobus-2.1.0/debian/control jglobus-2.1.0/debian/control --- jglobus-2.1.0/debian/control 2014-10-02 20:18:01.000000000 +0000 +++ jglobus-2.1.0/debian/control 2015-12-09 08:22:34.000000000 +0000 @@ -1,7 +1,7 @@ Source: jglobus Priority: optional Maintainer: Mattias Ellert -Build-Depends: debhelper (>= 5), maven-debian-helper (>= 1.6.7), maven-repo-helper, libmaven-compiler-plugin-java, libmaven-clean-plugin-java, libmaven-dependency-plugin-java, libmaven-enforcer-plugin-java, libmaven-install-plugin-java, libmaven-jar-plugin-java, libmaven-javadoc-plugin-java, libmaven-resources-plugin-java, libcommons-codec-java, libcommons-io-java, libcommons-logging-java, libbcprov-java (>= 1.47), liblog4j1.2-java, libtomcat8-java, libhttpclient-java, libaxis-java, libservlet3.1-java, junit4 +Build-Depends: debhelper (>= 5), maven-debian-helper, libmaven-compiler-plugin-java, libmaven-javadoc-plugin-java, libsurefire-java, junit4, libcommons-codec-java, libcommons-httpclient-java, libcommons-io-java, libcommons-logging-java, libbcprov-java (>= 1.47), libhttpclient-java, liblog4j1.2-java, libtomcat8-java, libaxis-java, libservlet3.1-java Standards-Version: 3.9.6 Section: java Homepage: http://github.com/jglobus/ @@ -72,7 +72,7 @@ Package: libjglobus-axisg-java Section: java Architecture: all -Depends: libjglobus-gss-java (= ${binary:Version}), libaxis-java, libservlet3.1-java, ${misc:Depends} +Depends: libjglobus-gss-java (= ${binary:Version}), libcommons-httpclient-java, libaxis-java, libservlet3.1-java, ${misc:Depends} Description: Globus Java - Apache AXIS support Globus Java library with Apache AXIS support diff -Nru jglobus-2.1.0/debian/copyright jglobus-2.1.0/debian/copyright --- jglobus-2.1.0/debian/copyright 2014-10-02 19:47:35.000000000 +0000 +++ jglobus-2.1.0/debian/copyright 2015-12-08 15:37:21.000000000 +0000 @@ -5,19 +5,6 @@ Files: * Copyright: 1999-2014 University of Chicago License: Apache-2.0 - Licensed under the Apache License, Version 2.0 (the "License"); you - may not use this file except in compliance with the License. You may - obtain a copy of the License at - . - http://www.apache.org/licenses/LICENSE-2.0 - . - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. - . - On Debian systems the full text of the Apache-2.0 license can be - found in the /usr/share/common-licenses/Apache-2.0 file. Files: ssl-proxies/src/main/java/org/globus/tools/GridCertRequest.java Copyright: 2003 National Research Council of Canada @@ -57,5 +44,18 @@ Files: debian/* Copyright: 2012-2014 Mattias Ellert License: Apache-2.0 - On Debian systems the full text of the Apache-2.0 license can be found in - the /usr/share/common-licenses/Apache-2.0 file. + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); you + may not use this file except in compliance with the License. You may + obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. + . + On Debian systems the full text of the Apache-2.0 license can be + found in the /usr/share/common-licenses/Apache-2.0 file. diff -Nru jglobus-2.1.0/debian/libjglobus-parent-java.poms jglobus-2.1.0/debian/libjglobus-parent-java.poms --- jglobus-2.1.0/debian/libjglobus-parent-java.poms 1970-01-01 00:00:00.000000000 +0000 +++ jglobus-2.1.0/debian/libjglobus-parent-java.poms 2015-12-09 09:41:19.000000000 +0000 @@ -0,0 +1,12 @@ +pom.xml --no-parent --has-package-version --package=libjglobus-parent-java +test-utils/pom.xml --has-package-version --java-lib --package=libjglobus-parent-java --usj-name=jglobus-test-utils +container-test-utils/pom.xml --has-package-version --java-lib --package=libjglobus-parent-java --usj-name=jglobus-container-test-utils +ssl-proxies/pom.xml --has-package-version --java-lib --package=libjglobus-ssl-proxies-java --usj-name=jglobus-ssl-proxies +jsse/pom.xml --has-package-version --java-lib --package=libjglobus-jsse-java --usj-name=jglobus-jsse +gss/pom.xml --has-package-version --java-lib --package=libjglobus-gss-java --usj-name=jglobus-gss +gram/pom.xml --has-package-version --java-lib --package=libjglobus-gram-java --usj-name=jglobus-gram +gridftp/pom.xml --has-package-version --java-lib --package=libjglobus-gridftp-java --usj-name=jglobus-gridftp +ssl-proxies-tomcat/pom.xml --has-package-version --java-lib --package=libjglobus-ssl-proxies-tomcat-java --usj-name=jglobus-ssl-proxies-tomcat +io/pom.xml --has-package-version --java-lib --package=libjglobus-io-java --usj-name=jglobus-io +myproxy/pom.xml --has-package-version --java-lib --package=libjglobus-myproxy-java --usj-name=jglobus-myproxy +axis/pom.xml --has-package-version --java-lib --package=libjglobus-axisg-java --usj-name=jglobus-axisg diff -Nru jglobus-2.1.0/debian/maven.ignoreRules jglobus-2.1.0/debian/maven.ignoreRules --- jglobus-2.1.0/debian/maven.ignoreRules 1970-01-01 00:00:00.000000000 +0000 +++ jglobus-2.1.0/debian/maven.ignoreRules 2015-12-08 12:31:20.000000000 +0000 @@ -0,0 +1,2 @@ +org.apache.maven.plugins maven-release-plugin +org.apache.maven.plugins maven-source-plugin diff -Nru jglobus-2.1.0/debian/maven.rules jglobus-2.1.0/debian/maven.rules --- jglobus-2.1.0/debian/maven.rules 2015-08-14 05:05:44.000000000 +0000 +++ jglobus-2.1.0/debian/maven.rules 2015-12-09 06:53:54.000000000 +0000 @@ -1,8 +1,7 @@ -commons-httpclient commons-httpclient * s/.*/3.x/ -javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ -junit junit * s/.*/4.x/ -log4j log4j * s/.*/1.2.x/ -org.apache.tomcat tomcat-catalina * s/.*/8.x/ -org.apache.tomcat tomcat-coyote * s/.*/8.x/ -org.bouncycastle s/bcprov-.*/bcprov/ * s/.*/debian/ -org.apache.maven.plugins maven-surefire-plugin * s/.*/2.17/ +commons-httpclient commons-httpclient * s/.*/3.x/ +javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ +junit junit * s/.*/4.x/ +log4j log4j * s/.*/1.2.x/ +org.apache.tomcat tomcat-catalina * s/.*/8.x/ +org.apache.tomcat tomcat-coyote * s/.*/8.x/ +org.bouncycastle s/bcprov.*/bcprov/ * s/.*/debian/ diff -Nru jglobus-2.1.0/debian/mh_resolve_dependencies jglobus-2.1.0/debian/mh_resolve_dependencies --- jglobus-2.1.0/debian/mh_resolve_dependencies 1970-01-01 00:00:00.000000000 +0000 +++ jglobus-2.1.0/debian/mh_resolve_dependencies 2015-12-08 12:09:10.000000000 +0000 @@ -0,0 +1,2 @@ +#!/bin/sh +touch debian/libjglobus-parent-java.substvars diff -Nru jglobus-2.1.0/debian/patches/jglobus-no-sonatype.patch jglobus-2.1.0/debian/patches/jglobus-no-sonatype.patch --- jglobus-2.1.0/debian/patches/jglobus-no-sonatype.patch 2014-10-02 20:29:22.000000000 +0000 +++ jglobus-2.1.0/debian/patches/jglobus-no-sonatype.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -diff -ur JGlobus-JGlobus-Release-2.1.0.orig/pom.xml JGlobus-JGlobus-Release-2.1.0/pom.xml ---- JGlobus-JGlobus-Release-2.1.0.orig/pom.xml 2014-09-26 05:46:02.000000000 +0200 -+++ JGlobus-JGlobus-Release-2.1.0/pom.xml 2014-10-02 22:25:50.996000000 +0200 -@@ -53,13 +53,6 @@ - JGlobus-Release-2.1.0 - - -- -- -- org.sonatype.oss -- oss-parent -- 7 -- -- - - - -@@ -72,18 +65,6 @@ - - - org.apache.maven.plugins -- maven-source-plugin -- 2.3 -- -- -- -- jar -- -- -- -- -- -- org.apache.maven.plugins - maven-surefire-plugin - 2.17 - -@@ -91,15 +72,6 @@ - true - - -- -- -- org.apache.maven.plugins -- maven-release-plugin -- 2.5 -- - - - diff -Nru jglobus-2.1.0/debian/patches/series jglobus-2.1.0/debian/patches/series --- jglobus-2.1.0/debian/patches/series 2015-08-14 05:43:32.000000000 +0000 +++ jglobus-2.1.0/debian/patches/series 2015-12-08 12:27:25.000000000 +0000 @@ -1,5 +1,3 @@ -# Remove sonatype parent and maven-source-plugin dependency from pom file -jglobus-no-sonatype.patch # DERObjectIdentifier is obsolete jglobus-DERObjectIdentifier-is-obsolete.patch # Don't force SSLv3 diff -Nru jglobus-2.1.0/debian/rules jglobus-2.1.0/debian/rules --- jglobus-2.1.0/debian/rules 2014-10-02 20:17:03.000000000 +0000 +++ jglobus-2.1.0/debian/rules 2015-12-09 06:27:03.000000000 +0000 @@ -1,91 +1,13 @@ #!/usr/bin/make -f # -*- makefile -*- -configure: configure-stamp +%: + dh $@ --buildsystem=maven -configure-stamp: - dh_testdir - mh_patchpom -plibjglobus-parent-java pom.xml - mh_patchpom -plibjglobus-parent-java test-utils/pom.xml - mh_patchpom -plibjglobus-parent-java container-test-utils/pom.xml - mh_patchpom -plibjglobus-ssl-proxies-java ssl-proxies/pom.xml - mh_patchpom -plibjglobus-jsse-java jsse/pom.xml - mh_patchpom -plibjglobus-gss-java gss/pom.xml - mh_patchpom -plibjglobus-gram-java gram/pom.xml - mh_patchpom -plibjglobus-gridftp-java gridftp/pom.xml - mh_patchpom -plibjglobus-ssl-proxies-tomcat-java ssl-proxies-tomcat/pom.xml - mh_patchpom -plibjglobus-io-java io/pom.xml - mh_patchpom -plibjglobus-myproxy-java myproxy/pom.xml - mh_patchpom -plibjglobus-axisg-java axis/pom.xml +override_dh_auto_test: - touch $@ - -build: build-arch build-indep - -build-arch: - -build-indep: build-stamp - -build-stamp: configure-stamp - dh_testdir - mvn-debian -Dmaven.test.skip=true package javadoc:aggregate - touch $@ - -clean: - dh_testdir - dh_testroot - - rm -rf target - rm -rf */target - - [ -r pom.xml.save ] && mv pom.xml.save pom.xml || : - [ -r test-utils/pom.xml.save ] && mv test-utils/pom.xml.save test-utils/pom.xml || : - [ -r container-test-utils/pom.xml.save ] && mv container-test-utils/pom.xml.save container-test-utils/pom.xml || : - [ -r ssl-proxies/pom.xml.save ] && mv ssl-proxies/pom.xml.save ssl-proxies/pom.xml || : - [ -r jsse/pom.xml.save ] && mv jsse/pom.xml.save jsse/pom.xml || : - [ -r gss/pom.xml.save ] && mv gss/pom.xml.save gss/pom.xml || : - [ -r gram/pom.xml.save ] && mv gram/pom.xml.save gram/pom.xml || : - [ -r gridftp/pom.xml.save ] && mv gridftp/pom.xml.save gridftp/pom.xml || : - [ -r ssl-proxies-tomcat/pom.xml.save ] && mv ssl-proxies-tomcat/pom.xml.save ssl-proxies-tomcat/pom.xml || : - [ -r io/pom.xml.save ] && mv io/pom.xml.save io/pom.xml || : - [ -r myproxy/pom.xml.save ] && mv myproxy/pom.xml.save myproxy/pom.xml || : - [ -r axis/pom.xml.save ] && mv axis/pom.xml.save axis/pom.xml || : - - rm -f build-stamp configure-stamp - - mh_clean - dh_clean - -install: build-stamp - dh_testdir - dh_testroot - dh_prep - -binary: binary-arch binary-indep - -binary-arch: - -binary-indep: install - dh_testdir - dh_testroot - dh_installdocs - dh_installchangelogs - mh_installpom -plibjglobus-parent-java -e2.1.0 pom.xml - - for jar in ssl-proxies jsse gss gram gridftp ssl-proxies-tomcat io \ - myproxy axisg ; do \ - if [ "$$jar" = "axisg" ] ; then dir=axis ; else dir=$$jar ; fi ; \ - mh_installpom -plibjglobus-$$jar-java -e2.1.0 $$dir/pom.xml ; \ - mh_installjar -plibjglobus-$$jar-java -e2.1.0 $$dir/pom.xml \ - -l -njglobus-$$jar $$dir/target/$$jar-debian.jar ; \ - done - - dh_link - dh_compress - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -.PHONY: build build-arch build-indep binary binary-arch binary-indep clean configure install +override_dh_auto_install: + PATH=$(CURDIR)/debian:$${PATH} dh_auto_install + rm -rf debian/libjglobus-parent-java/usr/share/maven-repo/org/jglobus/test-utils + rm -rf debian/libjglobus-parent-java/usr/share/maven-repo/org/jglobus/container-test-utils + rm -rf debian/libjglobus-parent-java/usr/share/java