[pkg-java] r13413 - trunk/libsaxon-java/debian

[Niels Thykier]

Author: nthykier
Date: 2011-03-12 09:26:05 +0000 (Sat, 12 Mar 2011)
New Revision: 13413

Modified:
   trunk/libsaxon-java/debian/changelog
   trunk/libsaxon-java/debian/control
   trunk/libsaxon-java/debian/rules
Log:
Updated the description and avoided compiling javadoc
when doing binary-only builds.


Modified: trunk/libsaxon-java/debian/changelog
===================================================================
--- trunk/libsaxon-java/debian/changelog	2011-03-12 09:14:28 UTC (rev 13412)
+++ trunk/libsaxon-java/debian/changelog	2011-03-12 09:26:05 UTC (rev 13413)
@@ -17,6 +17,9 @@
   * Accepted patch from Brian M. Carlson to make saxon use
     uppercase encoding names.  (Closes: #568347)
   * Converted source package to 3.0 (quilt).
+  * Updated the descriptions a bit.
+  * Moved javadoc compilation to binary/binary-indep to avoid it
+    being build when doing binary-only builds.
 
  -- Niels Thykier <niels at thykier.net>  Sat, 12 Mar 2011 09:07:41 +0100
 

Modified: trunk/libsaxon-java/debian/control
===================================================================
--- trunk/libsaxon-java/debian/control	2011-03-12 09:14:28 UTC (rev 13412)
+++ trunk/libsaxon-java/debian/control	2011-03-12 09:26:05 UTC (rev 13413)
@@ -4,7 +4,8 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Koch <konqueror at gmx.de>
 Build-Depends: debhelper (>= 7.0.50~), default-jdk, javahelper (>= 0.32~),
- libjdom1-java, gcj-native-helper, default-jdk-doc, libjdom1-java-doc
+ libjdom1-java, gcj-native-helper
+Build-Depends-Indep:  default-jdk-doc, libjdom1-java-doc
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libsaxon-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libsaxon-java
@@ -15,7 +16,7 @@
 Depends: ${misc:Depends}, ${java:Depends}
 Recommends: ${java:Recommends}
 Suggests: libjdom1-java, libsaxon-java-doc
-Description: The Saxon XSLT Processor
+Description: Saxon XSLT Processor
  The saxon package is a collection of tools for processing XML documents and 
  implements the XSLT 1.0 recommendation, including XPath 1.0, in its entirety.
  .
@@ -28,20 +29,23 @@
 Depends: libsaxon-java (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends},
  ${java:Depends}
 Recommends: ${java:Recommends}
-Description: The Saxon XSLT Processor (native code)
+Description: Saxon XSLT Processor (native code)
  The saxon package is a collection of tools for processing XML documents and
  implements the XSLT 1.0 recommendation, including XPath 1.0, in its entirety.
  .
  Saxon is known to work well for processing DocBook XML documents
  with the DocBook XSL Stylesheets. Related packages make the process
  straightforward.
+ .
+ This package contains the native compiled byte code for the Saxon XSLT
+ processor.
 
 Package: libsaxon-java-doc
 Section: doc
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}
 Recommends: ${java:Recommends}
-Description: The Saxon XSLT Processor's documentation and javadoc
+Description: Saxon XSLT Processor's documentation and javadoc
  The saxon package is a collection of tools for processing XML documents and 
  implements the XSLT 1.0 recommendation, including XPath 1.0, in its entirety.
  .

Modified: trunk/libsaxon-java/debian/rules
===================================================================
--- trunk/libsaxon-java/debian/rules	2011-03-12 09:14:28 UTC (rev 13412)
+++ trunk/libsaxon-java/debian/rules	2011-03-12 09:26:05 UTC (rev 13413)
@@ -30,9 +30,13 @@
 	# split off jdom classes, everything else into saxon.jar
 	(cd $(BUILD); $(JAVA_HOME)/bin/jar -cfM ../saxon.jar META-INF `find . -name \*.class | egrep -v $(JDOM)`; \
 	 $(JAVA_HOME)/bin/jar -cfM ../saxon-jdom.jar $(JDOM)/*.class )
+	touch build-stamp
+
+binary binary-indep:
+	# Only compile the javadoc if we have too
 	(cd $(APIDOC) ; $(JAVADOC) -sourcepath ../../$(SOURCES) -link /usr/share/doc/default-jdk-doc/api \
 		-link /usr/share/doc/libjdom1-java/api @../../debian/javadoc-args )
-	touch build-stamp
+	dh $@ --with javahelper
 
 override_dh_auto_clean:
 	rm -f build-stamp configure-stamp saxon*.jar