[arch-commits] Commit in xsane/repos (12 files)

2014-01-05 Thread Tobias Powalowski
Date: Sunday, January 5, 2014 @ 20:22:33
  Author: tpowa
Revision: 203218

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  xsane/repos/extra-i686/PKGBUILD
(from rev 203217, xsane/trunk/PKGBUILD)
  xsane/repos/extra-i686/xsane-0.995-xdg-open.patch
(from rev 203217, xsane/trunk/xsane-0.995-xdg-open.patch)
  xsane/repos/extra-i686/xsane.install
(from rev 203217, xsane/trunk/xsane.install)
  xsane/repos/extra-x86_64/PKGBUILD
(from rev 203217, xsane/trunk/PKGBUILD)
  xsane/repos/extra-x86_64/xsane-0.995-xdg-open.patch
(from rev 203217, xsane/trunk/xsane-0.995-xdg-open.patch)
  xsane/repos/extra-x86_64/xsane.install
(from rev 203217, xsane/trunk/xsane.install)
Deleted:
  xsane/repos/extra-i686/PKGBUILD
  xsane/repos/extra-i686/xsane-0.995-xdg-open.patch
  xsane/repos/extra-i686/xsane.install
  xsane/repos/extra-x86_64/PKGBUILD
  xsane/repos/extra-x86_64/xsane-0.995-xdg-open.patch
  xsane/repos/extra-x86_64/xsane.install

-+
 /PKGBUILD   |  150 ++
 /xsane-0.995-xdg-open.patch |   24 
 /xsane.install  |   34 ++
 extra-i686/PKGBUILD |   75 ---
 extra-i686/xsane-0.995-xdg-open.patch   |   12 --
 extra-i686/xsane.install|   17 ---
 extra-x86_64/PKGBUILD   |   75 ---
 extra-x86_64/xsane-0.995-xdg-open.patch |   12 --
 extra-x86_64/xsane.install  |   17 ---
 9 files changed, 208 insertions(+), 208 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2014-01-05 19:22:21 UTC (rev 203217)
+++ extra-i686/PKGBUILD 2014-01-05 19:22:33 UTC (rev 203218)
@@ -1,75 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski tp...@archlinux.org
-# Contributor: Sarah Hay sarah...@mb.sympatico.ca
-
-pkgbase=xsane
-pkgname=('xsane' 'xsane-gimp')
-pkgver=0.998
-pkgrel=5
-arch=(i686 x86_64)
-url=http://www.xsane.org;
-license=('GPL2')
-makedepends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg' 'gimp')
-source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz
-   xsane-0.995-xdg-open.patch)
-md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa'
- '15541ff0ddc10acfa2059cf99d5478eb')
-
-prepare() {
-  cd $srcdir/$pkgname-$pkgver
-  # fix use xdg-open instead of netscape to launch help browser - taken 
from Fedora
-  patch -Np1 -i ${srcdir}/xsane-0.995-xdg-open.patch
-  sed -i -e 's:png_ptr-jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c
-}
-
-build() {
-  cd $srcdir/$pkgbase-$pkgver
-
-  ./configure --prefix=/usr \
---mandir=/usr/share/man \
---enable-gimp
-  make
-  mv src/xsane src/xsane-gimp
-
-  # build again with gimp enabled
-  make clean
-  ./configure --prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man 
--disable-gimp
-  make
-}
-
-package_xsane() {
-  pkgdesc=A GTK-based X11 frontend for SANE and plugin for Gimp.
-  install=$pkgname.install
-  depends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg')  
-  optdepends=('xsane-gimp: for gimp plugin support')
-  cd $srcdir/$pkgbase-$pkgver
-  make DESTDIR=$pkgdir install
-}
-
-package_xsane-gimp() {
-  pkgdesc=XSane Gimp plugin
-  depends=('xsane' 'gimp')
-  cd $srcdir/$pkgbase-$pkgver
-  install -D -m755 src/xsane-gimp ${pkgdir}/usr/bin/xsane-gimp
-
-  ## For making Gimp Plugin available 
-  mkdir -p $pkgdir/usr/lib/gimp/2.0/plug-ins
-  ln -sf /usr/bin/xsane-gimp $pkgdir/usr/lib/gimp/2.0/plug-ins/xsane
-  #cd $pkgdir/usr/lib/gimp/2.0/plug-ins/
-  #/bin/ln -s ../../../../bin/xsane-gimp xsane
-
-# 
http://cvs.fedoraproject.org/viewvc/rpms/xsane/devel/xsane.spec?revision=1.80view=markup
-# when makepkg will allow splitted pkg install file support we might change 
add a xsane-gimp.install file with the commands that are used by fedora, 
-# gentoo has something similar
-#%post gimp
-#107   if [ -x %{_sbindir}/gimp-plugin-mgr ]; then
-#108   %{_sbindir}/gimp-plugin-mgr --install xsane
-#109   fi
-#110   
-#111   %preun gimp
-#112   if [ $1 = 0 ]; then
-#113   if [ -x %{_sbindir}/gimp-plugin-mgr ]; then
-#114   %{_sbindir}/gimp-plugin-mgr --uninstall xsane
-#115   fi
-#116   fi 
-}

