diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-28 17:20:00 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-28 17:20:00 -0300 |
commit | 6575af67294a57126aa9408ee255db0e7be47bcd (patch) | |
tree | 0ebeb47514aec8981445ad7404d961ade8a41dc7 /extra/xpdf | |
parent | 15715eb69d409c77752f91aa6d8080ecc0262af6 (diff) | |
parent | edec45419def1b81bd663a2859684ef55ba56269 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/collectd/PKGBUILD
community-testing/collectd/install
community-testing/collectd/libperl.patch
community-testing/collectd/rc.d
community-testing/collectd/rtnl_dump_filter.patch
community-testing/freeradius/PKGBUILD
community-testing/freeradius/freeradius.install
community-testing/freeradius/krb5-build-fix.patch
community-testing/freeradius/radiusd
community-testing/inn/PKGBUILD
community-testing/inn/inn.install
community-testing/inn/innd.conf
community-testing/inn/innd.rc
community-testing/inn/nnrpd.conf
community-testing/inn/nnrpd.rc
community-testing/inn/site.make.patch
community-testing/libvirt/PKGBUILD
community-testing/linux-tools/PKGBUILD
community-testing/linux-tools/cpupower.conf
community-testing/linux-tools/cpupower.rc
community-testing/linux-tools/cpupower.service
community-testing/perl-berkeleydb/PKGBUILD
community-testing/perl-class-methodmaker/PKGBUILD
community-testing/perl-clone/PKGBUILD
community-testing/perl-crypt-blowfish/PKGBUILD
community-testing/perl-crypt-des/PKGBUILD
community-testing/perl-curses/PKGBUILD
community-testing/perl-data-structure-util/PKGBUILD
community-testing/perl-datetime/PKGBUILD
community-testing/perl-device-serialport/PKGBUILD
community-testing/perl-file-rsyncp/PKGBUILD
community-testing/perl-fuse/PKGBUILD
community-testing/perl-gd/PKGBUILD
community-testing/perl-gssapi/PKGBUILD
community-testing/perl-html-strip/PKGBUILD
community-testing/perl-inline-java/PKGBUILD
community-testing/perl-io-dirent/PKGBUILD
community-testing/perl-io-tty/PKGBUILD
community-testing/perl-json-xs/PKGBUILD
community-testing/perl-libapreq2/PKGBUILD
community-testing/perl-mail-box-parser-c/PKGBUILD
community-testing/perl-mail-transport-dbx/PKGBUILD
community-testing/perl-net-dbus/PKGBUILD
community-testing/perl-net-libidn/PKGBUILD
community-testing/perl-params-classify/PKGBUILD
community-testing/perl-params-validate/PKGBUILD
community-testing/perl-string-crc32/PKGBUILD
community-testing/perl-text-charwidth/PKGBUILD
community-testing/perl-text-kakasi/ChangeLog
community-testing/perl-text-kakasi/PKGBUILD
community-testing/perl-tie-hash-indexed/PKGBUILD
community-testing/perl-www-curl/PKGBUILD
community-testing/perl-xmms/PKGBUILD
community-testing/pork/PKGBUILD
community-testing/rxvt-unicode/PKGBUILD
community-testing/rxvt-unicode/urxvt-tabbed.desktop
community-testing/rxvt-unicode/urxvt.desktop
community-testing/rxvt-unicode/urxvtc.desktop
community-testing/znc/PKGBUILD
community/blackbox/PKGBUILD
community/ccrtp/PKGBUILD
community/gambas2/poppler-0.20.patch
community/gambas3/poppler-0-20.patch
community/libunistring/PKGBUILD
community/libzrtpcpp/PKGBUILD
community/mplayer2/PKGBUILD
community/pdf2djvu/poppler-0.20.patch
community/sword/PKGBUILD
community/xiphos/PKGBUILD
core/procps/PKGBUILD
extra/dvdrip/PKGBUILD
extra/gstreamer0.10-good/PKGBUILD
extra/inkscape/poppler20.patch
extra/iperf/PKGBUILD
extra/libreoffice/PKGBUILD
extra/libreoffice/fix_broken_hebrew_wordwrapping.diff
extra/libreoffice/libreoffice-base.install
extra/libreoffice/libreoffice-calc.install
extra/libreoffice/libreoffice-common.install
extra/libreoffice/libreoffice-draw.install
extra/libreoffice/libreoffice-impress.install
extra/libreoffice/libreoffice-writer.install
extra/mail-notification/PKGBUILD
extra/nxserver/PKGBUILD
extra/php-suhosin/PKGBUILD
extra/poppler/PKGBUILD
extra/streamtuner/PKGBUILD
extra/systemd/PKGBUILD
extra/tunepimp/PKGBUILD
mozilla-testing/iceweasel-libre/iceweasel.install
multilib/wine/PKGBUILD
staging/gimp-devel/gimp-devel.install
testing/consolekit/PKGBUILD
testing/cryptsetup/PKGBUILD
testing/cryptsetup/encrypt_hook
testing/cryptsetup/encrypt_install
testing/dmraid/PKGBUILD
testing/dmraid/dmraid_install
testing/graphviz/PKGBUILD
testing/imagemagick/PKGBUILD
testing/imagemagick/perlmagick.rpath.patch
testing/irssi/PKGBUILD
testing/kdebindings-perlkde/PKGBUILD
testing/kdebindings-perlqt/PKGBUILD
testing/lvm2/PKGBUILD
testing/lvm2/lvm2_hook
testing/lvm2/lvm2_install
testing/mdadm/PKGBUILD
testing/mdadm/mdadm_install
testing/mdadm/mdadm_udev_install
testing/mkinitcpio-nfs-utils/PKGBUILD
testing/net-snmp/snmpd.rc
testing/perl-bit-vector/PKGBUILD
testing/perl-compress-bzip2/PKGBUILD
testing/perl-crypt-openssl-bignum/PKGBUILD
testing/perl-crypt-openssl-random/PKGBUILD
testing/perl-crypt-openssl-rsa/PKGBUILD
testing/perl-crypt-ssleay/PKGBUILD
testing/perl-dbd-mysql/PKGBUILD
testing/perl-dbi/PKGBUILD
testing/perl-fcgi/PKGBUILD
testing/perl-locale-gettext/PKGBUILD
testing/perl-locale-gettext/compatibility-with-POSIX-module.patch
testing/perl-net-ssleay/PKGBUILD
testing/perl-time-hires/PKGBUILD
testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
testing/perl/ChangeLog
testing/perl/PKGBUILD
testing/perl/digest_eval_hole.diff
testing/perl/fix-h2ph-and-tests.patch
testing/perl/perl.install
testing/perl/perlbin.csh
testing/perl/perlbin.sh
testing/perl/provides.pl
testing/php/PKGBUILD
testing/php/logrotate.d.php-fpm
testing/php/rc.d.php-fpm
testing/pidgin/pidgin.install
testing/pinentry/pinentry.install
testing/postgresql/postgresql.pam
testing/slim/logrotate
testing/subversion/PKGBUILD
testing/vim/PKGBUILD
testing/vim/archlinux.vim
testing/vim/gvim.desktop
testing/vim/gvim.install
testing/vim/vimrc
testing/weechat/PKGBUILD
testing/xf86-video-ati/PKGBUILD
testing/xf86-video-intel/PKGBUILD
testing/xf86-video-nouveau/PKGBUILD
testing/xorg-server/PKGBUILD
Diffstat (limited to 'extra/xpdf')
-rw-r--r-- | extra/xpdf/PKGBUILD | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/extra/xpdf/PKGBUILD b/extra/xpdf/PKGBUILD index d5034ea67..14030a227 100644 --- a/extra/xpdf/PKGBUILD +++ b/extra/xpdf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 135889 2011-08-20 02:28:50Z bisson $ +# $Id: PKGBUILD 159716 2012-05-26 07:54:51Z andyrtr $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: tobias <tobias@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> @@ -6,7 +6,7 @@ pkgname=xpdf #pkgver=3.03_pl1 pkgver=3.03 -pkgrel=1 +pkgrel=2 pkgdesc='Viewer for Portable Document Format (PDF) files' url='http://www.foolabs.com/xpdf/' license=('GPL2') @@ -57,10 +57,8 @@ package() { install -Dm644 ../desktop "${pkgdir}/usr/share/applications/xpdf.desktop" install -Dm644 xpdf/xpdfIcon.xpm "${pkgdir}/usr/share/pixmaps/xpdf.xpm" - # remove libs and manpages provided by poppler - # pdfdetach should go there too once it is in poppler - for tool in pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext ; do - rm "${pkgdir}/usr/bin/${tool}" - rm "${pkgdir}/usr/share/man/man1/${tool}.1" + # stuff provided by poppler + for tool in pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext; do + rm "${pkgdir}/usr/bin/${tool}" "${pkgdir}/usr/share/man/man1/${tool}.1" done } |