[ognl] 29/34: No longer build the PDF documentation

Sun Oct 4 23:07:36 UTC 2015

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository ognl.

commit 92d8ce3abd9f8acae13d5f00d9d45afa569f3d7d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 5 00:17:25 2015 +0200

    No longer build the PDF documentation
---
 debian/changelog                      |  2 ++
 debian/control                        |  2 +-
 debian/libognl-java-doc.doc-base.dev  |  3 ---
 debian/libognl-java-doc.doc-base.lang |  3 ---
 debian/libognl-java-doc.install       |  2 --
 debian/patches/01_build_xml.diff      | 37 +++++++++++------------------------
 debian/rules                          |  2 --
 7 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 417d292..2091544 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ognl (2.7.3-6) UNRELEASED; urgency=medium
 
   * Team upload
+  * No longer build the PDF documentation to work around
+    a build failure caused by the latest FOP upgrade.
   * Moved the package to Git
   * Standards-Version updated to 3.9.6 (no changes)
   * Switch to debhelper level 9
diff --git a/debian/control b/debian/control
index 63d6e16..687bc87 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: debhelper (>= 9), cdbs, default-jdk, ant
 Build-Depends-Indep: libjavassist-java, junit4, docbook-xsl, docbook-xml, ant-optional,
- libxalan2-java, javacc, fop, maven-repo-helper, ant-contrib
+ libxalan2-java, javacc, maven-repo-helper, ant-contrib
 Standards-Version: 3.9.6
 Homepage: http://commons.apache.org/proper/commons-ognl/
 Vcs-Git: git://anonscm.debian.org/pkg-java/ognl .git
diff --git a/debian/libognl-java-doc.doc-base.dev b/debian/libognl-java-doc.doc-base.dev
index 7118870..1efc0d7 100644
--- a/debian/libognl-java-doc.doc-base.dev
+++ b/debian/libognl-java-doc.doc-base.dev
@@ -7,6 +7,3 @@ Section: Programming
 Format: HTML
 Index: /usr/share/doc/libognl-java/DeveloperGuide/index.html
 Files: /usr/share/doc/libognl-java/DeveloperGuide/*
-
-Format: PDF
-Files: /usr/share/doc/libognl-java/DeveloperGuide.pdf
diff --git a/debian/libognl-java-doc.doc-base.lang b/debian/libognl-java-doc.doc-base.lang
index bda00cc..b1e8e60 100644
--- a/debian/libognl-java-doc.doc-base.lang
+++ b/debian/libognl-java-doc.doc-base.lang
@@ -7,6 +7,3 @@ Section: Programming
 Format: HTML
 Index: /usr/share/doc/libognl-java/LanguageGuide/index.html
 Files: /usr/share/doc/libognl-java/LanguageGuide/*
-
-Format: PDF
-Files: /usr/share/doc/libognl-java/LanguageGuide.pdf
diff --git a/debian/libognl-java-doc.install b/debian/libognl-java-doc.install
index 9b080a0..cf0427c 100644
--- a/debian/libognl-java-doc.install
+++ b/debian/libognl-java-doc.install
@@ -1,5 +1,3 @@
 dist/docs/html/LanguageGuide /usr/share/doc/libognl-java/
 dist/docs/html/DeveloperGuide /usr/share/doc/libognl-java/
-dist/docs/pdf/DeveloperGuide.pdf /usr/share/doc/libognl-java/
-dist/docs/pdf/LanguageGuide.pdf /usr/share/doc/libognl-java/
 dist/docs/api /usr/share/doc/libognl-java/
diff --git a/debian/patches/01_build_xml.diff b/debian/patches/01_build_xml.diff
index e262f9a..6373a48 100644
--- a/debian/patches/01_build_xml.diff
+++ b/debian/patches/01_build_xml.diff
@@ -1,12 +1,11 @@
 Description:
- - build.xml: Remove foreach usage as antcontrib is not in Debian
  - build.xml: Don't fork javacc-generate (use Ant Classpath)
  - docbook.xml: Use Xalan2 as XSLT processor
  - docbook.xml: Fix classpath inclusion of fop.jar
 Origin: Damien Raude-Morvan <drazzib at debian.org>
 --- a/docbook.xml
 +++ b/docbook.xml
-@@ -183,16 +183,24 @@
+@@ -183,10 +183,13 @@
              force="true"
              in="${project.docbook}/${docbook.file}.xml"
              out="${output.docbook.html}/${docbook.file}/index.html">
@@ -20,19 +19,7 @@ Origin: Damien Raude-Morvan <drazzib at debian.org>
              <xmlcatalog refid="docbook.catalog"/>
          </xslt>
      </target>
- 
-     <target name="docbook-html-doc" depends="docbook-init">
--        <foreach target="docbook-html-doc-single" list="${project.docbook.filelist}" param="docbook.file"/>
-+       <antcall target="docbook-html-doc-single">
-+               <param name="docbook.file" value="LanguageGuide" />
-+       </antcall>
-+       <antcall target="docbook-html-doc-single">
-+               <param name="docbook.file" value="DeveloperGuide" />
-+       </antcall>
-     </target>
- 
-     <target name="docbook-pdf-doc-single" depends="docbook-init">
-@@ -252,29 +260,32 @@
+@@ -252,25 +255,23 @@
              force="true"
              in="${project.docbook}/${docbook.file}.xml"
              out="${output.docbook.fop}/${docbook.file}.fop">
@@ -63,16 +50,6 @@ Origin: Damien Raude-Morvan <drazzib at debian.org>
      </target>
  
      <target name="docbook-pdf-doc" depends="docbook-init">
--        <foreach target="docbook-pdf-doc-single" list="${project.docbook.filelist}" param="docbook.file"/>
-+       <antcall target="docbook-pdf-doc-single">
-+               <param name="docbook.file" value="LanguageGuide" />
-+       </antcall>
-+       <antcall target="docbook-pdf-doc-single">
-+               <param name="docbook.file" value="DeveloperGuide" />
-+       </antcall>
-     </target>
- 
- </project>
 --- a/osbuild.xml
 +++ b/osbuild.xml
 @@ -138,14 +138,11 @@
@@ -92,7 +69,7 @@ Origin: Damien Raude-Morvan <drazzib at debian.org>
      </target>
 --- a/build.xml
 +++ b/build.xml
-@@ -59,12 +59,12 @@
+@@ -59,19 +59,19 @@
      </target>
  
      <target name="javacc-generate">
@@ -107,3 +84,11 @@ Origin: Damien Raude-Morvan <drazzib at debian.org>
              <arg value="-OUTPUT_DIRECTORY=${src.java}/ognl"/>
              <arg value="${src.java}/ognl/ognl.jj"/>
          </java>
+     </target>
+ 
+     <target name="docs.impl">
+-        <ant antfile="docbook.xml" target="doc-docbook"/>
++        <ant antfile="docbook.xml" target="doc-docbook-html"/>
+ 
+         <copy todir="${dist}/docs">
+             <fileset dir="${docs}"/>
diff --git a/debian/rules b/debian/rules
index 4eefd7f..e9d59dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,6 @@ DEB_ANT_ARGS := -Dversion=$(DEB_UPSTREAM_VERSION)
 DEB_ANT_CLEAN_TARGET    := clean
 DEB_ANT_BUILD_TARGET    := javacc-generate jar docs.impl javadocs
 
-DEB_COMPRESS_EXCLUDE    := .pdf
-
 binary-post-install/libognl-java::
 	mh_installpoms -plibognl-java
 	mh_installjar -plibognl-java -l pom.xml build/ognl-$(DEB_UPSTREAM_VERSION).jar

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ognl.git

