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

[Ronald van Haren]

    Date: Thursday, May 7, 2009 @ 05:15:13
  Author: ronald
Revision: 38422

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

........
  r38407 | ronald | 2009-05-07 10:46:01 +0200 (Thu, 07 May 2009) | 1 line
  
  upgpkg: scribus 1.3.3.13-1
........

Modified:
  scribus/repos/extra-i686/	(properties)
  scribus/repos/extra-i686/PKGBUILD
  scribus/repos/extra-i686/scribus.install

-----------------+
 PKGBUILD        |   24 ++++++++++++------------
 scribus.install |    5 -----
 2 files changed, 12 insertions(+), 17 deletions(-)


Property changes on: scribus/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /scribus/trunk:1-20692
   + /scribus/trunk:1-38421
Deleted: svn:mergeinfo
   - 

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-05-07 09:12:43 UTC (rev 38421)
+++ extra-i686/PKGBUILD	2009-05-07 09:15:13 UTC (rev 38422)
@@ -1,34 +1,34 @@
 # $Id$
-# Maintainer: tobias <tobias at archlinux.org>
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
 # Contributor: Ben <ben at benmazer.net>
 
 pkgname=scribus
-pkgver=1.3.3.12
-pkgrel=4
+pkgver=1.3.3.13
+pkgrel=1
 pkgdesc="A desktop publishing program"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.scribus.net"
 install=${pkgname}.install
-depends=('libcups>=1.2.10' 'lcms>=1.16' 'qt3>=3.3.8' 'ghostscript>=8.15.4' \
-         'libart-lgpl>=2.3.19' 'python>=2.5' 'libxml2>=2.6.27' 'cairo' \
+depends=('libcups>=1.3.10' 'lcms>=1.18' 'qt3>=3.3.8' 'ghostscript>=8.64' \
+         'libart-lgpl>=2.3.20' 'python>=2.6.1' 'libxml2>=2.7.3' 'cairo' \
          'desktop-file-utils')
 makedepends=('cmake')
-options=(!libtool force !makeflags)
-replaces=('scribus-devel')
+options=(!libtool !makeflags)
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('48f6d762809ad714b366d8d4fc82d5c3')
+md5sums=('e698b0d118c7f037e57163cba302d96e')
 
 build() {
   # Source the QT profile
   source /etc/profile.d/qt3.sh
 
-  cd ${startdir}/src/scribus-${pkgver}
+  cd ${srcdir}/scribus-${pkgver}
   cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr \
    -DWANT_CAIRO=1 -DLIB_SUFFIX=""
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=${pkgdir} install
 
   install -Dm644 vnd.scribus.desktop \
-    ${startdir}/pkg/usr/share/applications/scribus.desktop
+    ${pkgdir}/usr/share/applications/scribus.desktop
 }

Modified: extra-i686/scribus.install
===================================================================
--- extra-i686/scribus.install	2009-05-07 09:12:43 UTC (rev 38421)
+++ extra-i686/scribus.install	2009-05-07 09:15:13 UTC (rev 38422)
@@ -1,4 +1,3 @@
-# this is the scrollkeeper handling sample file
 
 post_install() {
   echo "update desktop mime database..."
@@ -9,10 +8,6 @@
   post_install $1
 }
 
-pre_remove() {
-  /bin/true
-}
-
 post_remove() {
   echo "update desktop mime database..."
   update-desktop-database -q