diff -Nru xpdf-3.02/debian/changelog xpdf-3.02/debian/changelog --- xpdf-3.02/debian/changelog 2010-07-17 05:39:33.000000000 -0400 +++ xpdf-3.02/debian/changelog 2010-08-07 00:04:47.000000000 -0400 @@ -1,3 +1,32 @@ +xpdf (3.02-10) UNRELEASED; urgency=low + + [Michael Gilbert] + * Make language file installation slightly more robust/automated. + * Bind arrow keys to next/prev page actions by default (closes: #200610). + * Use Breaks instead of Conflicts. + * No need to break or conflict xpdf-common since replaces is enough to + enable successful lenny upgrades. + * Remove dangling symlink leftover by lenny xpdf package (closes: #589650). + * Bump standards version to 3.9.1 (no changes required). + * Recommend gsfonts-x11 package. + * Remove refrences to poppler-utils files in xpdfrc and clean it up a bit. + * Include versioned depends on expat (closes: #591724). + * Drop unneeded 'Provides'. + * Drop conflicts/breaks with packages that no longer exist in lenny. + * Version all 'Breaks'. + + [Osamu Aoki] + * Remove xpdf-common and clean up dependencies (closes: #589425). + * zxpdf: remove temp file on exit (closes: #280460). + * zxpdf: search compressed file names (closes: #501661). + * Fix typo in "xpdf --help" output. + * Explain zoom (+-) only after "0" (closes: #426502). + * Restore xpdf.desktop file (closes: #589542). + * Drop update-xpdfrc: no longer needed due to poppler transition + (closes: #437529). + + -- Osamu Aoki Wed, 21 Jul 2010 23:16:50 +0900 + xpdf (3.02-9) unstable; urgency=low * Reactivate zoomFitHeight properly by merging it into fix-580495.patch. diff -Nru xpdf-3.02/debian/control xpdf-3.02/debian/control --- xpdf-3.02/debian/control 2010-07-17 05:39:33.000000000 -0400 +++ xpdf-3.02/debian/control 2010-08-07 00:04:10.000000000 -0400 @@ -3,10 +3,11 @@ Priority: optional Maintainer: Michael Gilbert Uploaders: Osamu Aoki -Standards-Version: 3.9.0 +Standards-Version: 3.9.1 Build-Depends: debhelper (>= 7.0.50~), - pkg-config, libx11-dev, + pkg-config, + libx11-dev, lesstif2-dev, libpoppler-dev (>= 0.12.4) Homepage: http://www.foolabs.com/xpdf/ @@ -15,59 +16,38 @@ Package: xpdf Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Conflicts: - xpdf-i (<= 0.90-8), - xpdf-cyrillic, - xpdf-greek, - xpdf-hebrew, - xpdf-latin2, - xpdf-thai, - xpdf-turkish, - xpdf-japanese, - xpdf-korean, - xpdf-chinese-simplified, - xpdf-chinese-traditional +Depends: + ${misc:Depends}, + ${shlibs:Depends}, + libexpat1 (>= 2.0.1-7) +Breaks: + xpdf-japanese (<= 1:20040727-1), + xpdf-korean (<= 1:20040727-1), + xpdf-chinese-simplified (<= 20040727-1), + xpdf-chinese-traditional (<= 1:20040727-1), + xpdf-reader (<< 3.02-10) Replaces: - xpdf-i (<= 0.90-8), - xpdf-reader (<< 3.02-3), - xpdf-common (<< 3.02-3), - xpdf-cyrillic, - xpdf-greek, - xpdf-hebrew, - xpdf-latin2, - xpdf-thai, - xpdf-turkish, + xpdf-common, + xpdf-reader, xpdf-japanese, xpdf-korean, xpdf-chinese-simplified, xpdf-chinese-traditional Recommends: poppler-utils, - poppler-data + poppler-data, + gsfonts-x11 Provides: - pdf-viewer, - xpdf-reader, - xpdf-common + pdf-viewer Description: Portable Document Format (PDF) reader xpdf is a viewer for Portable Document Format (PDF) files. These are, sometimes, called 'Acrobat' files after the name of Adobe's PDF software. -Package: xpdf-common -Architecture: all -Depends: - ${misc:Depends}, - xpdf (>= ${source:Version}) -Description: Transitional package for xpdf - This is a transitional package for xpdf, and can be safely removed - after the installation is complete. - Package: xpdf-reader Architecture: all Depends: ${misc:Depends}, - xpdf (>= ${source:Version}), - xpdf-common(>= ${source:Version}) + xpdf Description: Transitional package for xpdf This is a transitional package for xpdf, and can be safely removed after the installation is complete. diff -Nru xpdf-3.02/debian/copyright xpdf-3.02/debian/copyright --- xpdf-3.02/debian/copyright 2010-07-17 05:39:33.000000000 -0400 +++ xpdf-3.02/debian/copyright 2010-07-21 19:25:29.000000000 -0400 @@ -1,40 +1,43 @@ -This is Debian GNU/Linux's prepackaged version of the 'xpdf' viewer written -by Derek B. Noonburg. This package was original built by -Dirk Eddelbuettel and since 1998 has been -maintained by Hamish Moffatt . Current sources are found -at - http://www.foolabs.com/xpdf - - -The upstream author's email address is: derekn@foolabs.com - -Copyright: - -Xpdf is copyright 1996-2007 Derek B. Noonburg. - -Xpdf is licensed under the GNU General Public License (GPL), version -2. In my opinion, the GPL is a convoluted, confusing, ambiguous mess. -But it's also pervasive, and I'm sick of arguing. And even if it is -confusing, the basic idea is good. - -In order to cut down on the confusion a little bit, here are some -informal clarifications: - -- I don't mind if you redistribute xpdf in source and/or binary form, - as long as you include all of the documentation: README, man pages - (or help files), and COPYING. (Note that the README file contains a - pointer to a web page with the source code.) - -- Selling a CD-ROM that contains xpdf is fine with me, as long as it - includes the documentation. I wouldn't mind receiving a sample - copy, but it's not necessary. - -- If you make useful changes to xpdf, please make the source code - available -- post it on a web site, email it to me, whatever. - -For information on commercial licensing and consulting, please see the -Glyph & Cog web site: - - http://www.glyphandcog.com/ - -The full text of the GPL can be found in /usr/share/common-licenses/GPL-2. +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Name: Xpdf +Source: http://www.foolabs.com/xpdf + +Copyright: 1996-2007, Derek B. Noonburg +License: GPL-2+ + Xpdf is licensed under the GNU General Public License (GPL), version + 2. In my opinion, the GPL is a convoluted, confusing, ambiguous mess. + But it's also pervasive, and I'm sick of arguing. And even if it is + confusing, the basic idea is good. + . + In order to cut down on the confusion a little bit, here are some + informal clarifications: + . + - I don't mind if you redistribute xpdf in source and/or binary form, + as long as you include all of the documentation: README, man pages + (or help files), and COPYING. (Note that the README file contains a + pointer to a web page with the source code.) + . + - Selling a CD-ROM that contains xpdf is fine with me, as long as it + includes the documentation. I wouldn't mind receiving a sample + copy, but it's not necessary. + . + - If you make useful changes to xpdf, please make the source code + available -- post it on a web site, email it to me, whatever. + . + For information on commercial licensing and consulting, please see the + Glyph & Cog web site: + . + http://www.glyphandcog.com/ + . + On Debian systems, the full text of the GNU General Public License + version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. + +Files: debian/* +Copyright: 1996-1998, Dirk Eddelbuettel + 1998-2007, Hamish Moffatt + 2010, Michael S. Gilbert + 2010, Osamu Aoki + 2010, Rogério Theodoro de Brito +License: GPL-2 + On Debian systems, the full text of the GNU General Public License + version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. diff -Nru xpdf-3.02/debian/patches/11-fix-hyphens-in-manpages.patch xpdf-3.02/debian/patches/11-fix-hyphens-in-manpages.patch --- xpdf-3.02/debian/patches/11-fix-hyphens-in-manpages.patch 2010-07-17 05:39:33.000000000 -0400 +++ xpdf-3.02/debian/patches/11-fix-hyphens-in-manpages.patch 2010-07-19 00:35:03.000000000 -0400 @@ -53,6 +53,15 @@ .TP .B "binoculars button" Find a text string. +@@ -420,7 +420,7 @@ + Activate the page number text field ("goto page"). + .TP + .B 0 +-Set the zoom factor to 125%. ++Set the zoom factor to 125% (ready for increment and decrement). + .TP + .B + + Zoom in (increment the zoom factor by 1). @@ -462,7 +462,7 @@ # Use xpdf to view PDF files. .RE diff -Nru xpdf-3.02/debian/patches/12-fix-typo-in-help.patch xpdf-3.02/debian/patches/12-fix-typo-in-help.patch --- xpdf-3.02/debian/patches/12-fix-typo-in-help.patch 1969-12-31 19:00:00.000000000 -0500 +++ xpdf-3.02/debian/patches/12-fix-typo-in-help.patch 2010-07-21 19:25:29.000000000 -0400 @@ -0,0 +1,13 @@ +Author: Osamu Aoki +Description: Fixes --help message for xpdf +--- a/xpdf/xpdf.cc ++++ b/xpdf/xpdf.cc +@@ -103,7 +103,7 @@ + {"-exec", argString, remoteCmd, sizeof(remoteCmd), + "execute command on xpdf remote server (with -remote only)"}, + {"-reload", argFlag, &doRemoteReload, 0, +- "reload xpdf remove server window (with -remote only)"}, ++ "reload xpdf remote server window (with -remote only)"}, + {"-raise", argFlag, &doRemoteRaise, 0, + "raise xpdf remote server window (with -remote only)"}, + {"-quit", argFlag, &doRemoteQuit, 0, diff -Nru xpdf-3.02/debian/patches/series xpdf-3.02/debian/patches/series --- xpdf-3.02/debian/patches/series 2010-07-17 05:39:33.000000000 -0400 +++ xpdf-3.02/debian/patches/series 2010-07-21 23:23:34.000000000 -0400 @@ -2,6 +2,7 @@ 02-permissions.patch 09-xpdfrc-manpage.patch 11-fix-hyphens-in-manpages.patch +12-fix-typo-in-help.patch # various bug fies fix-408502.patch diff -Nru xpdf-3.02/debian/update-xpdfrc xpdf-3.02/debian/update-xpdfrc --- xpdf-3.02/debian/update-xpdfrc 2010-07-17 05:39:33.000000000 -0400 +++ xpdf-3.02/debian/update-xpdfrc 1969-12-31 19:00:00.000000000 -0500 @@ -1,22 +0,0 @@ -#!/bin/sh -set -e - -TARGET=/etc/xpdf/includes - -# Generate /etc/xpdf/includes from /etc/xpdf/* -# This allows the xpdf-* language add-on packages -# to supply configuration file snippets. - -echo \# DO NOT EDIT THIS FILE DIRECTLY. > $TARGET -echo \# This file was automatically generated by /usr/sbin/update-xpdfrc. >> $TARGET -echo \# Instead, add or remove files in /etc/xpdf/ then run >> $TARGET -echo \# /usr/sbin/update-xpdfrc to regenerate this file. >> $TARGET -echo >> $TARGET - -find /etc/xpdf \ - -name xpdfrc-\* \ - -and -not -name \*.dpkg\* \ - -and -not -name \*~ \ - -and -not -name \*,v \ - -printf "include %p\n" >> $TARGET - diff -Nru xpdf-3.02/debian/update-xpdfrc.8 xpdf-3.02/debian/update-xpdfrc.8 --- xpdf-3.02/debian/update-xpdfrc.8 2010-07-17 05:39:33.000000000 -0400 +++ xpdf-3.02/debian/update-xpdfrc.8 1969-12-31 19:00:00.000000000 -0500 @@ -1,46 +0,0 @@ -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.TH "update-xpdfrc" "8" "October 22, 2002" "Hamish Moffatt" -.SH "NAME" -update\-xpdfrc \- program to generate xpdf's configuration file -.SH "SYNOPSIS" -.B update\-xdfrc -.SH "DESCRIPTION" -.B \fBupdate\-xpdfrc\fR -is a program used to generate part of the \fIxpdfrc(5)\fR file used -by xpdf. The generated configuration file contains a list of the -configuration snippets provided by the xpdf-* language packages. - -You may edit the file \fI/etc/xpdfrc\fR to configure xpdf. -However, do not edit the generated file \fI/etc/xpdf/includes\fR. -It is updated whenever a language package is added or removed. -You must include the file /etc/xpdf/includes in your xpdfrc -to make use of this functionality. - -The language support packages (xpdf-japanese etc) provide additional -configuration files such as \fI/etc/xpdf/xpdfrc-japanese\fR, which will be -listed in the generated \fI/etc/xpdf/includes\fR. - -.SH "FILES" -.nf -.ta \w'/etc/xpdf/xpdfrc\-* 'u -/etc/xpdf/xpdfrc main configuration file -.br -/etc/xpdf/xpdf\-* additional configuration files -.SH "SEE ALSO" -.BR xpdfrc (5), -.BR xpdf (1). -.SH "AUTHOR" -This manual page and the update-xpdfrc utility was written by Hamish Moffatt -for the Debian GNU/Linux system (but may be used by others). -.\" vim:syn=nroff diff -Nru xpdf-3.02/debian/xpdf.install xpdf-3.02/debian/xpdf.install --- xpdf-3.02/debian/xpdf.install 2010-07-17 05:39:33.000000000 -0400 +++ xpdf-3.02/debian/xpdf.install 2010-07-21 21:34:45.000000000 -0400 @@ -1,6 +1,7 @@ build/xpdf /usr/bin debian/zxpdf /usr/bin debian/xpdf.xpm /usr/share/pixmaps -debian/update-xpdfrc /usr/sbin -debian/xpdfrc /etc/xpdf debian/languages/* /usr/share/xpdf +debian/xpdf.desktop /usr/share/applications +debian/xpdfrc /etc/xpdf +debian/Xresources/xpdf /etc/X11/Xresources diff -Nru xpdf-3.02/debian/xpdf.manpages xpdf-3.02/debian/xpdf.manpages --- xpdf-3.02/debian/xpdf.manpages 2010-07-17 05:39:33.000000000 -0400 +++ xpdf-3.02/debian/xpdf.manpages 2010-07-21 21:34:45.000000000 -0400 @@ -1,3 +1,2 @@ doc/xpdf.1 doc/xpdfrc.5 -debian/update-xpdfrc.8 diff -Nru xpdf-3.02/debian/xpdf.postinst xpdf-3.02/debian/xpdf.postinst --- xpdf-3.02/debian/xpdf.postinst 2010-07-17 05:39:33.000000000 -0400 +++ xpdf-3.02/debian/xpdf.postinst 2010-07-22 00:04:02.000000000 -0400 @@ -1,15 +1,22 @@ #!/bin/sh set -e +includes=/etc/xpdf/includes if [ "$1" = "configure" ] || [ "$1" = "triggered" ] ; then - for lang in arabic chinese-simplified chinese-traditional cyrillic greek hebrew japanese korean latin2 thai turkish ; do - if [ -e /usr/share/poppler/cMap ] ; then - cp /usr/share/xpdf/xpdfrc-$lang /etc/xpdf - else - rm -f /etc/xpdf/xpdfrc-$lang - fi - done - update-xpdfrc + echo "# PLEASE DO NOT EDIT THIS FILE DIRECTLY." > $includes + echo "# It is automatically kept up to date by the xpdf package scripts." >> $includes + echo "# If you want to manually include additional languages or configuration" >> $includes + echo "# files, please edit the /etc/xpdf/xpdfrc or ~/.xpdfrc config file instead." >> $includes + echo "" >> $includes + + if [ -e /usr/share/poppler/cMap ] ; then + for file in /usr/share/xpdf/* ; do + echo "include $file" >> $includes + done + else + echo "# No extra language files found on this system." >> $includes + echo "# Please install the poppler-data package for additional language support." >> $includes + fi fi #DEBHELPER# diff -Nru xpdf-3.02/debian/xpdf.postrm xpdf-3.02/debian/xpdf.postrm --- xpdf-3.02/debian/xpdf.postrm 2010-07-17 05:39:33.000000000 -0400 +++ xpdf-3.02/debian/xpdf.postrm 1969-12-31 19:00:00.000000000 -0500 @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -if [ "$1" = "purge" ]; then - rm -f /etc/xpdf/includes - for lang in arabic chinese-simplified chinese-traditional cyrillic greek hebrew japanese korean latin2 thai turkish ; do - rm -f /etc/xpdf/xpdfrc-$lang - done -fi - -#DEBHELPER# diff -Nru xpdf-3.02/debian/xpdf.preinst xpdf-3.02/debian/xpdf.preinst --- xpdf-3.02/debian/xpdf.preinst 1969-12-31 19:00:00.000000000 -0500 +++ xpdf-3.02/debian/xpdf.preinst 2010-08-06 19:35:17.000000000 -0400 @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +# remove dangling symlink leftover by lenny xpdf package weirdness +# (this 'fix' can be safely removed for squeeze+1) +test -h /usr/share/doc/xpdf && rm -f /usr/share/doc/xpdf || true + +#DEBHELPER# diff -Nru xpdf-3.02/debian/xpdf.prerm xpdf-3.02/debian/xpdf.prerm --- xpdf-3.02/debian/xpdf.prerm 1969-12-31 19:00:00.000000000 -0500 +++ xpdf-3.02/debian/xpdf.prerm 2010-07-21 21:34:45.000000000 -0400 @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "$1" = "remove" ] ; then + rm -f /etc/xpdf/includes +fi + +#DEBHELPER# diff -Nru xpdf-3.02/debian/xpdfrc xpdf-3.02/debian/xpdfrc --- xpdf-3.02/debian/xpdfrc 2010-07-17 05:39:33.000000000 -0400 +++ xpdf-3.02/debian/xpdfrc 2010-08-05 22:15:48.000000000 -0400 @@ -61,14 +61,13 @@ #----- text output control -# Choose a text encoding for copy-and-paste and for pdftotext output. -# The Latin1, ASCII7, and UTF-8 encodings are built into Xpdf. Other -# encodings are available in the language support packages. +# Choose a text encoding for copy-and-paste output. The Latin1, +# ASCII7, and UTF-8 encodings are built into Xpdf. #textEncoding UTF-8 -# Choose the end-of-line convention for multi-line copy-and-past and -# for pdftotext output. The available options are unix, mac, and dos. +# Choose the end-of-line convention for multi-line copy-and-paste. +# The available options are unix, mac, and dos. #textEOL unix @@ -91,5 +90,14 @@ urlCommand "sensible-browser '%s'" -# Include the language configuration file list generated by update-xpdfrc +# Bind arrow keys to next/prev page actions +bind down any nextPage +bind right any nextPage +bind up any prevPage +bind left any prevPage + +# Include additional character maps (these are provided by the +# poppler-data package). The /etc/xpdf/includes file is automatically +# kept up to date by the package scripts. See the file itself for +# more details. include /etc/xpdf/includes diff -Nru xpdf-3.02/debian/Xresources/xpdf xpdf-3.02/debian/Xresources/xpdf --- xpdf-3.02/debian/Xresources/xpdf 1969-12-31 19:00:00.000000000 -0500 +++ xpdf-3.02/debian/Xresources/xpdf 2010-07-21 21:34:45.000000000 -0400 @@ -0,0 +1,2 @@ +Xpdf*fileFilterStyle: filter_hidden_files + diff -Nru xpdf-3.02/debian/zxpdf xpdf-3.02/debian/zxpdf --- xpdf-3.02/debian/zxpdf 2010-07-17 05:39:33.000000000 -0400 +++ xpdf-3.02/debian/zxpdf 2010-07-21 19:25:29.000000000 -0400 @@ -18,7 +18,16 @@ flags="$flags $1 $2"; shift ;; -title) title="$2"; shift ;; -*) flags="$flags $1" ;; - *.[pP][Dd][Ff]) file="$1"; shift; pages="$@"; cat=; break ;; + *.[pP][Dd][Ff]) + file="$1"; shift; pages="$@" + if [ -f $file ] ; then cat="" + elif [ -f $file.Z ] ; then file=$file.Z ; cat=zcat + elif [ -f $file.gz ] ; then file=$file.gz ; cat=zcat + elif [ -f $file.bz2 ] ; then file=$file.bz2 ; cat=bzcat + elif [ -f $file.xz ] ; then file=$file.xz ; cat=xzcat + else echo >&2 "ERROR: file missing \`$file'"; exit 1 + fi + break ;; *.gz|*.Z) file="$1"; shift; pages="$@"; cat=zcat; break ;; *.bz2) file="$1"; shift; pages="$@"; cat=bzcat; break ;; *.xz) file="$1"; shift; pages="$@"; cat=xzcat; break ;; @@ -49,5 +58,7 @@ if [ "$tmp" == "" ]; then exec xpdf -title $title $flags else - exec xpdf -title $title $flags "$tmp" $pages + trap "rm -f \"$tmp\"" 0 1 2 15 + xpdf -title $title $flags "$tmp" $pages + fi