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

[Torsten Werner]

Author: twerner
Date: 2011-08-29 17:39:40 +0000 (Mon, 29 Aug 2011)
New Revision: 14570

Modified:
   trunk/libjgrapht-java/branch_0.6/debian/changelog
   trunk/libjgrapht-java/branch_0.6/debian/control
Log:
merge changes from version -9 that haven't been committed to the svn repo


Modified: trunk/libjgrapht-java/branch_0.6/debian/changelog
===================================================================
--- trunk/libjgrapht-java/branch_0.6/debian/changelog	2011-08-29 17:29:41 UTC (rev 14569)
+++ trunk/libjgrapht-java/branch_0.6/debian/changelog	2011-08-29 17:39:40 UTC (rev 14570)
@@ -1,4 +1,4 @@
-libjgrapht0.6-java (0.6.0-9) unstable; urgency=low
+libjgrapht0.6-java (0.6.0-10) unstable; urgency=low
 
   * Team upload.
   * Remove binary package libjgrapht0.6-java-link because we never agreed on
@@ -11,6 +11,14 @@
 
  -- Torsten Werner <twerner at debian.org>  Mon, 29 Aug 2011 10:53:13 +0200
 
+libjgrapht0.6-java (0.6.0-9) unstable; urgency=low
+
+  * Following Michael Koch request to be removed from uploaders
+  * Added "Conflicts" with libjgrapht-java-doc (Closes: 546032)
+  * Added "Replaces" libjgrapht-java (<= 0.6.0-4)
+
+ -- Steffen Moeller <moeller at debian.org>  Sat, 19 Sep 2009 16:18:57 +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-29 17:29:41 UTC (rev 14569)
+++ trunk/libjgrapht-java/branch_0.6/debian/control	2011-08-29 17:39:40 UTC (rev 14570)
@@ -2,7 +2,7 @@
 Section: java
 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>
+Uploaders: Steffen Moeller <moeller at debian.org>
 Build-Depends: cdbs, debhelper (>= 7), ant, openjdk-6-jdk, libjgraph-java, junit
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjgrapht-java/branch_0.6
@@ -32,7 +32,8 @@
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: www-browser, libjgrapht0.6-java
-Conflicts: libjgrapht-java (<= 0.6.0-4)
+Conflicts: libjgrapht-java (<= 0.6.0-4), libjgrapht-java-doc
+Replaces: libjgrapht-java-doc (<= 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