[arch-commits] Commit in xpdf/repos (3 files)

[Jan de Groot]

    Date: Thursday, May 21, 2009 @ 06:38:59
  Author: jgc
Revision: 39738

Merged revisions 39736 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xpdf/trunk

........
  r39736 | jgc | 2009-05-21 12:35:06 +0200 (Thu, 21 May 2009) | 2 lines
  
  upgpkg: xpdf 3.02_pl3-1
      Security update
........

Modified:
  xpdf/repos/extra-i686/	(properties)
  xpdf/repos/extra-i686/PKGBUILD
  xpdf/repos/extra-i686/xpdf.desktop

--------------+
 PKGBUILD     |   10 ++++++----
 xpdf.desktop |    6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)


Property changes on: xpdf/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xpdf/trunk:1-15069
   + /xpdf/trunk:1-39737

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-05-21 10:35:22 UTC (rev 39737)
+++ extra-i686/PKGBUILD	2009-05-21 10:38:59 UTC (rev 39738)
@@ -4,10 +4,9 @@
 
 pkgname=xpdf
 _srcver=3.02
-_patchlevel=pl2
+_patchlevel=pl3
 pkgver=${_srcver}_${_patchlevel}
-#pkgver=${_srcver}
-pkgrel=2
+pkgrel=1
 pkgdesc="Xpdf is a viewer for Portable Document Format (PDF) files."
 arch=(i686 x86_64)
 license=('GPL')
@@ -19,16 +18,19 @@
 install=xpdf.install
 source=(ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}.tar.gz
         ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}pl1.patch
+        ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}pl2.patch
         ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}${_patchlevel}.patch
         xpdf.desktop)
 md5sums=('599dc4cc65a07ee868cf92a667a913d2'
 	 '877118786dfe27d1b7aa5a6759cc6e45'
          '3a5cb165ae66781e0b21e6219ae06795'
-	 '6c606eeca046cc9f32835f98f635c084')
+	 '581963ede0fb5715e1a69f01b5b8ce63'
+	 '93b9df5ebef3bc56133236ef3f176bb7')
 
 build() {
   cd "${srcdir}/${pkgname}-${_srcver}"
   patch -Np1 -i "${srcdir}/${pkgname}-${_srcver}pl1.patch" || return 1
+  patch -Np1 -i "${srcdir}/${pkgname}-${_srcver}pl2.patch" || return 1
   patch -Np1 -i "${srcdir}/${pkgname}-${_srcver}${_patchlevel}.patch" || return 1
   sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc || return 1
   ./configure                                                  \

Modified: extra-i686/xpdf.desktop
===================================================================
--- extra-i686/xpdf.desktop	2009-05-21 10:35:22 UTC (rev 39737)
+++ extra-i686/xpdf.desktop	2009-05-21 10:38:59 UTC (rev 39738)
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=xpdf
+Name=Xpdf
 Comment=Views Adobe PDF (acrobat) files
 Exec=xpdf
-Terminal=0
+Terminal=false
 Type=Application
 Icon=xpdf
-Categories=Application;Office;
+Categories=Office;
 MimeType=application/pdf;