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

[Mathieu Malaterre]

Author: malat-guest
Date: 2012-01-05 13:48:29 +0000 (Thu, 05 Jan 2012)
New Revision: 15643

Added:
   trunk/fop/debian/libfop-java.dirs
Modified:
   trunk/fop/debian/changelog
   trunk/fop/debian/control
   trunk/fop/debian/fop.dirs
   trunk/fop/debian/rules
Log:
Split fop package into exe and libs

Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog	2012-01-05 08:49:40 UTC (rev 15642)
+++ trunk/fop/debian/changelog	2012-01-05 13:48:29 UTC (rev 15643)
@@ -2,6 +2,7 @@
 
   * Support conf.d like configuration files. Closes: #630198
   * Fix fop man page (outdated). Closes: #654592, #512443
+  * Split packages into fop and libfop-java. Closes: #544546
 
  -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Thu, 05 Jan 2012 09:32:15 +0100
 

Modified: trunk/fop/debian/control
===================================================================
--- trunk/fop/debian/control	2012-01-05 08:49:40 UTC (rev 15642)
+++ trunk/fop/debian/control	2012-01-05 13:48:29 UTC (rev 15643)
@@ -20,16 +20,31 @@
 
 Package: fop
 Architecture: all
-Depends: default-jre-headless | java2-runtime-headless,
- libxerces2-java, libxalan2-java, libbsf-java,
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libfop-java
+Recommends: libsaxon-java
+Suggests: fop-doc, libservlet2.5-java
+Description: XML formatter driven by XSL Formatting Objects (XSL-FO.)
+ FOP is a Java application that reads a formatting object tree and then
+ turns it into a wide variety of output presentations (including AFP,
+ PCL, PDF, PNG, PostScript, RTF, TIFF, and plain text), or displays
+ the result on-screen.
+ .
+ The formatting object tree can be in the form of an XML document
+ (output by an XSLT engine like xalan) or can be passed in memory as a
+ DOM Document or (in the case of xalan) SAX events.
+ .
+ This package contains the fop command line tool
+
+Package: libfop-java
+Section: java
+Architecture: all
+Depends: libxerces2-java, libxalan2-java, libbsf-java,
  libavalon-framework-java (>=4.1.2-2), libbatik-java (>= 1.7),
  libcommons-io-java, libcommons-logging-java, libxt6,
  libxtst6, libxmlgraphics-commons-java (>= 1.4),
  java-wrappers (>= 0.1.15), libxml-commons-external-java,
  ${misc:Depends}
 Recommends: libsaxon-java
-Suggests: fop-doc, libservlet2.5-java
-Replaces: libfop-java
 Description: XML formatter driven by XSL Formatting Objects (XSL-FO.)
  FOP is a Java application that reads a formatting object tree and then
  turns it into a wide variety of output presentations (including AFP,
@@ -39,6 +54,8 @@
  The formatting object tree can be in the form of an XML document
  (output by an XSLT engine like xalan) or can be passed in memory as a
  DOM Document or (in the case of xalan) SAX events.
+ .
+ This package contains the fop jar file
 
 Package: fop-doc
 Section: doc

Modified: trunk/fop/debian/fop.dirs
===================================================================
--- trunk/fop/debian/fop.dirs	2012-01-05 08:49:40 UTC (rev 15642)
+++ trunk/fop/debian/fop.dirs	2012-01-05 13:48:29 UTC (rev 15643)
@@ -1,3 +1,2 @@
-usr/share/java
 usr/bin
 etc/fop.conf.d

Added: trunk/fop/debian/libfop-java.dirs
===================================================================
--- trunk/fop/debian/libfop-java.dirs	                        (rev 0)
+++ trunk/fop/debian/libfop-java.dirs	2012-01-05 13:48:29 UTC (rev 15643)
@@ -0,0 +1 @@
+usr/share/java

Modified: trunk/fop/debian/rules
===================================================================
--- trunk/fop/debian/rules	2012-01-05 08:49:40 UTC (rev 15642)
+++ trunk/fop/debian/rules	2012-01-05 13:48:29 UTC (rev 15643)
@@ -18,11 +18,12 @@
 	# For this reason qdox is not listed in DEB_JARS
 	test -h /usr/share/java/qdox.jar && cp -L /usr/share/java/qdox.jar lib/build
 
-install/fop::
-	mh_installpom -pfop $(CURDIR)/debian/pom.xml
-	mh_installjar -pfop -l $(CURDIR)/debian/pom.xml \
+install/libfop-java::
+	mh_installpom -plibfop-java $(CURDIR)/debian/pom.xml
+	mh_installjar -plibfop-java -l $(CURDIR)/debian/pom.xml \
 		$(CURDIR)/build/fop.jar
 
+install/fop::
 	cp -a debian/fop.sh debian/fop/usr/bin/fop
 	cp -a debian/fop-ttfreader.sh debian/fop/usr/bin/fop-ttfreader
 	cp -a	debian/fop.1 build/fop.1