[pkg-java] r19305 - trunk/libjgrapht-java/branch_0.8/debian
Markus Koschany
apo at moszumanska.debian.org
Sat Dec 2 19:59:28 UTC 2017
Author: apo
Date: 2017-12-02 19:59:28 +0000 (Sat, 02 Dec 2017)
New Revision: 19305
Added:
trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java-doc.install
trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java.classpath
trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java.links
Removed:
trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java.dirs
Modified:
trunk/libjgrapht-java/branch_0.8/debian/ant.properties
trunk/libjgrapht-java/branch_0.8/debian/changelog
trunk/libjgrapht-java/branch_0.8/debian/compat
trunk/libjgrapht-java/branch_0.8/debian/control
trunk/libjgrapht-java/branch_0.8/debian/copyright
trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java.poms
trunk/libjgrapht-java/branch_0.8/debian/pom.xml
trunk/libjgrapht-java/branch_0.8/debian/rules
Log:
Release libjgrapht0.8-java 0.8.3-5
Modified: trunk/libjgrapht-java/branch_0.8/debian/ant.properties
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/ant.properties 2017-11-29 23:53:55 UTC (rev 19304)
+++ trunk/libjgrapht-java/branch_0.8/debian/ant.properties 2017-12-02 19:59:28 UTC (rev 19305)
@@ -1,5 +1,5 @@
# Ensure that source and target are 1.6
# (upstream uses source 1.6, so 1.5 is not usable)
# For backwards compat on Java 7
-ant.build.javac.source=1.6
-ant.build.javac.target=1.6
+ant.build.javac.source=1.8
+ant.build.javac.target=1.8
Modified: trunk/libjgrapht-java/branch_0.8/debian/changelog
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/changelog 2017-11-29 23:53:55 UTC (rev 19304)
+++ trunk/libjgrapht-java/branch_0.8/debian/changelog 2017-12-02 19:59:28 UTC (rev 19305)
@@ -1,3 +1,23 @@
+libjgrapht0.8-java (0.8.3-5) unstable; urgency=medium
+
+ * Team upload.
+ * Switch to compat level 10.
+ * Replace debian/pom.xml file with net.sf.jgrapht.jgrapht pom.
+ (Closes: #740826)
+ * wrap-and-sort -sa.
+ * Use only Build-Depends field.
+ * Vcs-Browser: Use https.
+ * Declare compliance with Debian Policy 4.1.2.
+ * maven.properties: Build for Java 8.
+ * Use https for Format field.
+ * Remove --has-package-version flag.
+ * Switch from CDBS to DH sequencer. This apparently fixes the build failure
+ with Java 9. Thanks to Chris West for the report. (Closes: #874638)
+ * Remove libjgrapht0.8-java.dirs.
+ * Install javadoc with libjgrapht0.8-java-doc.install file.
+
+ -- Markus Koschany <apo at debian.org> Sat, 02 Dec 2017 20:36:43 +0100
+
libjgrapht0.8-java (0.8.3-4) unstable; urgency=medium
* Team upload.
Modified: trunk/libjgrapht-java/branch_0.8/debian/compat
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/compat 2017-11-29 23:53:55 UTC (rev 19304)
+++ trunk/libjgrapht-java/branch_0.8/debian/compat 2017-12-02 19:59:28 UTC (rev 19305)
@@ -1 +1 @@
-9
+10
Modified: trunk/libjgrapht-java/branch_0.8/debian/control
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/control 2017-11-29 23:53:55 UTC (rev 19304)
+++ trunk/libjgrapht-java/branch_0.8/debian/control 2017-12-02 19:59:28 UTC (rev 19305)
@@ -2,19 +2,28 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Giovanni Mascellani <gio at debian.org>
-Build-Depends: cdbs, debhelper (>= 9), ant, default-jdk, junit4,
- libjgraph-java, javahelper
-Build-Depends-Indep: maven-repo-helper
-Standards-Version: 3.9.5
+Uploaders:
+ Giovanni Mascellani <gio at debian.org>
+Build-Depends:
+ ant,
+ debhelper (>= 10),
+ default-jdk,
+ javahelper,
+ junit4,
+ libjgraph-java,
+ maven-repo-helper
+Standards-Version: 4.1.2
Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libjgrapht-java/branch_0.8
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libjgrapht-java/branch_0.8
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/libjgrapht-java/branch_0.8
Homepage: http://jgrapht.sourceforge.net/
Package: libjgrapht0.8-java
Architecture: all
-Depends: ${misc:Depends}, libjgraph-java
-Provides: libjgrapht-java
+Depends:
+ libjgraph-java,
+ ${misc:Depends}
+Provides:
+ libjgrapht-java
Description: mathematical graph theory library for Java
JGraphT is a free Java graph library that provides mathematical
graph theory objects and algorithms. JGraphT supports various types of
@@ -35,8 +44,11 @@
Package: libjgrapht0.8-java-doc
Architecture: all
-Suggests: www-browser, libjgrapht0.8-java
-Depends: ${misc:Depends}
+Suggests:
+ libjgrapht0.8-java,
+ www-browser
+Depends:
+ ${misc:Depends}
Section: doc
Description: javadoc-generated API for libjgrapht0.8-java
JGraphT is a free Java graph library that provides mathematical
Modified: trunk/libjgrapht-java/branch_0.8/debian/copyright
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/copyright 2017-11-29 23:53:55 UTC (rev 19304)
+++ trunk/libjgrapht-java/branch_0.8/debian/copyright 2017-12-02 19:59:28 UTC (rev 19305)
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: JGraphT
Upstream-Contact: Barak Naveh
Source: http://www.jgrapht.org/
Added: trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java-doc.install
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java-doc.install (rev 0)
+++ trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java-doc.install 2017-12-02 19:59:28 UTC (rev 19305)
@@ -0,0 +1 @@
+javadoc/* usr/share/doc/libjgrapht0.8-java/apidoc
Added: trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java.classpath
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java.classpath (rev 0)
+++ trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java.classpath 2017-12-02 19:59:28 UTC (rev 19305)
@@ -0,0 +1 @@
+/usr/share/java/jgrapht-0.8.3.jar /usr/share/java/jgraph.jar
Deleted: trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java.dirs
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java.dirs 2017-11-29 23:53:55 UTC (rev 19304)
+++ trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java.dirs 2017-12-02 19:59:28 UTC (rev 19305)
@@ -1 +0,0 @@
-usr/share/java
Added: trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java.links
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java.links (rev 0)
+++ trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java.links 2017-12-02 19:59:28 UTC (rev 19305)
@@ -0,0 +1 @@
+/usr/share/java/jgrapht-0.8.3.jar /usr/share/java/jgrapht0.8.jar
Modified: trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java.poms
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java.poms 2017-11-29 23:53:55 UTC (rev 19304)
+++ trunk/libjgrapht-java/branch_0.8/debian/libjgrapht0.8-java.poms 2017-12-02 19:59:28 UTC (rev 19305)
@@ -25,4 +25,4 @@
# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
# Empty by default. [mh_install]
#
-debian/pom.xml --has-package-version
+debian/pom.xml --artifact=jgrapht-jdk1.6.jar --java-lib --usj-version=0.8.3 --no-usj-versionless
Modified: trunk/libjgrapht-java/branch_0.8/debian/pom.xml
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/pom.xml 2017-11-29 23:53:55 UTC (rev 19304)
+++ trunk/libjgrapht-java/branch_0.8/debian/pom.xml 2017-12-02 19:59:28 UTC (rev 19305)
@@ -1,26 +1,132 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jgrapht</groupId>
+ <groupId>net.sf.jgrapht</groupId>
<artifactId>jgrapht</artifactId>
- <packaging>pom</packaging>
- <name>JGraphT - Parent</name>
- <version>0.8</version>
+ <version>0.8.3</version>
+
<description>A Java class library for graph-theory data structures and algorithms.</description>
<url>http://www.jgrapht.org</url>
+ <name>JGraphT</name>
+
<licenses>
<license>
<name>GNU Lesser General Public License Version 2.1, February 1999</name>
<url>http://jgrapht.sourceforge.net/LGPL.html</url>
<distribution>repo</distribution>
</license>
- <license>
- <name>Eclipse Public License (EPL) 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- <distribution>repo</distribution>
- </license>
</licenses>
+ <scm>
+ <url>http://jgrapht.svn.sourceforge.net/svnroot/jgrapht/trunk</url>
+ <connection>scm:svn:https://jgrapht.svn.sourceforge.net/svnroot/jgrapht/trunk</connection>
+ </scm>
+ <issueManagement>
+ <url>http://sourceforge.net/tracker/?group_id=86459</url>
+ </issueManagement>
+ <mailingLists>
+ <mailingList>
+ <name>jgrapht-users</name>
+ <archive>http://lists.sourceforge.net/lists/listinfo/jgrapht-users</archive>
+ </mailingList>
+ <mailingList>
+ <name>jgrapht-announce</name>
+ <archive>http://lists.sourceforge.net/lists/listinfo/jgrapht-announce</archive>
+ </mailingList>
+ </mailingLists>
+ <developers>
+ <developer>
+ <name>John V Sichi</name>
+ <email>perfecthash at users.sf.net</email>
+ <id>perfecthash</id>
+ </developer>
+ <developer>
+ <name>Andrew Newell</name>
+ <email>ajnewell at users.sf.net</email>
+ <id>ajnewell</id>
+ </developer>
+ <developer>
+ <name>Assaf Lehr</name>
+ <email>assaf-lehr at users.sf.net</email>
+ <id>assaf-lehr</id>
+ </developer>
+ <developer>
+ <name>Barak Naveh</name>
+ <email>barak_naveh at users.sf.net</email>
+ <id>barak_naveh</id>
+ </developer>
+ <developer>
+ <name>Michael Behrisch</name>
+ <email>behrisch at users.sf.net</email>
+ <id>behrisch</id>
+ </developer>
+ <developer>
+ <name>Charles Fry</name>
+ <email>cfry at users.sf.net</email>
+ <id>cfry</id>
+ </developer>
+ <developer>
+ <name>Chris Soltenborn</name>
+ <email>csoltenborn at users.sf.net</email>
+ <id>csoltenborn</id>
+ </developer>
+ <developer>
+ <name>Christian Hammer</name>
+ <email>hammerc at users.sf.net</email>
+ <id>hammerc</id>
+ </developer>
+ <developer>
+ <name>Ilya Razenshteyn</name>
+ <email>ilyaraz at users.sf.net</email>
+ <id>ilyaraz</id>
+ </developer>
+ <developer>
+ <name>Hartmut Benz</name>
+ <email>ivins at users.sf.net</email>
+ <id>ivins</id>
+ </developer>
+ <developer>
+ <name>Linda Buisman</name>
+ <email>linda_buisman at users.sf.net</email>
+ <id>linda_buisman</id>
+ </developer>
+ <developer>
+ <name>Liviu Rau</name>
+ <email>liviu_aurelian at users.sf.net</email>
+ <id>liviu_aurelian</id>
+ </developer>
+ <developer>
+ <name>Trevor Harmon</name>
+ <email>vocaro at users.sf.net</email>
+ <id>vocaro</id>
+ </developer>
+ </developers>
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12</version>
+ <configuration>
+ <testFailureIgnore>false</testFailureIgnore>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
</project>
Modified: trunk/libjgrapht-java/branch_0.8/debian/rules
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/rules 2017-11-29 23:53:55 UTC (rev 19304)
+++ trunk/libjgrapht-java/branch_0.8/debian/rules 2017-12-02 19:59:28 UTC (rev 19305)
@@ -1,33 +1,11 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+export JAVA_HOME := /usr/lib/jvm/default-java
+export CLASSPATH := /usr/share/java/jgraph.jar
-JAVA_HOME := /usr/lib/jvm/default-java/
+%:
+ dh $@ --with javahelper,maven_repo_helper
-DEB_ANT_BUILD_TARGET := compile
-DEB_ANT_INSTALL_TARGET := prepare.distribution
-DEB_ANT_TEST_TARGET := test
+override_dh_auto_build:
+ dh_auto_build -- compile prepare.distribution
-DEB_JARS := /usr/share/java/jgraph.jar
-
-SOVERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | cut -f 1,2 -d.)
-
-ANT_ARGS := -Dproject.jar=debian/libjgrapht$(SOVERSION)-java/usr/share/java/jgrapht-$(DEB_UPSTREAM_VERSION).jar -Djavadoc.dir=debian/libjgrapht$(SOVERSION)-java-doc/usr/share/doc/libjgrapht$(SOVERSION)-java/apidoc
-
-install/libjgrapht$(SOVERSION)-java::
- jh_classpath -c"$(DEB_JARS)" debian/libjgrapht$(SOVERSION)-java/usr/share/java/jgrapht-$(DEB_UPSTREAM_VERSION).jar
-
-get-orig-source:
- uscan --force-download --download-version $(DEB_UPSTREAM_VERSION) --rename
-
-binary-post-install/$(DEB_SOURCE_PACKAGE)::
- mh_installpoms -p$(DEB_SOURCE_PACKAGE)
- mh_installjar -p$(DEB_SOURCE_PACKAGE) -l debian/pom.xml \
- --usj-version=0.8.3 \
- --no-usj-versionless \
- debian/libjgrapht$(SOVERSION)-java/usr/share/java/jgrapht-$(DEB_UPSTREAM_VERSION).jar
- dh_link -plibjgrapht$(SOVERSION)-java /usr/share/java/jgrapht-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jgrapht$(SOVERSION).jar
-
-clean::
- mh_clean
More information about the pkg-java-commits
mailing list