Bug#699271: unblock: libpdfbox-java/1:1.7.0+dfsg-4

[gregor herrmann <gregoa@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Please unblock package libpdfbox-java 1:1.7.0+dfsg-4

This upload closes #699254 by replacing the removed packages
cmap-adobe-* and gs-cjk-resource with poppler-data.

Debdiff against -3 in testing attached.

unblock libpdfbox-java/1:1.7.0+dfsg-4


Thanks in advance,
gregor


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAEBCAAGBQJRB/WAAAoJELs6aAGGSaoGN+UP/jQAsf9U/a5bjA9ZsVvVl9gi
lKk/lXr/9pmqAatiC3/EF4V8faXgTLn4AYXt+WSejQM2P6Pw9LV3LjeKH+xyWfIU
H9JvFuihggnvcc3fnhduYnXy515z6ZLEoWxve5fr238QhksjyAcecoPhA55QGNLO
9ZdO0xqnExC59XgJ35XHLNrdzWoTZOzu6g+DRt0YAkX2pnFL39mIZUUULzGUdVNI
74ESx+tJwOtUIx1VNSDiNluazdSkUdf8lk7gUtRL3Vmciu3AvR+vdJ3Tz3IXBEmK
isSZDAJ6noG2fIah3Scgwm9y8Q5aCxY7YXgGbQepuoLIBb4z+62ppyNA7xYhvsZL
bRnNL+sJ/RtnQWb1lNdlR33FWJJ5YigicQpfwObwZc9BrUe/LL0RPOGVxcTh5eiA
/+rDAVgEAbp/IEfOnQFLZ9HUo+nYFWY6HSoRbIexsKUXfCZsur6quJ4c72/TN9T4
HJvywAXcksD6ASuZEF7vFvgvWGIhtq4cRqAyO0ltD6ABz8f9aLmbacxToLSNj3BF
104PjxL84tiQ14cc7Fwz4KHIESLXDlofKeddJ0sjRTS/AncT8JvNhGqA9MAtVdnb
Jg0Wh5ROHFnuEzd7Wo+M5nuq1S3ACsIjlkNjY6hMzk74ygo3ODFw97nGPRGO32b0
JgbKRKwyLL3zHEKmXAd+
=gqpz
-----END PGP SIGNATURE-----

diff -Nru libpdfbox-java-1.7.0+dfsg/debian/changelog libpdfbox-java-1.7.0+dfsg/debian/changelog
--- libpdfbox-java-1.7.0+dfsg/debian/changelog	2012-07-14 02:12:04.000000000 +0200
+++ libpdfbox-java-1.7.0+dfsg/debian/changelog	2013-01-29 17:07:52.000000000 +0100
@@ -1,3 +1,17 @@
+libpdfbox-java (1:1.7.0+dfsg-4) unstable; urgency=low
+
+  * 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 to Lucas Nussbaum for the bug report.
+    (Closes: #699254)
+
+ -- gregor herrmann <gregoa@debian.org>  Tue, 29 Jan 2013 17:07:45 +0100
+
 libpdfbox-java (1:1.7.0+dfsg-3) unstable; urgency=low
 
   * debian/libpdfbox-java.classpath: add libfontbox-java to manifest
diff -Nru libpdfbox-java-1.7.0+dfsg/debian/control libpdfbox-java-1.7.0+dfsg/debian/control
--- libpdfbox-java-1.7.0+dfsg/debian/control	2012-07-14 02:12:04.000000000 +0200
+++ libpdfbox-java-1.7.0+dfsg/debian/control	2013-01-29 17:07:52.000000000 +0100
@@ -8,12 +8,6 @@
 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 @@
  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 -Nru libpdfbox-java-1.7.0+dfsg/debian/rules libpdfbox-java-1.7.0+dfsg/debian/rules
--- libpdfbox-java-1.7.0+dfsg/debian/rules	2012-07-14 02:12:04.000000000 +0200
+++ libpdfbox-java-1.7.0+dfsg/debian/rules	2013-01-29 17:07:52.000000000 +0100
@@ -16,7 +16,7 @@
 
 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: