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

Tue Aug 4 22:25:32 UTC 2009

Author: smoe-guest
Date: 2009-08-04 22:25:32 +0000 (Tue, 04 Aug 2009)
New Revision: 9626

Modified:
   trunk/libjgrapht-java/branch_0.6/debian/README.Debian
   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:
Submitted as jgrapht "soname" 0.6


Modified: trunk/libjgrapht-java/branch_0.6/debian/README.Debian
===================================================================

--- trunk/libjgrapht-java/branch_0.6/debian/README.Debian	2009-08-04 21:39:54 UTC (rev 9625)
+++ trunk/libjgrapht-java/branch_0.6/debian/README.Debian	2009-08-04 22:25:32 UTC (rev 9626)
@@ -1,16 +1,8 @@
-libjgrapht-java
-===============
+libjgrapht0.6-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.
-The reader of this file shall please be aware of that change and update
-for the development of any new package.
+Versions 0.6 and 0.7ff are incompatible. This led to the provisioning
+of this separate source tree. Also, since Java is now in main, the
+package is independent from gcj and thus can be kept in main, too.
 
-The latest revision of the Debian package for version 0.6 introduced 
-a package with the version number as a part of the binary package name.
-Please directly depend on that and refer to the jar with a version number,
-too, in the application that uses the package. For compatibility,
-the version 0.6 of the package with no version number in its name 
-provides a symbolic link to the versioned jar.
-
--- Steffen Moeller <moeller at debian.org>  Thu, 24 Jul 2008 14:33:21 +0200
+-- Steffen Moeller <moeller at debian.org>  Tue, 04 Aug 2009 18:30:18 +0200

Modified: trunk/libjgrapht-java/branch_0.6/debian/changelog
===================================================================
--- trunk/libjgrapht-java/branch_0.6/debian/changelog	2009-08-04 21:39:54 UTC (rev 9625)
+++ trunk/libjgrapht-java/branch_0.6/debian/changelog	2009-08-04 22:25:32 UTC (rev 9626)
@@ -1,3 +1,17 @@
+libjgrapht0.6-java (0.6.0-6) unstable; urgency=low
+
+  * Bumped version number to avoid conflict with
+    libjgrapht-java binary of earlier release.
+
+ -- Steffen Moeller <moeller at debian.org>  Tue, 04 Aug 2009 18:38:18 +0200
+
+libjgrapht0.6-java (0.6.0-1) unstable; urgency=low
+
+  * Renamed source package.
+  * Moved package back to main.
+
+ -- Steffen Moeller <moeller at debian.org>  Tue, 04 Aug 2009 18:38:17 +0200
+
 libjgrapht-java (0.6.0-5) unstable; urgency=low
 
   * Added version to the library name.  This aims at providing

Modified: trunk/libjgrapht-java/branch_0.6/debian/control
===================================================================
--- trunk/libjgrapht-java/branch_0.6/debian/control	2009-08-04 21:39:54 UTC (rev 9625)
+++ trunk/libjgrapht-java/branch_0.6/debian/control	2009-08-04 22:25:32 UTC (rev 9626)
@@ -1,17 +1,17 @@
-Source: libjgrapht-java
-Section: contrib/libs
+Source: libjgrapht0.6-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|java-gcj-compat-dev
-Standards-Version: 3.8.0
+Build-Depends: cdbs, debhelper (>= 5), ant, openjdk-6-jdk
+Standards-Version: 3.8.2
 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 | java-gcj-compat | java2-runtime
+Depends: openjdk-6-jre | java2-runtime
 Suggests: java-virtual-machine
 Conflicts: libjgrapht-java (<= 0.6.0-4)
 Description: mathematical graph theory library for Java
@@ -35,11 +35,11 @@
  to the latest API version of the package and provides a symbolic link 
  to it in /usr/share/java.
 
-Package: libjgrapht-java-doc
+Package: libjgrapht0.6-java-doc
 Architecture: all
 Suggests: www-browser, libjgrapht0.6-java
 Conflicts: libjgrapht-java (<= 0.6.0-4)
-Section: contrib/doc
+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

Modified: trunk/libjgrapht-java/branch_0.6/debian/rules
===================================================================
--- trunk/libjgrapht-java/branch_0.6/debian/rules	2009-08-04 21:39:54 UTC (rev 9625)
+++ trunk/libjgrapht-java/branch_0.6/debian/rules	2009-08-04 22:25:32 UTC (rev 9626)
@@ -4,13 +4,13 @@
 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.6-java/usr/share/java/jgrapht-$(DEB_UPSTREAM_VERSION).jar -Djavadoc.dir=debian/libjgrapht-java-doc/usr/share/doc/libjgrapht-java/apidoc
+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


