debian/0000775000000000000000000000000012267510763007201 5ustar debian/patches/0000755000000000000000000000000012267510763010626 5ustar debian/patches/debian-changes0000644000000000000000000027653412267510763013422 0ustar Description: TODO: Put a short summary on the line above and replace this paragraph with a longer explanation of this change. Complete the meta-information with other relevant fields (see below for details). To make it easier, the information below has been extracted from the changelog. Adjust it or drop it. . djvulibre (3.5.25.4-3) unstable; urgency=low . * remove build alts libtiff{5,4,3}-dev (closes: #735997) * bump standards version Author: Barak A. Pearlmutter Bug-Debian: http://bugs.debian.org/735997 --- The information above should follow the Patch Tagging Guidelines, please checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here are templates for supplementary fields that you might want to add: Origin: , Bug: Bug-Debian: http://bugs.debian.org/ Bug-Ubuntu: https://launchpad.net/bugs/ Forwarded: Reviewed-By: Last-Update: --- djvulibre-3.5.25.4.orig/NEWS +++ djvulibre-3.5.25.4/NEWS @@ -1,6 +1,15 @@ +NEW SINCE VERSION 3.5.25 +------------------------ +- New windows installer. +- Fixed Russian code page issues in windows +- General speedup thanks to lock-free smart pointers +- ddjvu can produce one file per page +- djvused can now set the default page orientation +- Big fixes. + NEW IN VERSION 3.5.25 ------------------------- +--------------------- - Removed the deprecated djview3 code. - Removed the deprecated cothreads code. - Removed the unmaintained japanese man pages. --- djvulibre-3.5.25.4.orig/config/config.guess +++ djvulibre-3.5.25.4/config/config.guess @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2009-12-30' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -17,26 +15,22 @@ timestamp='2009-12-30' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,9 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -140,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -181,7 +194,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -202,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -224,7 +241,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -270,7 +287,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -296,12 +316,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -395,23 +415,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -481,8 +501,8 @@ EOF echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -495,7 +515,7 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -552,7 +572,7 @@ EOF echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -595,52 +615,52 @@ EOF 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -731,22 +751,22 @@ EOF exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -770,14 +790,14 @@ EOF exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -789,30 +809,35 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -849,15 +874,22 @@ EOF exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -867,52 +899,56 @@ EOF EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -931,51 +967,63 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -984,11 +1032,11 @@ EOF echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1020,7 +1068,7 @@ EOF fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1048,13 +1096,13 @@ EOF exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1089,8 +1137,8 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1133,10 +1181,10 @@ EOF echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1162,11 +1210,11 @@ EOF exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1179,6 +1227,9 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1205,19 +1256,21 @@ EOF exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1231,7 +1284,10 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1276,13 +1332,13 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1300,11 +1356,11 @@ EOF i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c < printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif --- djvulibre-3.5.25.4.orig/config/config.h.in +++ djvulibre-3.5.25.4/config/config.h.in @@ -241,6 +241,11 @@ /* Define to 1 if you can safely include both and . */ #undef TIME_WITH_SYS_TIME +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS --- djvulibre-3.5.25.4.orig/config/config.sub +++ djvulibre-3.5.25.4/config/config.sub @@ -1,38 +1,31 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. - -timestamp='2010-01-22' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# Copyright 1992-2013 Free Software Foundation, Inc. + +timestamp='2013-08-10' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -75,9 +68,7 @@ Report bugs and patches to /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -2512,17 +2520,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2639,7 +2636,7 @@ linux*oldld* | linux*aout* | linux*coff* ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -3255,10 +3252,6 @@ freebsd* | dragonfly*) fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3297,7 +3290,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -4049,7 +4042,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4348,7 +4341,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -6241,9 +6234,6 @@ if test "$_lt_caught_CXX_error" != yes; _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6405,7 +6395,7 @@ if test "$_lt_caught_CXX_error" != yes; _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler --- djvulibre-3.5.25.4.orig/config/ltmain.sh +++ djvulibre-3.5.25.4/config/ltmain.sh @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.3 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1ubuntu1" +VERSION="2.4.2 Debian-2.4.2-1.3" TIMESTAMP="" package_revision=1.3337 --- djvulibre-3.5.25.4.orig/configure +++ djvulibre-3.5.25.4/configure @@ -1,11 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for djvulibre 3.5.25. +# Generated by GNU Autoconf 2.69 for djvulibre 3.5.25. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,6 +132,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -220,21 +244,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -336,6 +364,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -457,6 +493,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -491,16 +531,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -512,28 +552,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1221,8 +1241,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1496,9 +1514,9 @@ test -n "$ac_init_help" && exit $ac_stat if $ac_init_version; then cat <<\_ACEOF djvulibre configure 3.5.25 -generated by GNU Autoconf 2.68 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1574,7 +1592,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1872,7 +1890,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2045,7 +2063,8 @@ int main () { static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2061,7 +2080,8 @@ main () { static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2118,7 +2138,8 @@ int main () { static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2303,7 +2324,7 @@ This file contains any messages produced running configure, to aid debugging if configure makes a mistake. It was created by djvulibre $as_me 3.5.25, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2887,7 +2908,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2927,7 +2948,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_TOUCH="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2967,7 +2988,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3007,7 +3028,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_RSVG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3048,7 +3069,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CONVERT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3089,7 +3110,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INKSCAPE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3149,7 +3170,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -3225,7 +3246,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3397,7 +3418,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3437,7 +3458,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3490,7 +3511,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3531,7 +3552,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3589,7 +3610,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3633,7 +3654,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4079,8 +4100,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4187,7 +4207,7 @@ do for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -4263,7 +4283,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4329,7 +4349,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4396,7 +4416,7 @@ do for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -4652,7 +4672,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4696,7 +4716,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4874,7 +4894,8 @@ else ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -5109,7 +5130,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5149,7 +5170,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5275,10 +5296,6 @@ freebsd* | dragonfly*) fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -5317,7 +5334,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -5455,7 +5472,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5495,7 +5512,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5599,7 +5616,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5643,7 +5660,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5768,7 +5785,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5808,7 +5825,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5867,7 +5884,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5907,7 +5924,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6011,7 +6028,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6457,7 +6474,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" @@ -6598,7 +6622,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6638,7 +6662,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6718,7 +6742,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6758,7 +6782,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6810,7 +6834,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6850,7 +6874,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6902,7 +6926,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6942,7 +6966,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6994,7 +7018,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7034,7 +7058,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7086,7 +7110,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7126,7 +7150,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8256,7 +8280,7 @@ lt_prog_compiler_static= lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -10426,17 +10450,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -10553,7 +10566,7 @@ linux*oldld* | linux*aout* | linux*coff* ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -11621,7 +11634,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11661,7 +11674,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11714,7 +11727,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11755,7 +11768,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -11813,7 +11826,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11857,7 +11870,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12053,8 +12066,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -12167,7 +12179,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12211,7 +12223,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13205,9 +13217,6 @@ fi ld_shlibs_CXX=yes ;; - gnu*) - ;; - haiku*) archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' link_all_deplibs_CXX=yes @@ -13369,7 +13378,7 @@ fi inherit_rpath_CXX=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -14229,7 +14238,7 @@ lt_prog_compiler_static_CXX= ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -15101,17 +15110,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -15228,7 +15226,7 @@ linux*oldld* | linux*aout* | linux*coff* ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -16875,6 +16873,8 @@ _ACEOF esac rm -rf conftest* fi + + fi @@ -17997,7 +17997,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XDG_MIME="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -18037,7 +18037,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XDG_ICON_RESOURCE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -18077,7 +18077,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XDG_DESKTOP_MENU="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -18616,16 +18616,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -18685,28 +18685,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -18728,7 +18716,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri # values after options handling. ac_log=" This file was extended by djvulibre $as_me 3.5.25, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -18794,10 +18782,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ djvulibre config.status 3.5.25 -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -18887,7 +18875,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' --- djvulibre-3.5.25.4.orig/tools/djvused.1 +++ djvulibre-3.5.25.4/tools/djvused.1 @@ -542,7 +542,23 @@ Display the width and the height of the dimensions of each page are displayed using a syntax suitable for direct insertion into the .SM -tags. +tags. This command also displays the default page orientation +when it is different from zero. +.TP +.BI "set-rotation [+-]" "rot" +Changes the default orientation of the selected pages. +The orientation is expressed as an integer in range 0..3 +representing a number of 90 degree counter-clockwise rotations. +When the argument is preceded by a sign +.BR "+" " or " "-" "," +argument +.I rot +counts how many additional 90 degree counter-clockwise rotations +should be applied to the page. Otherwise, argument +.I rot +represents the desired absolute page orientation. +Only DjVu pages can be rotated. +Pages represented as a raw IW44 image cannot be rotated. .TP .BI "set-page-title " "title" Sets a page title for the selected page. --- djvulibre-3.5.25.4.orig/tools/djvused.cpp +++ djvulibre-3.5.25.4/tools/djvused.cpp @@ -550,36 +550,47 @@ command_dump(ParsingByteStream &) static void print_size(const GP &file) { - const GP pbs(file->get_djvu_bytestream(false, false)); - const GP iff(IFFByteStream::create(pbs)); - GUTF8String chkid; - if (! iff->get_chunk(chkid)) - verror("Selected file contains no data"); - if (chkid == "FORM:DJVU") + GP info = file->info; + if (! info) { - while (iff->get_chunk(chkid) && chkid!="INFO") - iff->close_chunk(); - if (chkid == "INFO") + const GP pbs(file->get_djvu_bytestream(false, false)); + const GP iff(IFFByteStream::create(pbs)); + GUTF8String chkid; + if (! iff->get_chunk(chkid)) + verror("Selected file contains no data"); + if (chkid == "FORM:DJVU") + { + while (iff->get_chunk(chkid) && chkid!="INFO") + iff->close_chunk(); + if (chkid == "INFO") + { + info = DjVuInfo::create(); + info->decode(*iff->get_bytestream()); + } + } + else if (chkid == "FORM:BM44" || chkid == "FORM:PM44") { - GP info=DjVuInfo::create(); - info->decode(*iff->get_bytestream()); - fprintf(stdout,"width=%d height=%d\n", info->width, info->height); + while (iff->get_chunk(chkid) && chkid!="BM44" && chkid!="PM44") + iff->close_chunk(); + if (chkid=="BM44" || chkid=="PM44") + { + GP junk=IW44Image::create_decode(IW44Image::COLOR); + junk->decode_chunk(iff->get_bytestream()); + fprintf(stdout,"width=%d height=%d\n", + junk->get_width(), junk->get_height()); + } } } - else if (chkid == "FORM:BM44" || chkid == "FORM:PM44") + if (info) { - while (iff->get_chunk(chkid) && chkid!="BM44" && chkid!="PM44") - iff->close_chunk(); - if (chkid=="BM44" || chkid=="PM44") - { - GP junk=IW44Image::create_decode(IW44Image::COLOR); - junk->decode_chunk(iff->get_bytestream()); - fprintf(stdout,"width=%d height=%d\n", - junk->get_width(), junk->get_height()); - } + fprintf(stdout,"width=%d height=%d", info->width, info->height); + if (info->orientation) + fprintf(stdout, " rotation=%d", info->orientation); + fprintf(stdout,"\n"); } } + void command_size(ParsingByteStream &) { @@ -757,6 +768,72 @@ command_set_page_title(ParsingByteStream modified = true; } +bool +set_rotation(GP file, int rot, bool relative) +{ + // decode info + GP info = file->info; + if (! info) + { + const GP pbs(file->get_djvu_bytestream(false, false)); + const GP iff(IFFByteStream::create(pbs)); + GUTF8String chkid; + if (! iff->get_chunk(chkid)) + return false; + if (chkid == "FORM:DJVU") + { + while (iff->get_chunk(chkid) && chkid!="INFO") + iff->close_chunk(); + if (chkid == "INFO") + { + info = DjVuInfo::create(); + info->decode(*iff->get_bytestream()); + } + } + file->info = info; + } + if (! info) + return false; + if (relative) + rot += info->orientation; + info->orientation = rot & 3; + file->set_modified(true); + modified = true; + return true; +} + +void +command_set_rotation(ParsingByteStream &pbs) +{ + GUTF8String rot = pbs.get_token(); + if (! rot.is_int()) + verror("usage: set-rotation [+-]"); + int rotation = rot.toInt(); + bool relative = (rot[0]=='+' || rot[0]=='-'); + if (! relative) + if (rotation < 0 || rotation > 3) + verror("absolute rotation must be in range 0..3"); + int rcount = 0; + if (g().file) + { + GUTF8String id = g().fileid; + if (set_rotation(g().file, rotation, relative)) + rcount += 1; + } + else + { + GPList &lst = g().selected; + for (GPosition p=lst; p; ++p) + { + GUTF8String id = lst[p]->get_load_name(); + const GP f(g().doc->get_djvu_file(id)); + if (set_rotation(f, rotation, relative)) + rcount += 1; + } + } + vprint("rotated %d pages", rcount); +} + #define DELMETA 1 #define DELXMP 8 @@ -2030,6 +2107,7 @@ command_help(void) " . set-xmp [] -- copies into the xmp metadata annotation tag\n" " _ set-outline [] -- sets outline (bootmarks)\n" " _ set-thumbnails [] -- generates all thumbnails with given size\n" + " set-rotation [+-] -- sets page rotation\n" " remove-ant -- removes annotations\n" " remove-meta -- removes metadatas without changing other annotations\n" " remove-txt -- removes hidden text\n" @@ -2097,6 +2175,7 @@ static GMap &co xcommand_map["set-outline"] = command_set_outline; xcommand_map["set-xmp"] = command_set_xmp; xcommand_map["set-thumbnails"] = command_set_thumbnails; + xcommand_map["set-rotation"] = command_set_rotation; xcommand_map["remove-ant"] = command_remove_ant; xcommand_map["remove-meta"] = command_remove_meta; xcommand_map["remove-txt"] = command_remove_txt; @@ -2207,7 +2286,7 @@ main(int argc, char **argv) utf8 = true; else if (!strcmp(argv[i],"-f") && i+1 Uploaders: Leon Bottou Build-Depends: dh-autoreconf, debhelper (>= 9), libjpeg-dev, libtiff-dev, librsvg2-bin | imagemagick Vcs-Git: git://anonscm.debian.org/collab-maint/djvulibre.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/djvulibre.git Homepage: http://djvu.sourceforge.net/ Standards-Version: 3.9.5 Package: libdjvulibre-dev Section: libdevel Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, libdjvulibre21 (= ${binary:Version}), libjpeg-dev Description: Development files for the DjVu image format DjVu image format static library and development files. . DjVu is a set of compression technologies, a file format, and a software platform for the delivery over the Web of digital documents, scanned documents, and high resolution images. . DjVu documents download and display extremely quickly, and look exactly the same on all platforms. DjVu can be seen as a superior alternative to PDF and Postscript for digital documents, to TIFF (and PDF) for scanned documents, to JPEG for photographs and pictures, and to GIF for large palettized images. DjVu is the only Web format that is practical for distributing high-resolution scanned documents in color. Package: libdjvulibre21 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libdjvulibre-text (>= ${source:Version}) Conflicts: libdjvulibre1 Replaces: libdjvulibre1, libdjvulibre15 Description: Runtime support for the DjVu image format DjVu runtime library. Package: libdjvulibre-text Architecture: all Multi-Arch: foreign Depends: ${misc:Depends} Replaces: libdjvulibre15, djview3 (= 3.5.20-9), djvulibre-desktop (<< 3.5.20-9) Description: Linguistic support files for libdjvulibre Runtime linguistic support files for the libdjvulibre library. Package: djvulibre-dbg Section: debug Priority: extra Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, libdjvulibre21 (= ${binary:Version}) Description: Debug symbols for the DjVu image format DjVu runtime debug symbols. Package: djvulibre-desktop Architecture: all Depends: ${misc:Depends} Suggests: djview4 | djvu-viewer | evince Conflicts: libdjvulibre1, libdjvulibre21 (<= 3.5.20-5) Replaces: libdjvulibre15 (<= 3.5.20-5) Description: Desktop support for the DjVu image format Miscellaneous files to support the DjVu image format on the desktop. Package: djview Section: graphics Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, djview4 | djview3 Description: Transition package, djview3 to djview4 Ease transition from djview3 to djview4 with this dummy package. Package: djview3 Section: graphics Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, djview4 Description: Transition package, djview3 to djview4 Ease transition from djview3 to djview4 with this dummy package. Package: djvuserve Section: web Recommends: apache | httpd-cgi | httpd Conflicts: djvulibre-bin (<< 3.5.9-3) Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: CGI program for unbundling DjVu files on the fly CGI program to convert a bundled multi-page DjVu document into an indirect DjVu document on the fly. This provides for efficiently browsing large DjVu documents without transferring unnecessary pages. Package: djvulibre-bin Section: graphics Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, curl, libdjvulibre21 (= ${binary:Version}) Recommends: pdf2djvu Suggests: djvulibre-desktop, djview4 | djvu-viewer | evince Description: Utilities for the DjVu image format Executables including utilities for conversion between DjVu and other formats. debian/libdjvulibre-dev.docs0000664000000000000000000000013212265475773013311 0ustar README doc/*.djvu doc/*.txt doc/DjVmNav* doc/GMapAreas* debian/tmp/usr/share/djvu/pubtext debian/djvulibre-bin.install0000664000000000000000000000003712265475773013336 0ustar usr/bin/* usr/share/man/man*/* debian/libdjvulibre-dev.install0000664000000000000000000000010712267507550014020 0ustar usr/include/* usr/lib/*/lib*.so usr/lib/*/lib*.a usr/lib/*/pkgconfig/* debian/libdjvulibre21.install0000664000000000000000000000002412267507550013405 0ustar usr/lib/*/lib*.so.* debian/libdjvulibre-text.install0000664000000000000000000000005212163055346014221 0ustar usr/share/djvu/pubtext usr/share/djvu/osi debian/changelog0000664000000000000000000007302712267510724011061 0ustar djvulibre (3.5.25.4-3) unstable; urgency=low * remove build alts libtiff{5,4,3}-dev (closes: #735997) * bump standards version -- Barak A. Pearlmutter Tue, 21 Jan 2014 15:27:16 +0000 djvulibre (3.5.25.4-2) unstable; urgency=low * merge upstream patches, including autotools refresh(closes: #722525) -- Barak A. Pearlmutter Thu, 12 Sep 2013 09:40:49 +0100 djvulibre (3.5.25.4-1) unstable; urgency=low * new upstream release * merge upstream changes for crash report, see http://lists.debian.org/debian-devel/2013/06/msg00720.html http://www.forallsecure.com/bug-reports/df37d30856756929f929ec8e508af1a574109c0d/ * flush dh-exec overkill * enable full multiarch support * bump standard version * canonicalize development repo urls -- Barak A. Pearlmutter Thu, 27 Jun 2013 16:23:00 +0100 djvulibre (3.5.25.3-3) unstable; urgency=low * multiarch fix via dh-exec lossage * merge upstream fixes -- Barak A. Pearlmutter Mon, 12 Nov 2012 11:06:39 +0000 djvulibre (3.5.25.3-2) unstable; urgency=low * remove more X11-related build dependencies * prefer libtiff5-dev (closes: #681914) -- Barak A. Pearlmutter Tue, 17 Jul 2012 23:23:27 +0200 djvulibre (3.5.25.3-1) unstable; urgency=low * new upstream release * remove X11-related build dependencies * keep debugging symbols -- Barak A. Pearlmutter Sun, 17 Jun 2012 20:37:22 +0100 djvulibre (3.5.25.2-4) unstable; urgency=low * generalize pre-dependency * remove unused override from debian/rules (closes: #664292) * lower djvudigital default resolution from 600 to 300 dpi (closes: #507539) -- Barak A. Pearlmutter Sun, 08 Apr 2012 23:45:27 +0100 djvulibre (3.5.25.2-3) unstable; urgency=low * rsvg-convert not completely plug-compatible replacement (closes: #666475) -- Barak A. Pearlmutter Sat, 07 Apr 2012 09:10:35 +0100 djvulibre (3.5.25.2-2) unstable; urgency=low * switch deprecated rsvg to plug-compatible rsvg-convert (closes: #666475) -- Barak A. Pearlmutter Sat, 31 Mar 2012 21:51:15 +0100 djvulibre (3.5.25.2-1) unstable; urgency=low [ Leon Bottou ] * new upstream version [ Barak A. Pearlmutter ] * upstream fix for diezechar issue (closes: #664280) * upstream fix for minilisp I/O problem (closes: #664442) * include upstream patch completing man page djvused(1) (closes: #551517) * allow dh_install to work on non-multiarch build -- Barak A. Pearlmutter Sun, 18 Mar 2012 23:09:59 +0000 djvulibre (3.5.25-1) unstable; urgency=low [ Leon Bottou ] * new upstream version [ Barak A. Pearlmutter ] * bump debian standards version * bump to dh 9 * add Leon Bottou as co-maintainer * updates for multiarch - update debian/*.install for multiarch: /usr/lib/ to /usr/lib/ARCH/ - ibid for pkgconfig - debian/control shared library Pre-Depends: multiarch-support * use NEWS file as upstream changelog * minor lintian-suggested tweaks to debian/control * merge minor upstream changes -- Barak A. Pearlmutter Fri, 16 Mar 2012 16:54:05 +0000 djvulibre (3.5.24-9) unstable; urgency=low * single debian patch source option (closes: #643094) -- Barak A. Pearlmutter Wed, 28 Sep 2011 16:57:18 +0100 djvulibre (3.5.24-8) unstable; urgency=low * ddjvu_anno_get_xmp consistent prototype vs implementation (closes: #613547) -- Barak A. Pearlmutter Wed, 22 Jun 2011 11:48:22 +0100 djvulibre (3.5.24-7) unstable; urgency=low * upstream fix to page extraction bug (closes: #629941) -- Barak A. Pearlmutter Thu, 09 Jun 2011 23:06:30 +0100 djvulibre (3.5.24-6) unstable; urgency=low * upstream GCC 4.6 fixes * upstream MMX fix addresses 32-bit MMX issue (closes: #629235) -- Barak A. Pearlmutter Sun, 05 Jun 2011 08:08:01 +0100 djvulibre (3.5.24-5) unstable; urgency=low * fix kbsd pthreads linkage more gently -- Barak A. Pearlmutter Thu, 02 Jun 2011 12:32:53 +0100 djvulibre (3.5.24-4) unstable; urgency=low * merge upstream kbsd pthreads linkage mod (closes: #628800) -- Barak A. Pearlmutter Wed, 01 Jun 2011 15:21:23 +0100 djvulibre (3.5.24-3) unstable; urgency=low * merge upstream change with promiscuous inclusions (closes: #625073) -- Barak A. Pearlmutter Thu, 05 May 2011 08:04:13 +0100 djvulibre (3.5.24-2) unstable; urgency=low * do not include .la files per new policy (closes: #621306) -- Barak A. Pearlmutter Wed, 20 Apr 2011 15:34:38 +0100 djvulibre (3.5.24-1) unstable; urgency=low * New upstream version -- Barak A. Pearlmutter Mon, 07 Mar 2011 10:17:06 +0000 djvulibre (3.5.23-6) unstable; urgency=low * tiny patch to libdjvu/miniexp.cpp from Jacob Wilk (closes: #613549) -- Barak A. Pearlmutter Wed, 02 Mar 2011 08:47:43 +0000 djvulibre (3.5.23-5) unstable; urgency=low * changes to debian/rules - honor DEB_BUILD_OPTIONS=noopt (closes: #613521) and debug - remove unused/inappropriate/old variables - let upstream ./configure choose optimisation flags; remove all special cases for particular broken versions of GCC on particular architectures - use dh_auto_make instead of invoking $(MAKE) directly - no need for "chmod +x ..." since git maintains that bit - remove "INSTALL_PROGRAM = $(INSTALL) --strip", as dh handles it * djvulibre-bin depends: same version of libdjvulibre21 (closes: #613530) -- Barak A. Pearlmutter Wed, 16 Feb 2011 13:37:56 +0000 djvulibre (3.5.23-4) unstable; urgency=low * bump to debhelper 8 * flush djview3, generate djview4 transition package (closes: #604347) * flush djvulibre-plugin, to be generated by djview4 * dh --parallel * include phrase "dummy" in package descriptions to silence lintian * dpkg source format 3.0 (quilt) * upstream has switched to git (debian/README.Debian, debian/copyright) -- Barak A. Pearlmutter Sat, 12 Feb 2011 13:26:14 +0000 djvulibre (3.5.23-3) unstable; urgency=low * revert switch to dpkg-source 3.0 (quilt) format -- Barak A. Pearlmutter Sun, 12 Sep 2010 00:29:16 +0100 djvulibre (3.5.23-2) unstable; urgency=low * make any2djvu script not fail to notice assent (closes: #515310) * upstream changes fix many bugs - djvumake no longer fails with these tiny images (closes: #539272) - locale set internally as appropriate, e.g., PDF output (closes: #562156) also fixes https://bugs.launchpad.net/ubuntu/+source/djvulibre/+bug/499324 - thread-related crash addressed, slightly post 3.5.23 (closes: #582961) -- Barak A. Pearlmutter Tue, 07 Sep 2010 17:47:42 +0100 djvulibre (3.5.23-1) unstable; urgency=low * new upstream release * bump policy (debian/control) * Ubuntu patch from Benjamin Drung (closes: #592964) - use autotools-dev to update config.* files to unclutter debdiffs - change recommendation from mozilla-firefox to firefox * modernise debian/rules with dh7 overrides, also thanks to Benjamin Drung * switch to dpkg-source 3.0 (quilt) format -- Barak A. Pearlmutter Tue, 17 Aug 2010 13:35:37 +0200 djvulibre (3.5.22-9) unstable; urgency=low * fix typo in debian/copyright * include upstream changes including nsdejavu XtShellStrings fix -- Barak A. Pearlmutter Mon, 15 Mar 2010 16:56:46 +0000 djvulibre (3.5.22-8) unstable; urgency=low * upstream patch escapes fields in djvused output-* (closes: #564684) * ditch libjpeg62-dev dependencies in favour of libjpeg-dev (closes: #569233) * rev deb policy -- Barak A. Pearlmutter Wed, 10 Feb 2010 23:47:32 +0000 djvulibre (3.5.22-7) unstable; urgency=low * patch typos (closes: #551398) * man page install (closes: #561350), note dh_installman would botch i18n -- Barak A. Pearlmutter Wed, 16 Dec 2009 14:02:49 -0500 djvulibre (3.5.22-6) unstable; urgency=low * patch for typos, thanks Jakub Wilk (closes: #551109) -- Barak A. Pearlmutter Sat, 17 Oct 2009 18:16:19 +0100 djvulibre (3.5.22-5) unstable; urgency=low * dh ${misc:Depends} for straggler binary packages * sh4 patch from Nobuhiro Iwamatsu (closes: #550172) -- Barak A. Pearlmutter Thu, 08 Oct 2009 13:56:34 +0100 djvulibre (3.5.22-4) unstable; urgency=low * Clean lintian issues: - rev deb std - cease ignoring errors in installation scripts - debug package into section: debug - dh ${misc:Depends} for all packages -- Barak A. Pearlmutter Fri, 25 Sep 2009 22:43:51 -0400 djvulibre (3.5.22-3) unstable; urgency=low * Compensate for change in dh_install {,} handling (closes: #538394) -- Barak A. Pearlmutter Fri, 31 Jul 2009 15:02:11 +0100 djvulibre (3.5.22-2) unstable; urgency=low * Invoke Elder Gods Horror to skirt libtool issue (closes: #512252), see debian/rules "Cthulhu" -- Barak A. Pearlmutter Tue, 21 Jul 2009 13:09:57 +0200 djvulibre (3.5.22-1) unstable; urgency=low [ Leon Bottou ] * Upstream release candidate [ Barak A. Pearlmutter ] -- Barak A. Pearlmutter Tue, 23 Jun 2009 22:53:13 +0200 djvulibre (3.5.21-3) unstable; urgency=low * Upstream browser plugin fix to gui/nsdejavu/nsdejavu.c (closes: #504340) * Upstream fix for djvups -text=yes non-ASCII crash (closes: #469122) -- Barak A. Pearlmutter Wed, 10 Dec 2008 21:32:00 +0000 djvulibre (3.5.21-2) unstable; urgency=low * Remove bashism ...{.,*}... from debian/rules (closes: #505644) * Put djvulibre-dbg in section libdevel (closes: #498456) * Formatting patch for c44.1 from Ubuntu (closes: #505643) * Don't integrate 3.5.20-8+lenny0 (do no reopen #495979, #507503) -- Barak A. Pearlmutter Fri, 14 Nov 2008 10:34:44 +0000 djvulibre (3.5.21-1) unstable; urgency=medium * Upstream release * Remove path from command-with-path in djview3.prerm * Partially dh7-ianize * Include bin/djvudigital, useful if gsdjvu installed (closes: #495979) * Include /usr/lib/libdjvulibre.a in libdjvulibre-dev * Build depend on imagemagick and include upstream change to regenerate icon files from SVG sources during build process -- Barak A. Pearlmutter Sun, 07 Sep 2008 15:21:53 +0100 djvulibre (3.5.20-11) unstable; urgency=low * Upstream mods for man and GCC 4.x warnings * Conflict with old library to avoid (closes: #472503) * Tiny HURD MAXPATHLEN patch from Samuel Thibault (closes: #487342) * Existence update-alternative existence check from installation scripts * Integrate 3.5.20-10.1 NMU by Philipp Kern (thanks!) with Conflicts: changed to Replaces: where appropriate * Rev to dh 7 -- Barak A. Pearlmutter Tue, 19 Aug 2008 16:07:05 +0100 djvulibre (3.5.20-10.1) unstable; urgency=medium * Non-maintainer upload. * libdjvulibre-text: add a conflicts against libdjvulibre15 to fix upgrades from Etch (Closes: #494303) -- Philipp Kern Thu, 14 Aug 2008 11:30:37 -0300 djvulibre (3.5.20-10) unstable; urgency=low * Put djview3 support files in djview3 package, leaving only generic library support files in libdjvulibre-text (closes: #493854) * Include more upstream translated text * Flush a bunch of minor compiler warnings -- Barak A. Pearlmutter Tue, 05 Aug 2008 17:23:17 +0100 djvulibre (3.5.20-9) unstable; urgency=low * Add djvulibre-dbg package with debug symbols (closes: #493351) thanks to Pino Toscano for the patch * Provide virtual package djvu-viewer (closes: #491012) * Flush update-alternatives from djview scripts (closes: #491123) * Minor updates to debian packaging info * Split libdjvulibre-text out of djvulibre-desktop, so (a) libdjvulibreXX can depend on just -text not -desktop, and (b) libdjvulibreXX for various XX>=21 can coexist (closes: #472347, #474702, #474993, #475630) -- Barak A. Pearlmutter Mon, 04 Aug 2008 14:16:12 +0100 djvulibre (3.5.20-8) unstable; urgency=low * Raise djvudigital default resolution from 300 to 600 (closes: #478607) * Have lib suggest rather than recommend reader (closes: #476682) * Utilities package now recommends pdf2djvu package, coming soon * Fix update-alternatives in installation scripts (closes: #476444) * Rev deb policy -- Barak A. Pearlmutter Fri, 02 May 2008 01:12:15 -0700 djvulibre (3.5.20-7) unstable; urgency=low * Generate djview transition package (closes: #473341) * Postscript generation issue (four-color image into cpaldjvu into djvups without -mode=bw) seems to be resolved (closes: #278945) * Remove djvudigital from djvulibre-bin (closes: #461226) * Rewrite desktop package description (closes: #474689, #474700) -- Barak A. Pearlmutter Mon, 07 Apr 2008 09:58:58 -0700 djvulibre (3.5.20-6) unstable; urgency=low * split djvulibre-desktop out of shared library proper * desktop xdg-utils dependency out of shared library proper (closes: #472347) * library version coexistence (closes: #471650, #471915, #472097, #472265, #472503) * rename package djview to djview3 * include some upstream change logs and such in djvulibre-bin (closes: #455607) -- Barak A. Pearlmutter Tue, 25 Mar 2008 08:56:12 +0000 djvulibre (3.5.20-5) unstable; urgency=low * Upstream fix (closes: #471149) * Upstream fix for __sync_... build error in libdjvu/atomic.cpp on sparc, mips, arm, hppa, mipsel, armel. -- Barak A. Pearlmutter Mon, 17 Mar 2008 09:28:38 +0000 djvulibre (3.5.20-4) unstable; urgency=low * Upstream fix: locking issues on dual-core machines (as of 3.5.20-2) * Avoid writing mime type conflicting with default freedesktop mime database * Upstream fix for info fetch (closes: #463691) * Upstream fix for document saving (closes: #467282) -- Barak A. Pearlmutter Fri, 14 Mar 2008 11:13:59 +0000 djvulibre (3.5.20-3) unstable; urgency=low * As in djview4, disable stripping of binaries by Makefile.in unless INSTALL_PROGRAM="install -s" is used (closes: #436788) * upstream fix for djvused(1) type (closes: #458241) * upstream fix for djvused set-outline indirect bug (closes: #458086) * upstream fix for c44 small file encoding bug (closes: #455331) * patch (via upstream) for csepdjvu subsample ratio bug (closes: #458211) -- Barak A. Pearlmutter Wed, 30 Jan 2008 11:56:45 +0000 djvulibre (3.5.20-2) unstable; urgency=low * Fix innocuous double-build cleaning issue (closes: #424180, #442552) -- Barak A. Pearlmutter Thu, 6 Dec 2007 17:21:06 +0000 djvulibre (3.5.20-1) unstable; urgency=low * New upstream release * Integrate dh_icons ubuntu-patch (closes: #452109) * Add vcs-cvs and homepage fields to debian/control * Policy 3.7.3 * Upstream fix for filename-with-colon crash (closes: #452947) -- Barak A. Pearlmutter Thu, 6 Dec 2007 14:30:14 +0000 djvulibre (3.5.19-3) unstable; urgency=low * Make any2djvu script handle filenames with spaces correctly (closes: #435355) * Print enormous security warning when any2djvu script is used (closes: #435356) * Plugin recommended brower list now includes iceweasel (closes: #427161) -- Barak A. Pearlmutter Fri, 10 Aug 2007 09:06:13 +0100 djvulibre (3.5.19-2) unstable; urgency=low * License clarification of mozilla plugin code. * Fix upgrade issue by making plugin package conflict with older binaries package (closes: #419666) -- Barak A. Pearlmutter Tue, 24 Apr 2007 09:36:48 +0100 djvulibre (3.5.19-1) unstable; urgency=low * Track upstream changes (closes: #412316) * Move stuff in /usr/share/djvu/. * Cleanup desktop menu and mimetype files. * Manually install mime types, icons, and menu entries. * Renaming program djview to djview3, register with update-alternatives. * Debian standards rev. * License change (GPL either v2 or any later version). -- Barak A. Pearlmutter Sun, 25 Mar 2007 22:46:43 +0000 djvulibre (3.5.17-3) unstable; urgency=medium * Generate non-eroneous, and reasonably loose, shlibs (closes: #389382) * Use very tight version dependencies between generated packages -- Barak A. Pearlmutter Mon, 25 Sep 2006 22:27:09 +0100 djvulibre (3.5.17-2) unstable; urgency=medium * Include minor upstream mods * Raise debhelper dependency verion (closes: #374051) * Silence bashism detector with debian/rules SHELL=bash (closes: #374265) * Hotwire debian/rules to use -O0 on alpha (closes: #387291, #386032) * Tiny debian build simplifications/fixes, eg remove debian/shlibs.local * Use soul-rotting roff hyphenation manipulation commands to fix problem underlying "cannot adjust line" warning for long URL in xmltools/djvuxml.1.in thus curing the cause but not the symptom -- Barak A. Pearlmutter Thu, 21 Sep 2006 02:42:46 +0100 djvulibre (3.5.17-1.1) unstable; urgency=medium * Non-maintainer upload. * On alpha, build GString.cpp with -O0 to work around a bug in GCC 4.1/4.2. Fixes FTBFS. (Closes: #386032) -- Steinar H. Gunderson Wed, 13 Sep 2006 14:24:52 +0200 djvulibre (3.5.17-1) unstable; urgency=low * New upstream release * Upstream GCC-4.1 fixes (closes: #358206) * Upstream "djvudigital --words" fix (closes: #364316) * Many NMUs merged earlier, still fixed (closes: #320582, #320621) (closes: #320656, #320794, #321244, #321406, #321509, #321652) (closes: #322600, #322882, #321107, #322773) -- Barak A. Pearlmutter Thu, 27 Apr 2006 18:11:37 -0400 djvulibre (3.5.16-2) unstable; urgency=low * update to newly broken debian X libraries ... broken apart, that is * have -dev package depend on lib and libjpeg62-dev (closes: #343720) (thanks to Sebastien Bacher via Ubuntu) * page numbers 1-based in djvm -l, like -i/-d (closes: #340361) * don't include KDE desktop file x-djvu.desktop in lib (closes: #339638) -- Barak A. Pearlmutter Mon, 26 Dec 2005 19:42:43 +0000 djvulibre (3.5.16-1) unstable; urgency=low * New upstream release -- Barak A. Pearlmutter Mon, 14 Nov 2005 19:03:18 -0700 djvulibre (3.5.15-2) unstable; urgency=low * Unversioned conflict/replace libdjvulibre1 (closes: #326414, #327190, #327836, #335363) -- Barak A. Pearlmutter Tue, 25 Oct 2005 00:15:50 +0100 djvulibre (3.5.15-1) unstable; urgency=low * New upstream release * Upstream man page clarification (closes: #323307, #323085) -- Barak A. Pearlmutter Mon, 22 Aug 2005 20:50:04 +0100 djvulibre (3.5.14-6.1) unstable; urgency=medium * Non-maintainer upload. * Medium-urgency upload for RC bugfix. * The library soname has changed without changing the package name; reconcile the package name with the library name by changing libdjvulibre1 to libdjvulibre15 (closes: #320582). This conveniently also addresses the C++ ABI change in the process. * Build-depend only on libqt3-mt-dev (>= 3:3.3.4-4) without any alternatives, for the C++ ABI transition; we don't want djview to be accidentally linked against libqt3 instead of libqt3-mt anyway, since that would give unpredictable results if any other libraries require threading. With this rebuild, any possible issues caused by mismatched C++ ABIs are also resolved (closes: #322773). * Use -O2 optimization when building on m68k to work around bug #317475 in gcc-4.0, since this is the optimization level recommended by policy anyway (closes: #321107). * Re-libtoolize the package using the current Debian libtool, to support trimming unnecessary library dependencies. This cuts the dependency tree of djview by better than 50%. -- Steve Langasek Sun, 14 Aug 2005 04:10:36 -0700 djvulibre (3.5.14-6) unstable; urgency=low * minor upstream updates, eg for GCC 4.0 (closes: #319436) * fix typos in cjb2.1 (closes: #311755), ddjvu.1 (closes: #311756), djvu.1 (closes: #311757), djvudigital.1 (closes: #311759), djvups.1 (closes: #311760), djvuxml.1.in (closes: #311763), nsdejavu.1.in (closes: #311765) -- Barak A. Pearlmutter Fri, 29 Jul 2005 11:35:30 +0100 djvulibre (3.5.14-5) unstable; urgency=low * libdjvulibre-dev needs to depend upon libdjvulibre1 * fix #include problem (closes: #306266) -- Barak A. Pearlmutter Mon, 25 Apr 2005 02:03:26 +0100 djvulibre (3.5.14-4) unstable; urgency=low * generate -dev package again, like pre 3.5.9-5 (closes: #305790) * strip down decriptions a little (closes: #164391) -- Barak A. Pearlmutter Sat, 23 Apr 2005 20:47:56 +0100 djvulibre (3.5.14-3) unstable; urgency=low * Incorporate Loic Minier documentation of plugin URL alignment options, (closes: #257384) * minor upstream updates -- Barak A. Pearlmutter Wed, 23 Feb 2005 00:14:55 +0000 djvulibre (3.5.14-2) unstable; urgency=low * versioned build dependency on debhelper (for debian pedants) * tighten version dependencies (closes: #278946) -- Barak A. Pearlmutter Mon, 1 Nov 2004 16:49:49 +0000 djvulibre (3.5.14-1) unstable; urgency=high * New upstream release, with no real changes from last upload * Account for name change firebird to firefox (closes: #267247) * disable sleazy debian/rules hack (see 3.5.13.pre14-5) -- Barak A. Pearlmutter Sat, 21 Aug 2004 06:19:01 -0600 djvulibre (3.5.13.pre14-5) unstable; urgency=medium * debnonmoduluarstupidity: rebuild with libtiff4 (closes: #262848) * resolve mime types image/x-djvu vs image/x.djvu vs image/vnd.djvu: handle all, serve image/vnd.djvu, request other germane packages to switch, document in djvu(1) and nsdejavu(1) (closes: #257020) * upstream CVS fix for djview "find text" bug (closes: #257662) * flush private CVS repository; share with upstream on djvu.sourceforge.net * sleazy debian/rules hack to avoid modified binary source file build issue -- Barak A. Pearlmutter Thu, 8 Jul 2004 23:12:34 +0100 djvulibre (3.5.13.pre14-4) unstable; urgency=low * thumbnails in djview no longer all black (closes: #251647) * add quotes to menu file more violently -- Barak A. Pearlmutter Fri, 11 Jun 2004 22:06:03 +0100 djvulibre (3.5.13.pre14-3) unstable; urgency=low * incorporate new upstream materials in appropriate packages * force installation of desktop stuff even when dirs are missing * add some quotes to menu file -- Barak A. Pearlmutter Tue, 18 May 2004 01:50:31 -0600 djvulibre (3.5.13.pre14-2) unstable; urgency=low * back out patch in djvuserve; upstream patch buggy * add any2djvu security warnings -- Barak A. Pearlmutter Sun, 16 May 2004 14:35:49 -0600 djvulibre (3.5.13.pre14-1) unstable; urgency=low * upstream release; see NEWS file for new features * any2djvu option -q for quiet, instead of older -s -- Barak A. Pearlmutter Sun, 16 May 2004 08:11:32 -0600 djvulibre (3.5.13-1) unstable; urgency=low * upstream release -- Barak A. Pearlmutter Sun, 25 Apr 2004 05:03:23 -0600 djvulibre (3.5.12-5) unstable; urgency=low * sleazy workaround in fprintdate (closes: #241017) -- Barak A. Pearlmutter Tue, 30 Mar 2004 16:05:44 +0100 djvulibre (3.5.12-4) unstable; urgency=low * add image/vnd.djvu as mime type handled by djview (closes: #234913) * rev config.{guess,sub} * upstream man page fix, rev djvused.1 to CVS 1.9 (closes: #231612) -- Barak A. Pearlmutter Fri, 27 Feb 2004 00:06:27 +0000 djvulibre (3.5.12-3) unstable; urgency=low * add more options to any2djvu.sh script; fix man page -- Barak A. Pearlmutter Wed, 21 Jan 2004 08:09:04 -0700 djvulibre (3.5.12-2) unstable; urgency=low * update any2djvu.sh to work with new CGI script; add option processing -- Barak A. Pearlmutter Mon, 19 Jan 2004 17:04:53 -0700 djvulibre (3.5.12-1) unstable; urgency=low * New upstream version * Fix mozilla-firebird plugin symlink typo (closes: #217744) * Remove -Wl,-rpath,${libdir} from Makefiles.in instead of post-processing chrpath --delete bin/*, for political correctness (closes: #221780) -- Barak A. Pearlmutter Thu, 20 Nov 2003 08:14:59 -0700 djvulibre (3.5.11.2003.06.04-6) unstable; urgency=low * rev deb policy * add enhances: field, fiddle with recommends: field * fix secondary build dependency (closes: #206130) * make chrpath optional to avoid autobuild problem on the hurd -- Barak A. Pearlmutter Mon, 25 Aug 2003 20:10:22 +0100 djvulibre (3.5.11.2003.06.04-5) unstable; urgency=low * work around more ANSI C++ asymmetric horror -- Barak A. Pearlmutter Fri, 11 Jul 2003 20:40:50 +0100 djvulibre (3.5.11.2003.06.04-4) unstable; urgency=low * work around enforcement of C++ horribleness by GCC 3.3.1 (closes #199766) -- Barak A. Pearlmutter Tue, 8 Jul 2003 07:57:23 -0600 djvulibre (3.5.11.2003.06.04-3) unstable; urgency=low * handle mozilla-firebird (closes: 197054) thanks Emil Soleyman-Zomalan -- Barak A. Pearlmutter Wed, 2 Jul 2003 21:08:14 +0100 djvulibre (3.5.11.2003.06.04-2) unstable; urgency=low * solve 64-bit compilation issue in the worst possible way (closes: #196720) -- Barak A. Pearlmutter Tue, 10 Jun 2003 22:51:21 +0100 djvulibre (3.5.11.2003.06.04-1) unstable; urgency=low * CVS snapshot, fixes GCC 3.3 issues (closes: #195341) -- Barak A. Pearlmutter Tue, 3 Jun 2003 19:39:56 -0600 djvulibre (3.5.11-1) unstable; urgency=low * New upstream version * upstream fixes djview menu in UTF-8 encoded directories (closes: #186167) * UTF8-endectomy for bin2cpp failure under GCC 3.2/3.3 (closes: #193507) * djview libs need GCC 3.2/3.3 recompile (closes: #193233) -- Barak A. Pearlmutter Thu, 29 May 2003 23:46:08 +0100 djvulibre (3.5.10-5) unstable; urgency=low * modify compiler options in package config scripts -- Barak A. Pearlmutter Sun, 9 Mar 2003 18:38:34 +0000 djvulibre (3.5.10-4) unstable; urgency=low * hotwire compilation options for GCC 3.2 in debian/rules (closes: #183561) DONT FORGET: remove when gcc bug is fixed. Un-hotwired default is "-O3 -funroll-loops", tested behavior of i386 gcc version 3.2.3 20030228 (Debian prerelease): flags djview lizard2002.djvu -O3 -funroll-loops FAILS -O2 -funroll-loops FAILS -O1 -funroll-loops works -funroll-loops works -O3 works -- Barak A. Pearlmutter Sun, 9 Mar 2003 02:04:19 +0000 djvulibre (3.5.10-3) unstable; urgency=low * simplify qt version check !hic! -- Barak A. Pearlmutter Thu, 6 Mar 2003 00:19:49 +0000 djvulibre (3.5.10-2.1) unstable; urgency=low * remove workaround for old chrpath bug * trick for -lqt vs -lqt-mt !blech! (closes: #181588) -- Barak A. Pearlmutter Wed, 19 Feb 2003 12:16:56 -0700 djvulibre (3.5.10-2) unstable; urgency=low * use either /usr/include/qt3 or /usr/include/qt as available (closes: #181351) -- Barak A. Pearlmutter Mon, 17 Feb 2003 19:48:29 +0000 djvulibre (3.5.10-1) unstable; urgency=low * new upstream version * (closes: #180598) see below * upstream fixed menu key (closes: #173483) -- Barak Pearlmutter Wed, 12 Feb 2003 06:55:04 -0700 djvulibre (3.5.9-5) unstable; urgency=low * build-depend libqt3c102-mt for simplicity (closes: #180598) * stop generating unnecessary binary package libdjvulibre1-dev -- Barak Pearlmutter Wed, 12 Feb 2003 03:47:04 -0700 djvulibre (3.5.9-4) unstable; urgency=low * capitalize descriptions (closes: #164709) * add script any2djvu * mime entry remains (closes: #172465) * just a compiler bug maybe maybe I hope (closes: #159590) -- Barak Pearlmutter Mon, 3 Feb 2003 17:04:54 -0700 djvulibre (3.5.9-3) unstable; urgency=low * set up mime entry for djview * break out djvuserve cgi script into its own package * capitalize one-line descriptions (closes: #164709) -- Barak Pearlmutter Sun, 13 Oct 2002 12:51:01 -0600 djvulibre (3.5.9-2) unstable; urgency=low * Flush debian mods. Leave Makefile.in -rpath, use chrpath --delete. * Break out djview binary into separate package. -- Barak Pearlmutter Tue, 8 Oct 2002 12:34:03 -0600 djvulibre (3.5.9-1) unstable; urgency=low * New upstream release, fixes ddjvu (closes: #163081) and MMX with GCC 3.2 -- Barak Pearlmutter Tue, 8 Oct 2002 09:54:30 -0600 djvulibre (3.5.8-1) unstable; urgency=low * New upstream release (fixes for: print b&w docs, menu problem, gcc-3.1) -- Barak Pearlmutter Tue, 17 Sep 2002 12:12:10 -0600 djvulibre (3.5.7-2) unstable; urgency=low * bin package to section graphics and plugin to section web -- Barak Pearlmutter Mon, 29 Jul 2002 16:04:00 -0600 djvulibre (3.5.7-1) unstable; urgency=low * New upstream release, with copyright fix. (closes: #94442) -- Barak Pearlmutter Mon, 22 Jul 2002 16:55:55 -0600 djvulibre (3.5.5-1) unstable; urgency=low * Initial Release. (closes: #94442) -- Barak Pearlmutter Wed, 29 May 2002 15:43:15 -0600 debian/copyright0000664000000000000000000001530412265475773011150 0ustar This package was debianized by Barak Pearlmutter on Wed, 29 May 2002 15:43:15 -0600. It was downloaded from http://djvu.sourceforge.net/ git://djvu.git.sourceforge.net/gitroot/djvu/djvulibre.git Upstream Authors: DjVuLibre Credits, from http://djvu.sourceforge.net/credits.html Concept: Yann LeCun, Leon Bottou. Compression Science: Leon Bottou, Paul Howard, Yann LeCun, Yoshua Bengio, Patrick Haffner, Pascal Vincent, Steven Pigeon. Software Architecture: Leon Bottou, Bill C Riemers, Yann LeCun, Joseph M Orost. Codec Libraries, File Format Design: Leon Bottou, Patrick Haffner, Andrew Erofeev, Bill C Riemers, Pascal Vincent, Yann LeCun. Plugins, Viewers: Leon Bottou, Andrew Erofeev, Ming Chen, Bill C Riemers, Liang Chen, Praveen Guduru. Command Line Programs: Leon Bottou, Bill C Riemers, Mike Houser. Internationalization Fred Crary, Bill C Riemers. Website Development: Jeffery Triggs, Yann LeCun It gives me particular pleasure to thank Leon Bottou and Yann LeCun for their heroic yet successful efforts to get LizardTech to handle the patent situation in a way that addresses the concerns of the free software community regarding the distribution and use of djvulibre. The script tools/any2djvu.sh was downloaded from URL: http://www.inference.phy.cam.ac.uk/mackay/any2djvu.sh Author: David Kreil Released (via statement in email) under the GNU GPL v2. Copyright: This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 dated June, 1991. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian GNU/Linux systems, the complete text of the GNU General Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'. As of upstream VERSION 3.5.19, the "GPL v2" has been broadened to "GPL v2 or any later version". The following appears in the file COPYRIGHT at the top level of the upstream source code. DjVuLibre-3.5 Copyright (c) 2002 Leon Bottou and Yann Le Cun. Copyright (c) 2001 AT&T This software is subject to, and may be distributed under, the GNU General Public License, either Version 2 of the license, or (at your option) any later version. The license should have accompanied the software or you may obtain a copy of the license from the Free Software Foundation at http://www.fsf.org . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from Lizardtech Software. Lizardtech Software has authorized us to replace the original DjVu(r) Reference Library notice by the following text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu): ------------------------------------------------------------------ | DjVu (r) Reference Library (v. 3.5) | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved. | The DjVu Reference Library is protected by U.S. Pat. No. | 6,058,214 and patents pending. | | This software is subject to, and may be distributed under, the | GNU General Public License, either Version 2 of the license, | or (at your option) any later version. The license should have | accompanied the software or you may obtain a copy of the license | from the Free Software Foundation at http://www.fsf.org . | | The computer code originally released by LizardTech under this | license and unmodified by other parties is deemed "the LIZARDTECH | ORIGINAL CODE." Subject to any third party intellectual property | claims, LizardTech grants recipient a worldwide, royalty-free, | non-exclusive license to make, use, sell, or otherwise dispose of | the LIZARDTECH ORIGINAL CODE or of programs derived from the | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU | General Public License. This grant only confers the right to | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to | the extent such infringement is reasonably necessary to enable | recipient to make, have made, practice, sell, or otherwise dispose | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to | any greater extent that may be necessary to utilize further | modifications or combinations. | | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. +------------------------------------------------------------------ The file tools/tiff2pdf.c is derived from the program tiff2pdf which comes with the following notice: | Copyright (c) 2003 Ross Finlayson | | Permission to use, copy, modify, distribute, and sell this software and | its documentation for any purpose is hereby granted without fee, provided | that (i) the above copyright notices and this permission notice appear in | all copies of the software and related documentation, and (ii) the name of | Ross Finlayson may not be used in any advertising or | publicity relating to the software without the specific, prior written | permission of Ross Finlayson. | | THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, | EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY | WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. | | IN NO EVENT SHALL ROSS FINLAYSON BE LIABLE FOR | ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, | OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, | WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF | LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE | OF THIS SOFTWARE. The files doc/djvu{2,3}spec.djvu are documentation for the DjVu format. The original LaTeX sources for these documents has been lost. It would be great if someone were to recreate it, rendering the documents more tractibly modified and reformatted. The files doc/lizard200{2,7}.{djvu,pdf} are legal documents related to the freedom of this package itself, and hence need not themselves be covered by a free license. debian/djvuserve.install0000664000000000000000000000011312265475773012612 0ustar usr/bin/djvuserve usr/lib/cgi-bin/djvuserve usr/share/man/man*/djvuserve.* debian/djvulibre-bin.docs0000664000000000000000000000000712265475773012615 0ustar README debian/compat0000664000000000000000000000000212265475773010410 0ustar 9 debian/README.Debian0000664000000000000000000000136012265475773011253 0ustar djvulibre for Debian -------------------- Packaged with the cooperation of the upstream authors Yann LeCun and Leon Bottou. WARNING: OTHERS MAY BE ABLE TO ACCESS FILES PROCESSED BY ANY2DJVU. The any2djvu program uploads files to a server for conversion, compression, and OCR. Others (aside from the uploader) can theoretically access the compressed files. This has been known to happen. If someone else wants to take over this package I'm willing (eager) to give it up. Just ask. (In fact, that goes for all my packages!) If someone does take it over, I'm happy to serve as an interface to the upstream authors as I am in contact with them professionally anyway. -- Barak A. Pearlmutter , Sat, 12 Feb 2011 13:23:34 +0000 debian/clean0000664000000000000000000000011612163055346010200 0ustar xmltools/.libs/djvutoxml xmltools/.libs/djvuxmlparser gui/djview/.libs/djview debian/djvulibre-desktop.install0000664000000000000000000000006612163055346014224 0ustar usr/share/mimelnk usr/share/icons/hicolor/*/mimetypes debian/rules0000775000000000000000000000525712265475773010303 0ustar #!/usr/bin/make -f %: dh $@ --with autoreconf --parallel # extract library major version from source build system libver0 := $(shell egrep '^LIBDJVU_VER_COMPAT=[0-9]+$$' configure.ac \ | head -1 \ | sed 's/LIBDJVU_VER_COMPAT=//') # extract library major version expected by debian packaging libver := $(shell egrep '^Package: libdjvulibre[0-9]+$$' debian/control \ | head -1 \ | sed 's/Package: libdjvulibre//') ifneq ($(libver0),$(libver)) error inconsistent debian/control library major version endif export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) testlibver: @echo library major version: upstream $(libver0), debian $(libver) $(libver1) $(libver2) configure_options += --disable-desktopfiles configure_options += --enable-static configure_options += --enable-shared ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) configure_options += --enable-debug else ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) # consider modifying the autoconf scripts to accept a --disable-optimization flag configure_options += --enable-debug endif # Always keep dubugging symbols configure_options += CXXFLAGS=-g override_dh_auto_configure: dh_auto_configure -- $(configure_options) override_dh_auto_install: dh_auto_install mkdir --parents debian/tmp/usr/lib/cgi-bin cp --preserve=mode,timestamps debian/djvuserve.sh \ debian/tmp/usr/lib/cgi-bin/djvuserve @echo "install djvu icon and mime types" for n in 22 32 48 64 ; do \ d="debian/tmp/usr/share/icons/hicolor/$${n}x$${n}/mimetypes"; \ mkdir --parents $${d}; \ install --mode=644 desktopfiles/hi$${n}-djvu.png \ $${d}/image-vnd.djvu.png; \ ln -sf image-vnd.djvu.png \ $${d}/djvu.png; \ done mkdir --parents debian/tmp/usr/share/icons/hicolor/scalable/mimetypes install --mode=644 desktopfiles/hi-djvu.svgz \ debian/tmp/usr/share/icons/hicolor/scalable/mimetypes/image-vnd.djvu.svgz ln -sf image-vnd.djvu.svgz \ debian/tmp/usr/share/icons/hicolor/scalable/mimetypes/djvu.svgz mkdir --parents debian/tmp/usr/share/mimelnk/image install --mode=644 desktopfiles/vnd.djvu.desktop \ debian/tmp/usr/share/mimelnk/image/ override_dh_install: dh_install @echo remove from djvulibre-bin, already in djvuserve find debian/djvulibre-bin -name djvuserve\* -print -delete # @echo "remove from djvulibre-bin, not in Debian: needs gsdjvu, direct complaints to AT&T" # find debian/djvulibre-bin -name djvudigital\* -print -delete override_dh_installchangelogs: dh_installchangelogs --keep NEWS override_dh_compress: dh_compress --exclude=.djvu override_dh_strip: dh_strip --dbg-package=djvulibre-dbg override_dh_makeshlibs: dh_makeshlibs --version-info --exclude=/plugins .PHONY: testlibver debian/watch0000664000000000000000000000011112163055346010217 0ustar version=3 http://sf.net/djvu/djvulibre-([0-9]+\.[0-9]+\.[0-9]+)\.tar\.gz