[SCM] libpdfbox-java packaging branch, master, updated. debian/1%1.7.0+dfsg-4

[gregor herrmann]

The following commit has been merged in the master branch:
commit 412ed1adee7005ed890485888f9a834e389f13e4
Author: gregor herrmann <gregoa at debian.org>
Date:   Tue Jan 29 16:49:56 2013 +0100

    Fix installation of CMap tables during build.
    
    - debian/control: replace build-dependeny on removed packages cmap-adobe-*
      and gs-cjk-resource with their successor poppler-data.
    - debian/rules: adjust path to CMap files accordingly; and guard against
      future failures by using the idiomatic "find -print0 | xargs -r0"
      construct.
    
    Thanks: Lucas Nussbaum for the bug report.
    Closes: #699254

diff --git a/debian/control b/debian/control
index 5979989..2dc4b60 100644
--- a/debian/control
+++ b/debian/control
@@ -8,12 +8,6 @@ Build-Depends: debhelper (>= 8), ant
 Build-Depends-Indep: default-jdk,
  ant-optional,
  checkstyle,
- cmap-adobe-cns1,
- cmap-adobe-gb1,
- cmap-adobe-japan1,
- cmap-adobe-japan2,
- cmap-adobe-korea1,
- gs-cjk-resource,
  htmldoc-common,
  junit4,
  lcdf-typetools,
@@ -23,7 +17,8 @@ Build-Depends-Indep: default-jdk,
  libcommons-logging-java,
  libicu4j-java,
  liblucene2-java,
- javahelper
+ javahelper,
+ poppler-data
 Standards-Version: 3.9.3
 Homepage: http://pdfbox.apache.org/
 Vcs-Git: git://git.debian.org/git/pkg-java/libpdfbox-java.git
diff --git a/debian/rules b/debian/rules
index 0e8f1fe..56812b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ override_dh_auto_clean:
 
 override_dh_auto_configure:
 	# replace what we delete in repacking. never used ...
-	find /usr/share/fonts/cmap/ -type f | xargs cp -n -t pdfbox/src/main/resources/org/apache/pdfbox/resources/cmap/
+	find /usr/share/poppler/cMap -type f -print0 | xargs -r0 cp -n -t pdfbox/src/main/resources/org/apache/pdfbox/resources/cmap/
 	dh_auto_configure
 
 override_dh_auto_build:

-- 
libpdfbox-java packaging