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

[sylvestre-guest at alioth.debian.org]

Author: sylvestre-guest
Date: 2008-09-19 15:16:16 +0000 (Fri, 19 Sep 2008)
New Revision: 7012

Modified:
   trunk/fop/debian/ant.properties
   trunk/fop/debian/changelog
   trunk/fop/debian/control
   trunk/fop/debian/fop-doc.doc-base
   trunk/fop/debian/rules
Log:
  * New upstream version (Closes: #494041)
  * Section change in fop-doc.doc-base from contrib/libs => Text to make 
    lintian happier
  * Dependencies removed (Closes: #229079, #271654)
  * Update of the JAVA_HOME in debian/ant.properties (Closes: #492322)
  * Updated Standards-Version to 3.8.0
  * Add myself as uploader.

Modified: trunk/fop/debian/ant.properties
===================================================================
--- trunk/fop/debian/ant.properties	2008-09-19 14:50:08 UTC (rev 7011)
+++ trunk/fop/debian/ant.properties	2008-09-19 15:16:16 UTC (rev 7012)
@@ -1,2 +1,2 @@
-javahome.jdk14=/usr/lib/jvm/java-6-sun
+javahome.jdk14=/usr/lib/jvm/java-gcj
 #runtime.classpath=xercesImpl.jar xml-apis.jar xalan2.jar batik.jar avalon-framework.jar

Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog	2008-09-19 14:50:08 UTC (rev 7011)
+++ trunk/fop/debian/changelog	2008-09-19 15:16:16 UTC (rev 7012)
@@ -1,9 +1,19 @@
-fop (1:0.94.dfsg-3) UNRELEASED; urgency=low
+fop (1:0.95.dfsg-1) UNRELEASED; urgency=low
 
+  [ Sylvestre Ledru ]
+  * New upstream version (Closes: #494041)
+  * Section change in fop-doc.doc-base from contrib/libs => Text to make 
+    lintian happier
+  * Dependencies removed (Closes: #229079, #271654)
+  * Update of the JAVA_HOME in debian/ant.properties (Closes: #492322)
+  * Updated Standards-Version to 3.8.0
+  * Add myself as uploader.
+
+  [ Michael Koch ]
   * Fixed watch file for changed upstream location.
+	
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Thu, 14 Aug 2008 15:45:50 +0200
 
- -- Michael Koch <konqueror at gmx.de>  Sat, 29 Mar 2008 12:16:39 +0100
-
 fop (1:0.94.dfsg-2) unstable; urgency=low
 
   * Fixed name of versioned jar.

Modified: trunk/fop/debian/control
===================================================================
--- trunk/fop/debian/control	2008-09-19 14:50:08 UTC (rev 7011)
+++ trunk/fop/debian/control	2008-09-19 15:16:16 UTC (rev 7012)
@@ -2,10 +2,10 @@
 Section: contrib/text
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Sylvestre Ledru <sylvestre.ledru at inria.fr>
 Build-Depends: debhelper (>= 5), cdbs (>= 0.4.27)
 Build-Depends-Indep: ant-optional, libbatik-java (>= 1.5.1-1), libavalon-framework-java (>=4.1.2-2), libxalan2-java, libxerces2-java, java-gcj-compat-dev, libcommons-io-java, libcommons-logging-java, junit, libxmlgraphics-commons-java (>= 1.2), libservlet2.4-java
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 
 Package: fop
 Architecture: all

Modified: trunk/fop/debian/fop-doc.doc-base
===================================================================
--- trunk/fop/debian/fop-doc.doc-base	2008-09-19 14:50:08 UTC (rev 7011)
+++ trunk/fop/debian/fop-doc.doc-base	2008-09-19 15:16:16 UTC (rev 7012)
@@ -3,7 +3,7 @@
 Author: FOP Development Team
 Abstract: This manual describes what fop is
  and how it can be used.
-Section: contrib/libs
+Section: Text
 
 Format: HTML
 Index: /usr/share/doc/fop-doc/html/api/index.html

Modified: trunk/fop/debian/rules
===================================================================
--- trunk/fop/debian/rules	2008-09-19 14:50:08 UTC (rev 7011)
+++ trunk/fop/debian/rules	2008-09-19 15:16:16 UTC (rev 7012)
@@ -6,7 +6,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME            := /usr/lib/jvm/java-gcj
-DEB_JARS             := $(ANT_HOME)/lib/ant-trax.jar batik avalon-framework xercesImpl xmlParserAPIs xalan2 junit commons-io commons-logging xmlgraphics-commons servlet-api-2.4 /usr/local/jimi-1.0.jar /usr/local/jai_core.jar /usr/local/jai_codec.jar
+DEB_JARS             := $(ANT_HOME)/lib/ant-trax.jar batik avalon-framework xercesImpl xmlParserAPIs xalan2 junit commons-io commons-logging xmlgraphics-commons servlet-api-2.4
 DEB_ANT_BUILD_TARGET := package javadocs #docs
 DEB_ANT_CLEAN_TARGET := distclean
 DEB_ANT_ARGS := -verbose
@@ -16,6 +16,7 @@
 install/fop::
 	cp build/fop.jar debian/fop/usr/share/java/fop-${DEB_UPSTREAM_VERSION}.jar
 	dh_link usr/share/java/fop-${DEB_UPSTREAM_VERSION}.jar usr/share/java/fop.jar
+
 	cp -a debian/fop.sh debian/fop/usr/bin/fop
 	cp -a debian/fop-ttfreader.sh debian/fop/usr/bin/fop-ttfreader
 	pod2man --section=1 \