[arch-commits] Commit in autopano-sift/repos (4 files)

Sun Aug 16 15:06:11 UTC 2009

Date: Sunday, August 16, 2009 @ 11:06:11
  Author: jgc
Revision: 49807

Merged revisions 356,49806 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/autopano-sift/trunk

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sat, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r49806 | jgc | 2009-08-16 17:05:31 +0200 (Sun, 16 Aug 2009) | 2 lines
  
  upgpkg: autopano-sift 2.4-4
      Restyle PKGBUILD completely. Rebuild to get rid of .FILELIST, fix manpath
........

Added:
  autopano-sift/repos/extra-x86_64/autopanog
    (from rev 49806, autopano-sift/trunk/autopanog)
Modified:
  autopano-sift/repos/extra-x86_64/	(properties)
  autopano-sift/repos/extra-x86_64/PKGBUILD
  autopano-sift/repos/extra-x86_64/autopano-sift.desktop

-----------------------+
 PKGBUILD              |   88 ++++++++++++++++++++----------------------------
 autopano-sift.desktop |    5 +-
 autopanog             |    3 +
 3 files changed, 42 insertions(+), 54 deletions(-)


Property changes on: autopano-sift/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /autopano-sift/trunk:1
   + /autopano-sift/trunk:1-49806

Modified: extra-x86_64/PKGBUILD
===================================================================

--- extra-x86_64/PKGBUILD	2009-08-16 15:05:31 UTC (rev 49806)
+++ extra-x86_64/PKGBUILD	2009-08-16 15:06:11 UTC (rev 49807)
@@ -1,68 +1,54 @@
 # $Id$
 # Maintainer: tobias <tobias at archlinux.org>
-# Contributor: Tobias Kieslich <tobias at justdreams.de>
 
 pkgname=autopano-sift
 pkgver=2.4
-pkgrel=3
+pkgrel=4
 pkgdesc="a C# based detector for picture matching"
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
 depends=('mono>=1.0' 'gtk-sharp')
