[Git][java-team/ivy][master] 8 commits: Standards-Version updated to 4.1.4
Emmanuel Bourg
gitlab at salsa.debian.org
Wed Jun 13 18:12:30 BST 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / ivy
Commits:
9c1933d5 by Emmanuel Bourg at 2018-06-13T19:04:27+02:00
Standards-Version updated to 4.1.4
- - - - -
3a370992 by Emmanuel Bourg at 2018-06-13T19:05:50+02:00
Wrap and sort
- - - - -
9979a898 by Emmanuel Bourg at 2018-06-13T19:06:48+02:00
Switch to debhelper level 11
- - - - -
2a72056f by Emmanuel Bourg at 2018-06-13T19:07:19+02:00
Build with the DH sequencer instead of CDBS
- - - - -
e02003bd by Emmanuel Bourg at 2018-06-13T19:07:19+02:00
Use secure URLs
- - - - -
39175866 by Emmanuel Bourg at 2018-06-13T19:07:42+02:00
Updated the pom for the version 2.4.0 (Closes: #901457)
- - - - -
4828268d by Emmanuel Bourg at 2018-06-13T19:08:32+02:00
Use salsa.debian.org Vcs-* URLs
- - - - -
da061714 by Emmanuel Bourg at 2018-06-13T19:09:13+02:00
Upload to unstable
- - - - -
10 changed files:
- debian/changelog
- + debian/clean
- debian/compat
- debian/control
- debian/copyright
- + debian/ivy-doc.install
- debian/ivy.poms
- debian/pom.xml
- debian/rules
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,21 @@
-ivy (2.4.0-4) UNRELEASED; urgency=medium
+ivy (2.4.0-4) unstable; urgency=medium
* Team upload.
+
+ [ Miguel Landaeta ]
* Remove myself from uploaders list. (Closes: #871864)
- * Bump DH compat level to 10.
- * Bump Standards-Version to 3.9.8. No changes were required.
* Use HTTPS in Vcs-Git field URL.
* Wrap and sort dependencies lists.
* Update copyright info.
- -- Miguel Landaeta <nomadium at debian.org> Mon, 07 Aug 2017 12:10:15 +0100
+ [ Emmanuel Bourg ]
+ * Updated the pom for the version 2.4.0 (Closes: #901457)
+ * Build with the DH sequencer instead of CDBS
+ * Standards-Version updated to 4.1.4
+ * Switch to debhelper level 11
+ * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 13 Jun 2018 19:09:07 +0200
ivy (2.4.0-3) unstable; urgency=medium
=====================================
debian/clean
=====================================
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+api/
+classes/
+ivy.jar
=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -2,42 +2,43 @@ Source: ivy
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varun at debian.org>,
+Uploaders:
+ Varun Hiremath <varun at debian.org>,
Torsten Werner <twerner at debian.org>,
Ludovic Claude <ludovic.claude at laposte.net>,
Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: cdbs,
- debhelper (>= 10~)
-Build-Depends-Indep: ant,
- default-jdk,
- default-jdk-doc,
- junit,
- libbcpg-java,
- libbcprov-java,
- libcommons-cli-java,
- libcommons-collections3-java,
- libcommons-httpclient-java,
- libcommons-lang-java,
- libcommons-vfs-java (>= 2.0),
- libjsch-java,
- libjsch-agent-proxy-java
- liboro-java,
- maven-repo-helper
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/ivy.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/ivy.git
-Homepage: http://ant.apache.org/ivy/
+Build-Depends:
+ ant,
+ debhelper (>= 11~),
+ default-jdk,
+ default-jdk-doc,
+ junit,
+ libbcpg-java,
+ libbcprov-java,
+ libcommons-cli-java,
+ libcommons-collections3-java,
+ libcommons-httpclient-java,
+ libcommons-lang-java,
+ libcommons-vfs-java (>= 2.0),
+ libjsch-agent-proxy-java,
+ libjsch-java,
+ liboro-java,
+ maven-repo-helper
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/ivy.git
+Vcs-Browser: https://salsa.debian.org/java-team/ivy
+Homepage: https://ant.apache.org/ivy/
Package: ivy
Architecture: all
-Depends: default-jre-headless | java2-runtime-headless,
- ${misc:Depends}
-Suggests: ivy-doc,
- default-jre | java2-runtime,
- libbcpg-java,
- libbcprov-java,
- libjsch-java,
- libjsch-agent-proxy-java
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless
+Suggests:
+ default-jre | java2-runtime,
+ ivy-doc,
+ libbcpg-java,
+ libbcprov-java,
+ libjsch-agent-proxy-java,
+ libjsch-java
Description: agile dependency manager
Ivy is a very powerful dependency manager oriented toward Java
dependency management, even though it could be used to manage
@@ -46,8 +47,7 @@ Description: agile dependency manager
Package: ivy-doc
Section: doc
Architecture: all
-Depends: default-jdk-doc,
- ${misc:Depends}
+Depends: ${misc:Depends}, default-jdk-doc,
Description: agile dependency manager (documentation)
Ivy is a very powerful dependency manager oriented toward Java
dependency management, even though it could be used to manage
=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Apache Ivy
-Source: http://www.apache.org/dist/ant/ivy/
+Source: https://www.apache.org/dist/ant/ivy/
Files: *
Copyright: 2009-2014, The Apache Software Foundation
=====================================
debian/ivy-doc.install
=====================================
--- /dev/null
+++ b/debian/ivy-doc.install
@@ -0,0 +1 @@
+api usr/share/doc/ivy
=====================================
debian/ivy.poms
=====================================
--- a/debian/ivy.poms
+++ b/debian/ivy.poms
@@ -1 +1 @@
-debian/pom.xml --no-parent
+debian/pom.xml --no-parent --artifact=ivy.jar
=====================================
debian/pom.xml
=====================================
--- a/debian/pom.xml
+++ b/debian/pom.xml
@@ -18,7 +18,7 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -28,7 +28,7 @@
</parent>
<groupId>org.apache.ivy</groupId>
<artifactId>ivy</artifactId>
- <version>2.3.0</version>
+ <version>2.4.0</version>
<name>Apache Ivy</name>
<url>http://ant.apache.org/ivy/</url>
<scm>
@@ -58,21 +58,21 @@
</issueManagement>
<dependencies>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.2</version>
+ <version>1.7.1</version>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
- <version>1.6.2</version>
+ <version>1.7.1</version>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-trax</artifactId>
- <version>1.6.2</version>
+ <version>1.7.1</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -96,7 +96,25 @@
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
- <version>0.1.31</version>
+ <version>0.1.50</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch.agentproxy</artifactId>
+ <version>0.0.6</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch.agentproxy.connector-factory</artifactId>
+ <version>0.0.6</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch.agentproxy.jsch</artifactId>
+ <version>0.0.6</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -120,7 +138,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -128,12 +146,36 @@
<artifactId>ant-testutil</artifactId>
<version>1.7.0</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>1.6.2</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>xerces</groupId>
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -1,33 +1,28 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-PACKAGE := $(DEB_SOURCE_PACKAGE)
-VERSION := $(DEB_UPSTREAM_VERSION)
-MVN_VERSION := $(shell echo $(VERSION) | sed 's/~/-/')
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET := jar javadoc
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_JARS := commons-httpclient commons-lang commons-cli commons-collections3 \
- commons-vfs2 junit jsch oro bcprov bcpg \
- jsch.agentproxy.core jsch.agentproxy.connector-factory jsch.agentproxy.jsch
-API_DOCS := api
-
-binary-post-install/$(PACKAGE)::
- mh_installpoms -p$(PACKAGE)
- mh_installjar -p$(PACKAGE) -l debian/pom.xml ivy.jar
-
-binary-post-install/$(PACKAGE)-doc::
- dh_install -p$(PACKAGE)-doc $(API_DOCS) usr/share/doc/$(PACKAGE)
-
-clean::
- -rm -rf debian/tmp
- mh_clean
-
-get-orig-source:
- -uscan --force-download --rename
+include /usr/share/dpkg/pkg-info.mk
+
+MVN_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/~/-/')
+
+export CLASSPATH=/usr/share/java/commons-httpclient.jar \
+ :/usr/share/java/commons-lang.jar \
+ :/usr/share/java/commons-cli.jar \
+ :/usr/share/java/commons-collections3.jar \
+ :/usr/share/java/commons-vfs2.jar \
+ :/usr/share/java/bcprov.jar \
+ :/usr/share/java/bcpg.jar \
+ :/usr/share/java/junit.jar \
+ :/usr/share/java/jsch.jar \
+ :/usr/share/java/jsch.agentproxy.core.jar \
+ :/usr/share/java/jsch.agentproxy.connector-factory.jar \
+ :/usr/share/java/jsch.agentproxy.jsch.jar \
+ :/usr/share/java/oro.jar
+
+%:
+ dh $@ --buildsystem=ant --with maven-repo-helper
+
+override_dh_auto_build:
+ dh_auto_build -- -f debian/build.xml jar javadoc
get-orig-pom:
- wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/org/apache/ivy/ivy/$(MVN_VERSION)/ivy-$(MVN_VERSION).pom
-
+ wget -O debian/pom.xml https://repo1.maven.org/maven2/org/apache/ivy/ivy/$(MVN_VERSION)/ivy-$(MVN_VERSION).pom
=====================================
debian/watch
=====================================
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
opts="uversionmangle=s/-rc/~rc/" \
- http://www.apache.org/dist/ant/ivy/([\d].*)/apache-ivy-([\d].*)-src.tar.gz debian debian/orig-tar.sh
+ https://www.apache.org/dist/ant/ivy/([\d].*)/apache-ivy-([\d].*)-src.tar.gz debian debian/orig-tar.sh
View it on GitLab: https://salsa.debian.org/java-team/ivy/compare/f57c15818231443938ffb7a61d6e5ce1cbe5ce6f...da061714a9dfc66a0ebdf04c587ebd4b7cde8b3e
--
View it on GitLab: https://salsa.debian.org/java-team/ivy/compare/f57c15818231443938ffb7a61d6e5ce1cbe5ce6f...da061714a9dfc66a0ebdf04c587ebd4b7cde8b3e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180613/5014d13c/attachment.html>
More information about the pkg-java-commits
mailing list