[pkg-java] r10203 - trunk/libjgrapht-java/branch_0.6/debian

[Steffen Möller]

Author: smoe-guest
Date: 2009-08-28 14:04:06 +0000 (Fri, 28 Aug 2009)
New Revision: 10203

Added:
   trunk/libjgrapht-java/branch_0.6/debian/libjgrapht0.6-java-link.dirs
Removed:
   trunk/libjgrapht-java/branch_0.6/debian/libjgrapht-java.dirs
Modified:
   trunk/libjgrapht-java/branch_0.6/debian/changelog
   trunk/libjgrapht-java/branch_0.6/debian/control
   trunk/libjgrapht-java/branch_0.6/debian/rules
Log:
Prepared separate libjgrapht0.6-java package - in main


Modified: trunk/libjgrapht-java/branch_0.6/debian/changelog
===================================================================
--- trunk/libjgrapht-java/branch_0.6/debian/changelog	2009-08-27 22:03:33 UTC (rev 10202)
+++ trunk/libjgrapht-java/branch_0.6/debian/changelog	2009-08-28 14:04:06 UTC (rev 10203)
@@ -1,3 +1,10 @@
+libjgrapht0.6-java (0.6.0-7) unstable; urgency=low
+
+  * Updated policy to 3.8.3 (no changes required)
+  * Depending on default-jre rather than openjdk
+
+ -- Steffen Moeller <moeller at debian.org>  Fri, 28 Aug 2009 14:26:48 +0200
+
 libjgrapht0.6-java (0.6.0-6) unstable; urgency=low
 
   * Bumped version number to avoid conflict with
@@ -8,7 +15,7 @@
 libjgrapht0.6-java (0.6.0-1) unstable; urgency=low
 
   * Renamed source package.
-  * Moved package back to main.
+  * Moved package back to main (Closes: #532378).
 
  -- Steffen Moeller <moeller at debian.org>  Tue, 04 Aug 2009 18:38:17 +0200
 

Modified: trunk/libjgrapht-java/branch_0.6/debian/control
===================================================================
--- trunk/libjgrapht-java/branch_0.6/debian/control	2009-08-27 22:03:33 UTC (rev 10202)
+++ trunk/libjgrapht-java/branch_0.6/debian/control	2009-08-28 14:04:06 UTC (rev 10203)
@@ -4,14 +4,14 @@
 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
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjgrapht-java/branch_0.6
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjgrapht-java/branch_0.6
 Homepage: http://jgrapht.sourceforge.net/
 
 Package: libjgrapht0.6-java
 Architecture: all
-Depends: openjdk-6-jre | java2-runtime
+Depends: default-jre | java2-runtime
 Suggests: java-virtual-machine
 Conflicts: libjgrapht-java (<= 0.6.0-4)
 Description: mathematical graph theory library for Java
@@ -27,9 +27,11 @@
   - listenable graphs: allow external listeners to track modification events
   - subgraphs: graphs that are auto-updating subgraph views on other graphs
 
-Package: libjgrapht-java
+Package: libjgrapht0.6-java-link
+Provides: libjgrapht-java
 Architecture: all
 Depends: libjgrapht0.6-java
+Conflicts: libjgrapht-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 

Deleted: trunk/libjgrapht-java/branch_0.6/debian/libjgrapht-java.dirs
===================================================================
--- trunk/libjgrapht-java/branch_0.6/debian/libjgrapht-java.dirs	2009-08-27 22:03:33 UTC (rev 10202)
+++ trunk/libjgrapht-java/branch_0.6/debian/libjgrapht-java.dirs	2009-08-28 14:04:06 UTC (rev 10203)
@@ -1 +0,0 @@
-usr/share/java

Copied: trunk/libjgrapht-java/branch_0.6/debian/libjgrapht0.6-java-link.dirs (from rev 9595, trunk/libjgrapht-java/branch_0.6/debian/libjgrapht-java.dirs)
===================================================================
--- trunk/libjgrapht-java/branch_0.6/debian/libjgrapht0.6-java-link.dirs	                        (rev 0)
+++ trunk/libjgrapht-java/branch_0.6/debian/libjgrapht0.6-java-link.dirs	2009-08-28 14:04:06 UTC (rev 10203)
@@ -0,0 +1 @@
+usr/share/java

Modified: trunk/libjgrapht-java/branch_0.6/debian/rules
===================================================================
--- trunk/libjgrapht-java/branch_0.6/debian/rules	2009-08-27 22:03:33 UTC (rev 10202)
+++ trunk/libjgrapht-java/branch_0.6/debian/rules	2009-08-28 14:04:06 UTC (rev 10203)
@@ -3,7 +3,8 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-#JAVA_HOME := /usr/lib/jvm/java-gcj
+# because of this JAVA_HOME setting, the dependency on openjdk 
+# remains explicitly set.
 JAVA_HOME := /usr/lib/jvm/java-6-openjdk
 
 DEB_ANT_BUILD_TARGET := compile
@@ -12,8 +13,8 @@
 
 ANT_ARGS := -Dproject.jar=debian/libjgrapht0.6-java/usr/share/java/jgrapht-$(DEB_UPSTREAM_VERSION).jar -Djavadoc.dir=debian/libjgrapht0.6-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.6-java-link::
+	dh_link -p libjgrapht0.6-java-link /usr/share/java/jgrapht-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jgrapht.jar
 
 install/libjgrapht0.6-java::
 	dh_link -p libjgrapht0.6-java /usr/share/java/jgrapht-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jgrapht-0.6.jar