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

[Torsten Werner]

Author: twerner
Date: 2011-08-29 08:53:13 +0000 (Mon, 29 Aug 2011)
New Revision: 14547

Removed:
   trunk/libjgrapht-java/branch_0.6/debian/libjgrapht0.6-java-link.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:
UNRELEASED
* Team upload.
* Remove binary package libjgrapht0.6-java-link because we never agreed on
  such meta packages. Add apropriate Provides, Conflicts, and Replaces.

Modified: trunk/libjgrapht-java/branch_0.6/debian/changelog
===================================================================
--- trunk/libjgrapht-java/branch_0.6/debian/changelog	2011-08-28 22:11:14 UTC (rev 14546)
+++ trunk/libjgrapht-java/branch_0.6/debian/changelog	2011-08-29 08:53:13 UTC (rev 14547)
@@ -1,3 +1,12 @@
+libjgrapht0.6-java (0.6.0-9) unstable; urgency=low
+
+  UNRELEASED
+  * Team upload.
+  * Remove binary package libjgrapht0.6-java-link because we never agreed on
+    such meta packages. Add apropriate Provides, Conflicts, and Replaces.
+
+ -- Torsten Werner <twerner at debian.org>  Mon, 29 Aug 2011 10:46:58 +0200
+
 libjgrapht0.6-java (0.6.0-8) unstable; urgency=low
 
   * Eliminated .jar files from source tree (thanks to Torsten Werner

Modified: trunk/libjgrapht-java/branch_0.6/debian/control
===================================================================
--- trunk/libjgrapht-java/branch_0.6/debian/control	2011-08-28 22:11:14 UTC (rev 14546)
+++ trunk/libjgrapht-java/branch_0.6/debian/control	2011-08-29 08:53:13 UTC (rev 14547)
@@ -13,7 +13,9 @@
 Architecture: all
 Depends: default-jre | java2-runtime, libjgraph-java, ${misc:Depends}
 Suggests: java-virtual-machine
-Conflicts: libjgrapht-java (<= 0.6.0-4)
+Provides: libjgrapht0.6-java-link
+Conflicts: libjgrapht-java (<= 0.6.0-4), libjgrapht0.6-java-link
+Replaces: libjgrapht0.6-java-link
 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
@@ -27,16 +29,6 @@
   - listenable graphs: allow external listeners to track modification events
   - subgraphs: graphs that are auto-updating subgraph views on other graphs
 
-Package: libjgrapht0.6-java-link
-Provides: libjgrapht-java
-Architecture: all
-Depends: libjgrapht0.6-java, ${misc:Depends}
-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 
- to it in /usr/share/java.
-
 Package: libjgrapht0.6-java-doc
 Architecture: all
 Depends: ${misc:Depends}

Deleted: trunk/libjgrapht-java/branch_0.6/debian/libjgrapht0.6-java-link.dirs
===================================================================
--- trunk/libjgrapht-java/branch_0.6/debian/libjgrapht0.6-java-link.dirs	2011-08-28 22:11:14 UTC (rev 14546)
+++ trunk/libjgrapht-java/branch_0.6/debian/libjgrapht0.6-java-link.dirs	2011-08-29 08:53:13 UTC (rev 14547)
@@ -1 +0,0 @@
-usr/share/java

Modified: trunk/libjgrapht-java/branch_0.6/debian/rules
===================================================================
--- trunk/libjgrapht-java/branch_0.6/debian/rules	2011-08-28 22:11:14 UTC (rev 14546)
+++ trunk/libjgrapht-java/branch_0.6/debian/rules	2011-08-29 08:53:13 UTC (rev 14547)
@@ -14,9 +14,7 @@
 
 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/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
+	dh_link -p libjgrapht0.6-java /usr/share/java/jgrapht-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jgrapht.jar