Copied: xsane/repos/extra-i686/PKGBUILD (from rev 203217, xsane/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-01-05 19:22:33 UTC (rev 203218)
@@ -0,0 +1,75 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+# Contributor: Sarah Hay sarah...@mb.sympatico.ca
+
+pkgbase=xsane
+pkgname=('xsane' 'xsane-gimp')
+pkgver=0.999
+pkgrel=1
+arch=(i686 x86_64)
+url=http://www.xsane.org;
+license=('GPL2')
+makedepends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg' 'gimp')
+source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz
+   xsane-0.995-xdg-open.patch)
+md5sums=('9927f21e1ab6ba96315e7f0e30746deb'
+ '15541ff0ddc10acfa2059cf99d5478eb')
+

[arch-commits] Commit in xsane/repos (12 files)

2013-05-19 Thread Tobias Powalowski
Date: Sunday, May 19, 2013 @ 10:52:55
  Author: tpowa
Revision: 185793

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  xsane/repos/extra-i686/PKGBUILD
(from rev 185792, xsane/trunk/PKGBUILD)
  xsane/repos/extra-i686/xsane-0.995-xdg-open.patch
(from rev 185792, xsane/trunk/xsane-0.995-xdg-open.patch)
  xsane/repos/extra-i686/xsane.install
(from rev 185792, xsane/trunk/xsane.install)
  xsane/repos/extra-x86_64/PKGBUILD
(from rev 185792, xsane/trunk/PKGBUILD)
  xsane/repos/extra-x86_64/xsane-0.995-xdg-open.patch
(from rev 185792, xsane/trunk/xsane-0.995-xdg-open.patch)
  xsane/repos/extra-x86_64/xsane.install
(from rev 185792, xsane/trunk/xsane.install)
Deleted:
  xsane/repos/extra-i686/PKGBUILD
  xsane/repos/extra-i686/xsane-0.995-xdg-open.patch
  xsane/repos/extra-i686/xsane.install
  xsane/repos/extra-x86_64/PKGBUILD
  xsane/repos/extra-x86_64/xsane-0.995-xdg-open.patch
  xsane/repos/extra-x86_64/xsane.install

-+
 /PKGBUILD   |  150 ++
 /xsane-0.995-xdg-open.patch |   24 
 /xsane.install  |   34 ++
 extra-i686/PKGBUILD |   70 --
 extra-i686/xsane-0.995-xdg-open.patch   |   12 --
 extra-i686/xsane.install|   17 ---
 extra-x86_64/PKGBUILD   |   70 --
 extra-x86_64/xsane-0.995-xdg-open.patch |   12 --
 extra-x86_64/xsane.install  |   17 ---
 9 files changed, 208 insertions(+), 198 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2013-05-19 08:52:40 UTC (rev 185792)
