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

[Jan de Groot]

    Date: Friday, November 7, 2008 @ 18:46:15
  Author: jgc
Revision: 18595

Resolve SVN conflict

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

-------------------+
 PKGBUILD          |   34 +++++++++++++++++++---------------
 djvulibre.install |   15 +++++----------
 2 files changed, 24 insertions(+), 25 deletions(-)


Property changes on: djvulibre/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /djvulibre/trunk:1
   + /djvulibre/trunk:1-18592

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-07 23:45:58 UTC (rev 18594)
+++ extra-i686/PKGBUILD	2008-11-07 23:46:15 UTC (rev 18595)
@@ -1,38 +1,42 @@
 # $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: mgushee
 
 pkgname=djvulibre
-pkgver=3.5.20
-pkgrel=2
+pkgver=3.5.21
+pkgrel=1
 pkgdesc="Suite to create, manipulate and view DjVu ('déjà vu') documents"
 arch=("i686" "x86_64")
 license=('GPL')
 url="http://djvu.sourceforge.net/"
-depends=('libtiff' 'hicolor-icon-theme' 'qt3' 'desktop-file-utils' 'libdjvu' 'shared-mime-info')
+depends=('libtiff' 'hicolor-icon-theme' 'qt3' 'desktop-file-utils' "libdjvu>=${pkgver}" 'shared-mime-info')
 makedepends=('pkgconfig')
+options=(!makeflags)
 install=djvulibre.install
 source=(http://downloads.sourceforge.net/djvu/${pkgname}-${pkgver}.tar.gz) 
+md5sums=('4c6f3eb03ffbd067b6d2fe2344b0d9ad')
 
-
 build() {
-  export MAKEFLAGS="-j1"
   [ -z "${QTDIR}" ] && . /etc/profile.d/qt3.sh
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
   make LIBDJVU="`pkg-config --libs ddjvuapi`" SUBDIRS_FIRST=tools || return 1
   make LIBDJVU="`pkg-config --libs ddjvuapi`" SUBDIRS_FIRST=tools \
-       DESTDIR=${startdir}/pkg plugindir=/usr/lib/mozilla/plugins \
+       DESTDIR="${pkgdir}" plugindir=/usr/lib/mozilla/plugins \
        install-utils install-gui install-i18n || return 1
 
   #Install icons, launcher files, mime-types.
-  install -D -m644 desktopfiles/hi22-djvu.png ${startdir}/pkg/usr/share/icons/22x22/mimetypes/image-vnd.djvu.mime.png
-  install -D -m644 desktopfiles/hi32-djvu.png ${startdir}/pkg/usr/share/icons/32x32/mimetypes/image-vnd.djvu.mime.png
-  install -D -m644 desktopfiles/hi48-djvu.png ${startdir}/pkg/usr/share/icons/48x48/mimetypes/image-vnd.djvu.mime.png
+  install -m755 -d ${pkgdir}/usr/share/icons/hicolor/{22x22,32x32,48x48}/mimetypes
+  install -m755 -d ${pkgdir}/usr/share/icons/hicolor/32x32/apps
+  install -m755 -d ${pkgdir}/usr/share/mime/packages/
+  install -m755 -d ${pkgdir}/usr/share/applications
 
-  install -D -m644 desktopfiles/djvulibre-mime.xml ${startdir}/pkg/usr/share/mime/packages/djvulibre-mime.xml
+  install -m644 desktopfiles/hi22-djvu.png "${pkgdir}/usr/share/icons/hicolor/22x22/mimetypes/image-vnd.djvu.mime.png" || return 1
+  install -m644 desktopfiles/hi32-djvu.png "${pkgdir}/usr/share/icons/hicolor/32x32/mimetypes/image-vnd.djvu.mime.png" || return 1
+  install -m644 desktopfiles/hi48-djvu.png "${pkgdir}/usr/share/icons/hicolor/48x48/mimetypes/image-vnd.djvu.mime.png" || return 1
 
-  install -D -m644 desktopfiles/hi32-djview3.png ${startdir}/pkg/usr/share/icons/hicolor/32x32/apps/djvulibre-djview3.png
-  install -D -m644 desktopfiles/djvulibre-djview3.desktop ${startdir}/pkg/usr/share/applications/djvulibre-djview3.desktop
+  install -m644 desktopfiles/djvulibre-mime.xml "${pkgdir}/usr/share/mime/packages/" || return 1
+
+  install -m644 desktopfiles/hi32-djview3.png "${pkgdir}/usr/share/icons/hicolor/32x32/apps/djvulibre-djview3.png" || return 1
+  install -m644 desktopfiles/djvulibre-djview3.desktop "${pkgdir}/usr/share/applications/" || return 1
 }
-md5sums=('c94091de014b3aaf037d3d0f398d36c2')

Modified: extra-i686/djvulibre.install
===================================================================
--- extra-i686/djvulibre.install	2008-11-07 23:45:58 UTC (rev 18594)
+++ extra-i686/djvulibre.install	2008-11-07 23:46:15 UTC (rev 18595)
@@ -1,20 +1,15 @@
 post_install() {
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then  
-    gtk-update-icon-cache -q -f /usr/share/icons/hicolor
+  if [ -x usr/bin/gtk-update-icon-cache ]; then  
+    gtk-update-icon-cache -q -f usr/share/icons/hicolor
   fi
   update-desktop-database -q
-  update-mime-database usr/share/mime
+  update-mime-database usr/share/mime > /dev/null
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  post_install $1
+  post_install
 }
-
-op=$1
-shift
-
-$op $*