-source=(http://user.cs.tu-berlin.de/~nowozin/$pkgname/$pkgname-$pkgver.tar.gz \
-       $pkgname.desktop)
-md5sums=('e497074d0cb5586cdc66506d782ccbd7' '05fe02f9acdc484351aa8b9ab8153825')
+options=(!makeflags)
+source=(http://user.cs.tu-berlin.de/~nowozin/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        autopano-sift.desktop
+        autopanog)
+md5sums=('e497074d0cb5586cdc66506d782ccbd7'
+         '7fb1da98031d7421a13ea713d914c89e'
+         '3883892a0fa32f54d1aefc46e46657ed')
 
 build() {
- export MAKEFLAGS="-j1"
- # get rid of that .wapi errors; thanks to brice
-  mkdir -p $startdir/pkg/weird
-  export MONO_SHARED_DIR=$startdir/pkg/weird
- # build
-  cd $startdir/src/$pkgname-$pkgver/src
+  export MONO_SHARED_DIR="${srcdir}/.wapi"
+  mkdir -p "${MONO_SHARED_DIR}"
+
+  cd "${srcdir}/${pkgname}-${pkgver}/src"
   make clean all || return 1
 
-  # manual install
-  for library in *.dll; do
-    install -Dm644 $library $startdir/pkg/usr/lib/autopano-sift/$library
-  done
-  cd util
-  for binary in *.exe; do
-    install -Dm644 $binary $startdir/pkg/usr/lib/autopano-sift/$binary
-  done
-  install -m644 autopanog/autopanog.exe \
-    $startdir/pkg/usr/lib/autopano-sift/
-  cd ..
-   # install the shellscripts
-   # sed the pathes
+  install -m755 -d "${pkgdir}/usr/lib/autopano-sift"
+  install -m755 -d "${pkgdir}/usr/bin"
+  install -m755 -d "${pkgdir}/usr/share/man/man1"
+  install -m755 -d "${pkgdir}/usr/share/man/man7"
+  install -m755 -d "${pkgdir}/usr/share/pixmaps"
+  install -m755 -d "${pkgdir}/usr/share/applications"
+
+  install -m644 *.dll util/*.exe util/autopanog/autopanog.exe \
+      "${pkgdir}/usr/lib/autopano-sift/" || return 1
+
   sed -i 's|^mono|/usr/bin/mono|' util/monoopt.sh
-  install -Dm755 util/monoopt.sh $startdir/pkg/usr/bin/monoopt.sh
-  for script in bin/*.sh; do
-    sed -i 's|^MONO.*$|MONO=/usr/bin/monoopt.sh|' $script
-    sed -i 's|^AUTOPANO_PATH.*$|AUTOPANO_PATH=/usr/lib/autopano-sift|' $script
-    install -m755 $script $startdir/pkg/usr/bin/
-  done
+  install -m755 util/monoopt.sh "${pkgdir}/usr/bin/" || return 1
+  sed -e 's|^MONO.*$|MONO=/usr/bin/monoopt.sh|' \
+      -e 's|^AUTOPANO_PATH.*$|AUTOPANO_PATH=/usr/lib/autopano-sift|' \
+      -i bin/*.sh || return 1
+  install -m755 bin/*.sh "${pkgdir}/usr/bin/" || return 1
 
-  cat >> $startdir/pkg/usr/bin/autopanog << 'END_OF_GUISTARTSCRIPT'
-#!/bin/sh
-MONO=`dirname $0`/monoopt.sh
-$MONO /usr/lib/autopano-sift/autopanog.exe $*
-END_OF_GUISTARTSCRIPT
-  chmod 755 $startdir/pkg/usr/bin/autopanog
- ###############################################################################
- # install additional things (manpages, desktop stuff)
-  cd $startdir/src/$pkgname-$pkgver/doc
-  for manpage in `/bin/ls *.1`; do
-    gzip -c -9 $manpage > $manpage.gz
-    install -Dm644 $manpage.gz $startdir/pkg/usr/man/man1/$manpage.gz
-  done
-  gzip  -c -9 autopano-sift.7 > autopano-sift.7.gz
-  install -Dm644 $manpage.gz $startdir/pkg/usr/man/man7/autopano-sift.7.gz
-  cd ..
-  install -Dm644 src/util/autopanog/image-bottom-right.png $startdir/pkg/usr/share/pixmaps/autopano-sift.png
-  install -Dm644 ../$pkgname.desktop $startdir/pkg/usr/share/applications/$pkgname.desktop
- # housecleaning
-  rm -rf $startdir/pkg/weird
+  install -m755 "${srcdir}/autopanog" "${pkgdir}/usr/bin/" || return 1
+
+  install -m644 util/man/*.1 "${pkgdir}/usr/share/man/man1/" || return 1
+  install -m644 util/man/*.7 "${pkgdir}/usr/share/man/man7/" || return 1
+
+  install -m644 util/autopanog/image-bottom-right.png "${pkgdir}/usr/share/pixmaps/autopano-sift.png" || return 1
+
+  install "${srcdir}/autopano-sift.desktop" "${pkgdir}/usr/share/applications/" || return 1
+
+  rm -r "${MONO_SHARED_DIR}"
 }
-# vim: ft=sh ts=2 et

Modified: extra-x86_64/autopano-sift.desktop
===================================================================
--- extra-x86_64/autopano-sift.desktop	2009-08-16 15:05:31 UTC (rev 49806)
+++ extra-x86_64/autopano-sift.desktop	2009-08-16 15:06:11 UTC (rev 49807)
@@ -1,13 +1,12 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Name=autopanog
 GenericName=Sticher Application
 Comment=Picture comparison tools to find matching areas
 Exec=autopanog
 TryExec=mono
-Icon=autopano-sift.png
+Icon=autopano-sift
 StartupNotify=true
 Terminal=false
 Type=Application
-Categories=Application;Graphics;2DGraphics;RasterGraphics;
+Categories=Graphics;2DGraphics;RasterGraphics;

Copied: autopano-sift/repos/extra-x86_64/autopanog (from rev 49806, autopano-sift/trunk/autopanog)
===================================================================
--- extra-x86_64/autopanog	                        (rev 0)
+++ extra-x86_64/autopanog	2009-08-16 15:06:11 UTC (rev 49807)
@@ -0,0 +1,3 @@
+#!/bin/sh
+MONO=`dirname $0`/monoopt.sh
+$MONO /usr/lib/autopano-sift/autopanog.exe $*


