[pkg-java] r10322 - in trunk/libjgrapht-java/branch_0.6/debian: . patches

[Steffen Möller]

Author: moeller
Date: 2009-09-07 23:50:45 +0000 (Mon, 07 Sep 2009)
New Revision: 10322

Added:
   trunk/libjgrapht-java/branch_0.6/debian/README.source
   trunk/libjgrapht-java/branch_0.6/debian/patches/
   trunk/libjgrapht-java/branch_0.6/debian/patches/jgraph.patch
   trunk/libjgrapht-java/branch_0.6/debian/patches/series
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:
Completed reaction on ftpmasters' comments.


Added: trunk/libjgrapht-java/branch_0.6/debian/README.source
===================================================================
--- trunk/libjgrapht-java/branch_0.6/debian/README.source	                        (rev 0)
+++ trunk/libjgrapht-java/branch_0.6/debian/README.source	2009-09-07 23:50:45 UTC (rev 10322)
@@ -0,0 +1,7 @@
+
+The upstream release was renamed to libjgrapht0.6-java-0.6.0 and all .jar files removed.
+Prior existing javadoc was also removed.
+
+rm libjgrapht0.6-java-0.6.0/*jar 
+rm libjgrapht0.6-java-0.6.0/lib/*jar 
+tar --exclude javadoc -czvf libjgrapht0.6-java_0.6.0.orig.tar.gz libjgrapht0.6-java-0.6.0/

Modified: trunk/libjgrapht-java/branch_0.6/debian/changelog
===================================================================
--- trunk/libjgrapht-java/branch_0.6/debian/changelog	2009-09-07 22:53:46 UTC (rev 10321)
+++ trunk/libjgrapht-java/branch_0.6/debian/changelog	2009-09-07 23:50:45 UTC (rev 10322)
@@ -1,3 +1,13 @@
+libjgrapht0.6-java (0.6.0-8) unstable; urgency=low
+
+  * Eliminated .jar files from source tree (thanks to Torsten Werner
+    for spotting this)
+  * Added dependency to libjgraph-java
+  * Added dependency to junit as build dependency
+  * Using quilt for respective changes to build.xml
+
+ -- Steffen Moeller <moeller at debian.org>  Tue, 08 Sep 2009 01:45:18 +0200
+
 libjgrapht0.6-java (0.6.0-7) unstable; urgency=low
 
   * Updated policy to 3.8.3 (no changes required)

Modified: trunk/libjgrapht-java/branch_0.6/debian/control
===================================================================
--- trunk/libjgrapht-java/branch_0.6/debian/control	2009-09-07 22:53:46 UTC (rev 10321)
+++ trunk/libjgrapht-java/branch_0.6/debian/control	2009-09-07 23:50:45 UTC (rev 10322)
@@ -3,7 +3,7 @@
 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
+Build-Depends: cdbs, debhelper (>= 5), ant, openjdk-6-jdk, libjgraph-java, quilt, junit
 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
@@ -11,7 +11,7 @@
 
 Package: libjgrapht0.6-java
 Architecture: all
-Depends: default-jre | java2-runtime
+Depends: default-jre | java2-runtime, libjgraph-java, ${misc:Depends}
 Suggests: java-virtual-machine
 Conflicts: libjgrapht-java (<= 0.6.0-4)
 Description: mathematical graph theory library for Java
@@ -30,7 +30,7 @@
 Package: libjgrapht0.6-java-link
 Provides: libjgrapht-java
 Architecture: all
-Depends: libjgrapht0.6-java
+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
@@ -39,6 +39,7 @@
 
 Package: libjgrapht0.6-java-doc
 Architecture: all
+Depends: ${misc:Depends}
 Suggests: www-browser, libjgrapht0.6-java
 Conflicts: libjgrapht-java (<= 0.6.0-4)
 Section: doc

Added: trunk/libjgrapht-java/branch_0.6/debian/patches/jgraph.patch
===================================================================
--- trunk/libjgrapht-java/branch_0.6/debian/patches/jgraph.patch	                        (rev 0)
+++ trunk/libjgrapht-java/branch_0.6/debian/patches/jgraph.patch	2009-09-07 23:50:45 UTC (rev 10322)
@@ -0,0 +1,13 @@
+--- libjgrapht0.6-java-0.6.0.orig/build.xml
++++ libjgrapht0.6-java-0.6.0/build.xml
+@@ -123,8 +123,8 @@
+         <property name="project.tar"      value="${basedir}/${project.tar.name}" />
+         <property name="project.tar.gz"   value="${basedir}/${project.tar.gz.name}" />
+         <property name="project.zip"      value="${basedir}/${project.zip.name}" />
+-        <property name="junit.jar"        value="${lib.dir}/${junit.jar.name}"/>
+-        <property name="jgraph.jar"       value="${lib.dir}/${jgraph.jar.name}"/>
++        <property name="junit.jar"        value="/usr/share/java/${junit.jar.name}"/>
++        <property name="jgraph.jar"       value="/usr/share/java/${jgraph.jar.name}"/>
+         <property name="checkstyle.jar"   value="${lib.dir}/${checkstyle.jar.name}"/>
+         <property name="build.file"       value="${basedir}/${build.file.name}"/>
+         <property name="checkstyle.settings" value="${etc.dir}/checkstyle-settings.xml"/>

Added: trunk/libjgrapht-java/branch_0.6/debian/patches/series
===================================================================
--- trunk/libjgrapht-java/branch_0.6/debian/patches/series	                        (rev 0)
+++ trunk/libjgrapht-java/branch_0.6/debian/patches/series	2009-09-07 23:50:45 UTC (rev 10322)
@@ -0,0 +1 @@
+jgraph.patch

Modified: trunk/libjgrapht-java/branch_0.6/debian/rules
===================================================================
--- trunk/libjgrapht-java/branch_0.6/debian/rules	2009-09-07 22:53:46 UTC (rev 10321)
+++ trunk/libjgrapht-java/branch_0.6/debian/rules	2009-09-07 23:50:45 UTC (rev 10322)
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk