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

[Ionut Biru]

    Date: Tuesday, December 1, 2009 @ 19:29:27
  Author: ibiru
Revision: 60194

Merged revisions 60189 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/dcraw/trunk

........
  r60189 | giovanni | 2009-12-02 02:19:36 +0200 (Wed, 02 Dec 2009) | 2 lines
  
  upgpkg: dcraw 1.431-1
      upstream release
........

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

---------------+
 PKGBUILD      |   20 ++++++++++----------
 dcraw.install |   13 -------------
 2 files changed, 10 insertions(+), 23 deletions(-)


Property changes on: dcraw/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /dcraw/trunk:1-44481
   + /dcraw/trunk:1-60193

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-12-02 00:27:48 UTC (rev 60193)
+++ extra-i686/PKGBUILD	2009-12-02 00:29:27 UTC (rev 60194)
@@ -11,27 +11,27 @@
 # to force a new download.
 
 pkgname=dcraw
-pkgver=1.425
+pkgver=1.431
 pkgrel=1
 pkgdesc="A command line based converter for digicams raw output"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('custom')
-depends=('libjpeg>=7' 'lcms')
+depends=('lcms')
 makedepends=('gzip')
 source=(http://www.cybercom.net/~dcoffin/${pkgname}/${pkgname}.{c,1} license.txt)
 url="http://www.cybercom.net/~dcoffin/dcraw/"
 install=dcraw.install
-md5sums=('d71404427935fb70eb7f2b8c535b8d75'
+md5sums=('cd5cb6e56d5b925c59680abe24b9b03a'
          '6ba2a797c4ad698589f83171d6b36396'
          '110b4604a6dacd5537339c4082e9e12a')
 
 build() {
-  cd ${startdir}/src
+  cd "${srcdir}"
   gcc -o dcraw ${CFLAGS} dcraw.c -lm -ljpeg -llcms
-  install -D -m755  ${pkgname} ${startdir}/pkg/usr/bin/${pkgname}
- # compress and install a manpage, provided separately on authors homepage
+  install -D -m755  ${pkgname} "${pkgdir}/usr/bin/${pkgname}" || return 1
+  # compress and install a manpage, provided separately on authors homepage
   gzip -c -9 ${pkgname}.1 > ${pkgname}.1.gz
-  install -D -m644 ${pkgname}.1.gz ${startdir}/pkg/usr/share/man/man1/${pkgname}.1.gz
-  install -Dm 644 ${startdir}/src/license.txt \
-    ${startdir}/pkg/usr/share/licenses/${pkgname}/license.txt
+  install -D -m644 ${pkgname}.1.gz "${pkgdir}/usr/share/man/man1/${pkgname}.1.gz" || return 1
+  install -Dm 644 ${srcdir}/license.txt \
+    "${pkgdir}/usr/share/licenses/${pkgname}/license.txt" || return 1
 }

Modified: extra-i686/dcraw.install
===================================================================
--- extra-i686/dcraw.install	2009-12-02 00:27:48 UTC (rev 60193)
+++ extra-i686/dcraw.install	2009-12-02 00:29:27 UTC (rev 60194)
@@ -15,16 +15,3 @@
 post_upgrade() {
   post_install $1
 }
-
-pre_remove() {
-  /bin/true
-}
-
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-
-$op $*