[jabref] 295/459: patch to build against pdfbox 1.5.0+dfsg

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository jabref.

commit 90f66a76adafe62fe0d59f4ec173c4580f8a6311
Author: tony mancill <tmancill at debian.org>
Date:   Tue Mar 29 04:01:22 2011 +0000

    patch to build against pdfbox 1.5.0+dfsg
---
 debian/changelog                  |  6 ++++
 debian/control                    |  6 ++--
 debian/patches/07_pdfbox1.5.patch | 63 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 4 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a89bc6b..b0a42aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jabref (2.7~beta1+ds-4) UNRELASED; urgency=low
+
+  * Add patch to build against libpdfbox-1.5.0+dfsg.
+
+ -- tony mancill <tmancill at debian.org>  Mon, 28 Mar 2011 20:55:15 -0700
+
 jabref (2.7~beta1+ds-3) unstable; urgency=low
 
   * Edit jabref wrapper script to resolve libjgoodies-common-java jar.
diff --git a/debian/control b/debian/control
index 10b6876..35fa875 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: tony mancill <tmancill at debian.org>
 Build-Depends: debhelper (>= 7.3.7), quilt (>= 0.46-7)
 Build-Depends-Indep: default-jdk, ant, imagemagick, liblog4j1.2-java,
  antlr, antlr3 (>= 3.2), libjgoodies-looks-java, libjgoodies-forms-java, libspin-java,
- libglazedlists-java, libmicroba-java, libpdfbox-java, libjempbox-java (>= 0.2.0),
+ libglazedlists-java, libmicroba-java, libpdfbox-java (>= 1.5.0), libjempbox-java (>= 1.5.0),
  libmysql-java, libcommons-logging-java, libjpf-java, libjpfcodegen-java,
  velocity (>= 1.5)
 Standards-Version: 3.9.1
@@ -18,8 +18,8 @@ Package: jabref
 Architecture: all
 Depends: ${misc:Depends}, openjdk-6-jre | sun-java6-jre,
  antlr, antlr3 (>= 3.2), libjgoodies-looks-java, libjgoodies-forms-java, libspin-java,
- libglazedlists-java, libmicroba-java, libpdfbox-java,
- libjempbox-java (>= 0.2.0), java-wrappers (>= 0.1.6), libmysql-java,
+ libglazedlists-java, libmicroba-java, libpdfbox-java (>= 1.5.0),
+ libjempbox-java (>= 1.5.0), java-wrappers (>= 0.1.6), libmysql-java,
  libcommons-logging-java, libjpf-java, libjpfcodegen-java, velocity (>=1.5),
  libjgoodies-common-java
 Recommends: xdg-utils
diff --git a/debian/patches/07_pdfbox1.5.patch b/debian/patches/07_pdfbox1.5.patch
new file mode 100644
index 0000000..16a4936
--- /dev/null
+++ b/debian/patches/07_pdfbox1.5.patch
@@ -0,0 +1,63 @@
+Description: adjust for new upstream release of PDFBox:
+ - fix up package imports for jempbox and pdfbox
+ - adjust return type of getSequenceDateList()
+Origin: other
+Forwarded: no
+Author: tony mancill <tmancill at debian.org>
+Last-Update: 2011-03-28
+
+--- a/src/java/net/sf/jabref/util/XMPSchemaBibtex.java
++++ b/src/java/net/sf/jabref/util/XMPSchemaBibtex.java
+@@ -7,8 +7,8 @@
+ 
+ import net.sf.jabref.*;
+ 
+-import org.jempbox.xmp.XMPMetadata;
+-import org.jempbox.xmp.XMPSchema;
++import org.apache.jempbox.xmp.XMPMetadata;
++import org.apache.jempbox.xmp.XMPSchema;
+ import org.w3c.dom.Element;
+ import org.w3c.dom.NamedNodeMap;
+ import org.w3c.dom.Node;
+@@ -106,7 +106,7 @@
+ 	}
+ 
+ 	@SuppressWarnings("unchecked")
+-	public List<String> getSequenceDateList(String seqName) throws IOException {
++	public List<Calendar> getSequenceDateList(String seqName) throws IOException {
+ 		return super.getSequenceDateList(makeProperty(seqName));
+ 	}
+ 
+--- a/src/java/net/sf/jabref/util/XMPUtil.java
++++ b/src/java/net/sf/jabref/util/XMPUtil.java
+@@ -9,18 +9,18 @@
+ import net.sf.jabref.imports.BibtexParser;
+ import net.sf.jabref.imports.ParserResult;
+ 
+-import org.jempbox.impl.DateConverter;
+-import org.jempbox.impl.XMLUtil;
+-import org.jempbox.xmp.XMPMetadata;
+-import org.jempbox.xmp.XMPSchema;
+-import org.jempbox.xmp.XMPSchemaDublinCore;
+-import org.pdfbox.cos.COSDictionary;
+-import org.pdfbox.cos.COSName;
+-import org.pdfbox.exceptions.COSVisitorException;
+-import org.pdfbox.pdmodel.PDDocument;
+-import org.pdfbox.pdmodel.PDDocumentCatalog;
+-import org.pdfbox.pdmodel.PDDocumentInformation;
+-import org.pdfbox.pdmodel.common.PDMetadata;
++import org.apache.jempbox.impl.DateConverter;
++import org.apache.jempbox.impl.XMLUtil;
++import org.apache.jempbox.xmp.XMPMetadata;
++import org.apache.jempbox.xmp.XMPSchema;
++import org.apache.jempbox.xmp.XMPSchemaDublinCore;
++import org.apache.pdfbox.cos.COSDictionary;
++import org.apache.pdfbox.cos.COSName;
++import org.apache.pdfbox.exceptions.COSVisitorException;
++import org.apache.pdfbox.pdmodel.PDDocument;
++import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
++import org.apache.pdfbox.pdmodel.PDDocumentInformation;
++import org.apache.pdfbox.pdmodel.common.PDMetadata;
+ 
+ /**
+  * XMPUtils provide support for reading and writing BibTex data as XMP-Metadata
diff --git a/debian/patches/series b/debian/patches/series
index 6b89451..e5ad6a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+07_pdfbox1.5.patch
 01_free_javac.patch
 02_libs.patch
 05_antlr32.patch

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