+++ extra-i686/PKGBUILD 2013-05-19 08:52:55 UTC (rev 185793)
@@ -1,70 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski tp...@archlinux.org
-# Contributor: Sarah Hay sarah...@mb.sympatico.ca
-
-pkgbase=xsane
-pkgname=('xsane' 'xsane-gimp')
-pkgver=0.998
-pkgrel=4
-arch=(i686 x86_64)
-url=http://www.xsane.org;
-license=('GPL2')
-makedepends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg' 'gimp')
-source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz
-   xsane-0.995-xdg-open.patch)
-md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa'
- '15541ff0ddc10acfa2059cf99d5478eb')
-
-build() {
-  cd $srcdir/$pkgbase-$pkgver
-  # fix use xdg-open instead of netscape to launch help browser - taken 
from Fedora
-  patch -Np1 -i ${srcdir}/xsane-0.995-xdg-open.patch
-  sed -i -e 's:png_ptr-jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c
-
-  ./configure --prefix=/usr \
---mandir=/usr/share/man \
---enable-gimp
-  make
-  mv src/xsane src/xsane-gimp
-
-  # build again with gimp enabled
-  make clean
-  ./configure --prefix=/usr --mandir=/usr/share/man --disable-gimp
-  make
-}
-
-package_xsane() {
-  pkgdesc=A GTK-based X11 frontend for SANE and plugin for Gimp.
-  install=$pkgname.install
-  depends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg')  
-  optdepends=('xsane-gimp: for gimp plugin support')
-  cd $srcdir/$pkgbase-$pkgver
-  make DESTDIR=$pkgdir install
-}
-
-package_xsane-gimp() {
-  pkgdesc=XSane Gimp plugin
-  depends=('xsane' 'gimp')
-  cd $srcdir/$pkgbase-$pkgver
-  install -D -m755 src/xsane-gimp ${pkgdir}/usr/bin/xsane-gimp
-
-  ## For making Gimp Plugin available 
-  /bin/mkdir -p $pkgdir/usr/lib/gimp/2.0/plug-ins
-  cd $pkgdir/usr/lib/gimp/2.0/plug-ins/
-  /bin/ln -s ../../../../bin/xsane-gimp xsane
-
-# 
http://cvs.fedoraproject.org/viewvc/rpms/xsane/devel/xsane.spec?revision=1.80view=markup
-# when makepkg will allow splitted pkg install file support we might change 
add a xsane-gimp.install file with the commands that are used by fedora, 
-# gentoo has something similar
-#%post gimp
-#107   if [ -x %{_sbindir}/gimp-plugin-mgr ]; then
-#108   %{_sbindir}/gimp-plugin-mgr --install xsane
-#109   fi
-#110   
-#111   %preun gimp
-#112   if [ $1 = 0 ]; then
-#113   if [ -x %{_sbindir}/gimp-plugin-mgr ]; then
-#114   %{_sbindir}/gimp-plugin-mgr --uninstall xsane
-#115   fi
-#116   fi 
-}

Copied: xsane/repos/extra-i686/PKGBUILD (from rev 185792, xsane/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-05-19 08:52:55 UTC (rev 185793)
@@ -0,0 +1,75 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+# Contributor: Sarah Hay sarah...@mb.sympatico.ca
+
+pkgbase=xsane
+pkgname=('xsane' 'xsane-gimp')
+pkgver=0.998
+pkgrel=5
+arch=(i686 x86_64)
+url=http://www.xsane.org;
+license=('GPL2')
+makedepends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg' 'gimp')
+source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz
+   xsane-0.995-xdg-open.patch)
+md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa'
+ '15541ff0ddc10acfa2059cf99d5478eb')
+
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+  # fix use xdg-open instead of netscape to launch help browser - taken 
from Fedora
+  patch -Np1