[pkg-java] r9628 - in trunk/libjgrapht-java: . branch_0.8/debian
Steffen Möller
smoe-guest at alioth.debian.org
Tue Aug 4 23:02:52 UTC 2009
Author: smoe-guest
Date: 2009-08-04 23:02:51 +0000 (Tue, 04 Aug 2009)
New Revision: 9628
Added:
trunk/libjgrapht-java/branch_0.8/
trunk/libjgrapht-java/branch_0.8/debian/README.source
trunk/libjgrapht-java/branch_0.8/debian/control
trunk/libjgrapht-java/branch_0.8/debian/watch
Removed:
trunk/libjgrapht-java/branch_0.8/debian/control
trunk/libjgrapht-java/branch_0.8/debian/watch
Modified:
trunk/libjgrapht-java/branch_0.8/debian/README.Debian
trunk/libjgrapht-java/branch_0.8/debian/changelog
trunk/libjgrapht-java/branch_0.8/debian/copyright
trunk/libjgrapht-java/branch_0.8/debian/rules
Log:
Preparation for current upstream release of libjgrapht - though this is not as straight-forward as hoped.
Modified: trunk/libjgrapht-java/branch_0.8/debian/README.Debian
===================================================================
--- trunk/libjgrapht-java/branch_0.7/debian/README.Debian 2009-08-04 15:48:43 UTC (rev 9595)
+++ trunk/libjgrapht-java/branch_0.8/debian/README.Debian 2009-08-04 23:02:51 UTC (rev 9628)
@@ -1,8 +1,9 @@
libjgrapht-java
===============
-With version 0.7.3 javadoc of gcj fails and hence led to the fall-back
-to the JDK of Sun and the move of the package from main to contrib.
+With version 0.7.3 javadoc of gcj fails, an had there not been the
+advent of the OpenJDK, this package would have gone to the contrib
+section.
Semantics of the package names were changed, hence the expressed conflict
with previous versions of that package. The real jar file is now expected
@@ -12,7 +13,7 @@
libraries but multiple versions are allowed to coexist.
Users of the jgrapht library version 0.6 should hence install the
-libjgrapht0.6 package. This, though, has not yet been created. I
-admittedly be created to preserve compatibility across versions.
+libjgrapht0.6 package, which is now also made available as a separate source
+package.
--- Steffen Moeller <moeller at debian.org> Sun, 13 Jul 2008 14:47:03 +0200
+-- Steffen Moeller <moeller at debian.org> Wed, 05 Aug 2009 00:42:41 +0200
Added: trunk/libjgrapht-java/branch_0.8/debian/README.source
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/README.source (rev 0)
+++ trunk/libjgrapht-java/branch_0.8/debian/README.source 2009-08-04 23:02:51 UTC (rev 9628)
@@ -0,0 +1,4 @@
+jgrapht for Debian
+==================
+
+The pre-compiled .jar file was manually removed from the source tree.
Modified: trunk/libjgrapht-java/branch_0.8/debian/changelog
===================================================================
--- trunk/libjgrapht-java/branch_0.7/debian/changelog 2009-08-04 15:48:43 UTC (rev 9595)
+++ trunk/libjgrapht-java/branch_0.8/debian/changelog 2009-08-04 23:02:51 UTC (rev 9628)
@@ -1,3 +1,10 @@
+libjgrapht-java (0.8.1-1) unstable; urgency=low
+
+ * New upstream version.
+ * Moved back to main distribution.
+
+ -- Steffen Moeller <moeller at debian.org> Wed, 05 Aug 2009 00:27:30 +0200
+
libjgrapht-java (0.7.3-2) experimental; urgency=low
[ Steffen Moeller ]
Deleted: trunk/libjgrapht-java/branch_0.8/debian/control
===================================================================
--- trunk/libjgrapht-java/branch_0.7/debian/control 2009-08-04 15:48:43 UTC (rev 9595)
+++ trunk/libjgrapht-java/branch_0.8/debian/control 2009-08-04 23:02:51 UTC (rev 9628)
@@ -1,47 +0,0 @@
-Source: libjgrapht-java
-Section: contrib/libs
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Michael Koch <konqueror at gmx.de>, Steffen Moeller <moeller at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), ant, openjdk-6-jdk|java-gcj-compat-dev
-Standards-Version: 3.8.0
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjgrapht-java/branch_0.7
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjgrapht-java/branch_0.7
-Homepage: http://jgrapht.sourceforge.net/
-
-Package: libjgrapht0.7-java
-Architecture: all
-Depends: openjdk-6-jre | java-gcj-compat | java2-runtime
-Suggests: java-virtual-machine
-Conflicts: libjgrapht-java (<= 0.6.0-4)
-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
- graphs including:
- - directed and undirected graphs
- - graphs with weighted, unweighted, labeled or user-defined edges
- - various edge multiplicity options, including simple graphs,
- multigraphs and pseudographs
- - unmodifiable graphs: allow modules to provide "read-only" access
- to internal graphs
- - listenable graphs: allow external listeners to track modification events
- - subgraphs: graphs that are auto-updating subgraph views on other graphs
-
-Package: libjgrapht-java
-Architecture: all
-Depends: libjgrapht0.7-java
-Conflicts: libjgrapht-java (<= 0.6.0-4)
-Description: indication of the latest version of libjgrapht-java
- This package does not provide a Java archive by itself but refers
- to the latest API version of the package and provides a symbolic link
- to it in /usr/share/java.
-
-Package: libjgrapht-java-doc
-Architecture: all
-Suggests: www-browser, libjgrapht-java
-Conflicts: libjgrapht-java (<= 0.6.0-4)
-Section: doc
-Description: javadoc-generated API of libjgrapht-java
- The javadoc utility was used to convert comments of the Java source
- code into a complete documentation. That can be accessed easily
- with a regular web browser in /usr/share/doc/libjgrapht-java/apidoc.
Copied: trunk/libjgrapht-java/branch_0.8/debian/control (from rev 9627, trunk/libjgrapht-java/branch_0.7/debian/control)
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/control (rev 0)
+++ trunk/libjgrapht-java/branch_0.8/debian/control 2009-08-04 23:02:51 UTC (rev 9628)
@@ -0,0 +1,46 @@
+Source: libjgrapht-java
+Section: libs
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Michael Koch <konqueror at gmx.de>, Steffen Moeller <moeller at debian.org>
+Build-Depends: cdbs, debhelper (>= 5), ant, openjdk-6-jdk, junit4
+Standards-Version: 3.8.2
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjgrapht-java/branch_0.8
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjgrapht-java/branch_0.8
+Homepage: http://jgrapht.sourceforge.net/
+
+Package: libjgrapht0.8-java
+Architecture: all
+Depends: openjdk-6-jre | java2-runtime
+Suggests: java-virtual-machine
+Conflicts: libjgrapht-java (<= 0.6.0-5)
+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
+ graphs including:
+ - directed and undirected graphs
+ - graphs with weighted, unweighted, labeled or user-defined edges
+ - various edge multiplicity options, including simple graphs,
+ multigraphs and pseudographs
+ - unmodifiable graphs: allow modules to provide "read-only" access
+ to internal graphs
+ - listenable graphs: allow external listeners to track modification events
+ - subgraphs: graphs that are auto-updating subgraph views on other graphs
+
+Package: libjgrapht-java
+Architecture: all
+Depends: libjgrapht0.8-java
+Description: indication of the latest version of libjgrapht-java
+ This package does not provide a Java archive by itself but refers
+ to the latest API version of the package and provides a symbolic link
+ to it in /usr/share/java.
+
+Package: libjgrapht-java-doc
+Architecture: all
+Suggests: www-browser, libjgrapht-java
+Conflicts: libjgrapht-java (<= 0.6.0-4)
+Section: doc
+Description: javadoc-generated API of libjgrapht-java
+ The javadoc utility was used to convert comments of the Java source
+ code into a complete documentation. That can be accessed easily
+ with a regular web browser in /usr/share/doc/libjgrapht-java/apidoc.
Modified: trunk/libjgrapht-java/branch_0.8/debian/copyright
===================================================================
--- trunk/libjgrapht-java/branch_0.7/debian/copyright 2009-08-04 15:48:43 UTC (rev 9595)
+++ trunk/libjgrapht-java/branch_0.8/debian/copyright 2009-08-04 23:02:51 UTC (rev 9628)
@@ -5,7 +5,7 @@
Upstram Author: Barak Naveh http://sourceforge.net/users/barak_naveh
-Copyright: (C) 2004-2008 Barak Naveh
+Copyright: (C) 2004-2009 Barak Naveh
License:
Modified: trunk/libjgrapht-java/branch_0.8/debian/rules
===================================================================
--- trunk/libjgrapht-java/branch_0.7/debian/rules 2009-08-04 15:48:43 UTC (rev 9595)
+++ trunk/libjgrapht-java/branch_0.8/debian/rules 2009-08-04 23:02:51 UTC (rev 9628)
@@ -3,18 +3,19 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-#JAVA_HOME := /usr/lib/jvm/java-gcj
-JAVA_HOME := /usr/lib/jvm/java-6-sun
+JAVA_HOME := /usr/lib/jvm/java-6-openjdk
DEB_ANT_BUILD_TARGET := compile
DEB_ANT_INSTALL_TARGET := prepare.distribution
DEB_ANT_TEST_TARGET := test
-ANT_ARGS := -Dproject.jar=debian/libjgrapht0.7-java/usr/share/java/jgrapht-$(DEB_UPSTREAM_VERSION).jar -Djavadoc.dir=debian/libjgrapht-java-doc/usr/share/doc/libjgrapht-java/apidoc
+SOVERSION := $(shell echo $(DEB_UPTREAM_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-java-doc/usr/share/doc/libjgrapht-java/apidoc
+
install/libjgrapht-java::
dh_link -p libjgrapht-java /usr/share/java/jgrapht-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jgrapht.jar
install/libjgrapht0.7-java::
- dh_link -p libjgrapht0.7-java /usr/share/java/jgrapht-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jgrapht-0.7.jar
+ dh_link -p libjgrapht$(SOVERSION)-java /usr/share/java/jgrapht-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jgrapht-$(SOVERSION).jar
Deleted: trunk/libjgrapht-java/branch_0.8/debian/watch
===================================================================
--- trunk/libjgrapht-java/branch_0.7/debian/watch 2009-08-04 15:48:43 UTC (rev 9595)
+++ trunk/libjgrapht-java/branch_0.8/debian/watch 2009-08-04 23:02:51 UTC (rev 9628)
@@ -1,3 +0,0 @@
-version=3
-# use qa.debian.org redirector; see man uscan
-http://sf.net/jgrapht/ jgrapht-([\d.]+)\.tar\.gz debian svn-upgrade
Copied: trunk/libjgrapht-java/branch_0.8/debian/watch (from rev 9627, trunk/libjgrapht-java/branch_0.7/debian/watch)
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/watch (rev 0)
+++ trunk/libjgrapht-java/branch_0.8/debian/watch 2009-08-04 23:02:51 UTC (rev 9628)
@@ -0,0 +1,3 @@
+version=3
+# use qa.debian.org redirector; see man uscan
+http://sf.net/jgrapht/ jgrapht-([\d.]+)\.tar\.gz debian svn-upgrade
More information about the pkg-java-commits
mailing list