[pkg-java] r10054 - in trunk/jaranalyzer/debian: . patches

[Florian Grandel]

Author: jerico-guest
Date: 2009-08-14 22:02:09 +0000 (Fri, 14 Aug 2009)
New Revision: 10054

Modified:
   trunk/jaranalyzer/debian/changelog
   trunk/jaranalyzer/debian/control
   trunk/jaranalyzer/debian/jaranalyzer.manifest
   trunk/jaranalyzer/debian/patches/adapt_build_xml.diff
   trunk/jaranalyzer/debian/rules
Log:
* closes: #540175

Modified: trunk/jaranalyzer/debian/changelog
===================================================================
--- trunk/jaranalyzer/debian/changelog	2009-08-14 22:02:05 UTC (rev 10053)
+++ trunk/jaranalyzer/debian/changelog	2009-08-14 22:02:09 UTC (rev 10054)
@@ -1,6 +1,6 @@
 jaranalyzer (1.2-4) unstable; urgency=low
 
-  * closes #540175:
+  * closes: #540175
    + debian/control: add default-jdk to Build-Depends
    + debian/rules: set JAVA_HOME to /usr/lib/jvm/default-java
    + thanks to Michael Bienia <geser at ubuntu.com> and Marcus Better

Modified: trunk/jaranalyzer/debian/control
===================================================================
--- trunk/jaranalyzer/debian/control	2009-08-14 22:02:05 UTC (rev 10053)
+++ trunk/jaranalyzer/debian/control	2009-08-14 22:02:09 UTC (rev 10054)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Florian Grandel <jerico.dev at gmail.com>
-Build-Depends: cdbs, debhelper (>> 5), javahelper (>= 0.13), tofrodos, ant-optional, quilt, default-jdk
+Build-Depends: cdbs, debhelper (>> 5), javahelper, tofrodos, ant-optional, quilt, default-jdk
 Build-Depends-Indep: junit, libbcel-java, libregexp-java, help2man
 Standards-Version: 3.8.2
 Homepage: http://www.kirkk.com/main/Main/JarAnalyzer

Modified: trunk/jaranalyzer/debian/jaranalyzer.manifest
===================================================================
--- trunk/jaranalyzer/debian/jaranalyzer.manifest	2009-08-14 22:02:05 UTC (rev 10053)
+++ trunk/jaranalyzer/debian/jaranalyzer.manifest	2009-08-14 22:02:09 UTC (rev 10054)
@@ -1,4 +1,4 @@
 usr/share/jaranalyzer/jaranalyzer.jar:
  Main-Class: com.kirkk.analyzer.textui.DOTSummary
- Debian-Java-Home: /usr/lib/jvm/java-gcj
+ Debian-Java-Home: /usr/lib/jvm/default-java
  Class-Path: /usr/share/java/bcel.jar /usr/share/java/regexp.jar

Modified: trunk/jaranalyzer/debian/patches/adapt_build_xml.diff
===================================================================
--- trunk/jaranalyzer/debian/patches/adapt_build_xml.diff	2009-08-14 22:02:05 UTC (rev 10053)
+++ trunk/jaranalyzer/debian/patches/adapt_build_xml.diff	2009-08-14 22:02:09 UTC (rev 10054)
@@ -1,3 +1,5 @@
+Remove unnecessary cruft from the build.xml
+Author: Florian Grandel <jerico.dev at gmail.com>
 Index: jaranalyzer-1.2/build.xml
 ===================================================================
 --- jaranalyzer-1.2.orig/build.xml	2008-07-17 20:16:33.000000000 -0300

Modified: trunk/jaranalyzer/debian/rules
===================================================================
--- trunk/jaranalyzer/debian/rules	2009-08-14 22:02:05 UTC (rev 10053)
+++ trunk/jaranalyzer/debian/rules	2009-08-14 22:02:09 UTC (rev 10054)
@@ -4,8 +4,9 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME 		:= /usr/lib/jvm/default-java
-DEB_JARS		:= bcel regexp junit ant-junit
+#JAVA_HOME	:= $(shell readlink -f /usr/bin/javac | sed 's%/bin/javac$$%%')
+JAVA_HOME	:=/usr/lib/jvm/default-java
+DEB_JARS	:= bcel regexp junit ant-junit
 
 clean::
 	rm -f result.xml jaranalyzer jaranalyzer.1