[pkg-java] r14327 - trunk/fop/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-19 14:11:11 +0000 (Fri, 19 Aug 2011)
New Revision: 14327

Modified:
   trunk/fop/debian/changelog
   trunk/fop/debian/orig-tar.sh
   trunk/fop/debian/rules
Log:
minor cleanup

Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog	2011-08-19 05:21:57 UTC (rev 14326)
+++ trunk/fop/debian/changelog	2011-08-19 14:11:11 UTC (rev 14327)
@@ -1,4 +1,4 @@
-fop (1:1.0.dfsg+cleaned-1) unstable; urgency=low
+fop (1:1.0.dfsg-4) unstable; urgency=low
 
   [ Sylvestre Ledru ]
   * Upload to unstable
@@ -12,6 +12,10 @@
     - add a lib/build directory as dirty workaround for a missing dir
     - add libqdox-java as build dependency
 
+  [ Mathieu Malaterre ]
+  * Revert changelog numbering to please tar script
+  * Fix JAVA_HOME value in debian/rules 
+
  -- Vincent Fourmond <fourmond at debian.org>  Mon, 06 Jun 2011 12:49:28 +0200
 
 fop (1:1.0.dfsg-3) experimental; urgency=low

Modified: trunk/fop/debian/orig-tar.sh
===================================================================
--- trunk/fop/debian/orig-tar.sh	2011-08-19 05:21:57 UTC (rev 14326)
+++ trunk/fop/debian/orig-tar.sh	2011-08-19 14:11:11 UTC (rev 14327)
@@ -15,4 +15,3 @@
     mv $TAR $origDir
     echo "moved $TAR to $origDir"
 fi
-

Modified: trunk/fop/debian/rules
===================================================================
--- trunk/fop/debian/rules	2011-08-19 05:21:57 UTC (rev 14326)
+++ trunk/fop/debian/rules	2011-08-19 14:11:11 UTC (rev 14327)
@@ -2,10 +2,10 @@
 # debian/rules for FOP (uses CDBS)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-# include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME            := /usr/lib/jvm/default-java
+#ANT_HOME             := /usr/share/ant
 DEB_JARS             := $(ANT_HOME)/lib/ant-trax.jar batik-all xml-apis-ext batik-libs xml-apis avalon-framework xercesImpl xmlParserAPIs xalan2 junit commons-io commons-logging xmlgraphics-commons servlet-api-2.4 qdox
 DEB_ANT_BUILD_TARGET := package javadocs #docs
 DEB_ANT_CLEAN_TARGET := distclean