[arch-commits] Commit in xsane/repos (12 files)
Tobias Powalowski
tpowa at nymeria.archlinux.org
Sun May 19 08:52:55 UTC 2013
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 <tpowa at archlinux.org>
-# Contributor: Sarah Hay <sarahhay at 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.80&view=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 <tpowa at archlinux.org>
+# Contributor: Sarah Hay <sarahhay at 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.80&view=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
+}
Deleted: extra-i686/xsane-0.995-xdg-open.patch
===================================================================
--- extra-i686/xsane-0.995-xdg-open.patch 2013-05-19 08:52:40 UTC (rev 185792)
+++ extra-i686/xsane-0.995-xdg-open.patch 2013-05-19 08:52:55 UTC (rev 185793)
@@ -1,12 +0,0 @@
-diff -up xsane-0.995/src/xsane.h.xdg-open xsane-0.995/src/xsane.h
---- xsane-0.995/src/xsane.h.xdg-open 2007-08-13 09:20:32.000000000 +0200
-+++ xsane-0.995/src/xsane.h 2007-11-23 11:50:49.000000000 +0100
-@@ -251,7 +251,7 @@
- # elif defined(HAVE_OS2_H)
- # define DEFAULT_BROWSER "netscape"
- # else
--# define DEFAULT_BROWSER "netscape"
-+# define DEFAULT_BROWSER "xdg-open"
- # endif
- #endif
-
Copied: xsane/repos/extra-i686/xsane-0.995-xdg-open.patch (from rev 185792, xsane/trunk/xsane-0.995-xdg-open.patch)
===================================================================
--- extra-i686/xsane-0.995-xdg-open.patch (rev 0)
+++ extra-i686/xsane-0.995-xdg-open.patch 2013-05-19 08:52:55 UTC (rev 185793)
@@ -0,0 +1,12 @@
+diff -up xsane-0.995/src/xsane.h.xdg-open xsane-0.995/src/xsane.h
+--- xsane-0.995/src/xsane.h.xdg-open 2007-08-13 09:20:32.000000000 +0200
++++ xsane-0.995/src/xsane.h 2007-11-23 11:50:49.000000000 +0100
+@@ -251,7 +251,7 @@
+ # elif defined(HAVE_OS2_H)
+ # define DEFAULT_BROWSER "netscape"
+ # else
+-# define DEFAULT_BROWSER "netscape"
++# define DEFAULT_BROWSER "xdg-open"
+ # endif
+ #endif
+
Deleted: extra-i686/xsane.install
===================================================================
--- extra-i686/xsane.install 2013-05-19 08:52:40 UTC (rev 185792)
+++ extra-i686/xsane.install 2013-05-19 08:52:55 UTC (rev 185793)
@@ -1,17 +0,0 @@
-# arg 1: the new package version
-# arg 2: the old package version
-
-post_install() {
- echo "NOTE:"
- echo " If you experience any problems after installing xsane "
- echo " it may help to remove the setup and preferences files"
- echo " of xsane:"
- echo ""
- echo " \$ rm -rf ~/.sane/xsane"
- echo ""
- echo "Xsane only supports creation of pdf files in 8bit colour depth!"
-}
-
-post_upgrade() {
- post_install $1
-}
Copied: xsane/repos/extra-i686/xsane.install (from rev 185792, xsane/trunk/xsane.install)
===================================================================
--- extra-i686/xsane.install (rev 0)
+++ extra-i686/xsane.install 2013-05-19 08:52:55 UTC (rev 185793)
@@ -0,0 +1,17 @@
+# arg 1: the new package version
+# arg 2: the old package version
+
+post_install() {
+ echo "NOTE:"
+ echo " If you experience any problems after installing xsane "
+ echo " it may help to remove the setup and preferences files"
+ echo " of xsane:"
+ echo ""
+ echo " \$ rm -rf ~/.sane/xsane"
+ echo ""
+ echo "Xsane only supports creation of pdf files in 8bit colour depth!"
+}
+
+post_upgrade() {
+ post_install $1
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-05-19 08:52:40 UTC (rev 185792)
+++ extra-x86_64/PKGBUILD 2013-05-19 08:52:55 UTC (rev 185793)
@@ -1,70 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: Sarah Hay <sarahhay at 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.80&view=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-x86_64/PKGBUILD (from rev 185792, xsane/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-05-19 08:52:55 UTC (rev 185793)
@@ -0,0 +1,75 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Sarah Hay <sarahhay at 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.80&view=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
+}
Deleted: extra-x86_64/xsane-0.995-xdg-open.patch
===================================================================
--- extra-x86_64/xsane-0.995-xdg-open.patch 2013-05-19 08:52:40 UTC (rev 185792)
+++ extra-x86_64/xsane-0.995-xdg-open.patch 2013-05-19 08:52:55 UTC (rev 185793)
@@ -1,12 +0,0 @@
-diff -up xsane-0.995/src/xsane.h.xdg-open xsane-0.995/src/xsane.h
---- xsane-0.995/src/xsane.h.xdg-open 2007-08-13 09:20:32.000000000 +0200
-+++ xsane-0.995/src/xsane.h 2007-11-23 11:50:49.000000000 +0100
-@@ -251,7 +251,7 @@
- # elif defined(HAVE_OS2_H)
- # define DEFAULT_BROWSER "netscape"
- # else
--# define DEFAULT_BROWSER "netscape"
-+# define DEFAULT_BROWSER "xdg-open"
- # endif
- #endif
-
Copied: xsane/repos/extra-x86_64/xsane-0.995-xdg-open.patch (from rev 185792, xsane/trunk/xsane-0.995-xdg-open.patch)
===================================================================
--- extra-x86_64/xsane-0.995-xdg-open.patch (rev 0)
+++ extra-x86_64/xsane-0.995-xdg-open.patch 2013-05-19 08:52:55 UTC (rev 185793)
@@ -0,0 +1,12 @@
+diff -up xsane-0.995/src/xsane.h.xdg-open xsane-0.995/src/xsane.h
+--- xsane-0.995/src/xsane.h.xdg-open 2007-08-13 09:20:32.000000000 +0200
++++ xsane-0.995/src/xsane.h 2007-11-23 11:50:49.000000000 +0100
+@@ -251,7 +251,7 @@
+ # elif defined(HAVE_OS2_H)
+ # define DEFAULT_BROWSER "netscape"
+ # else
+-# define DEFAULT_BROWSER "netscape"
++# define DEFAULT_BROWSER "xdg-open"
+ # endif
+ #endif
+
Deleted: extra-x86_64/xsane.install
===================================================================
--- extra-x86_64/xsane.install 2013-05-19 08:52:40 UTC (rev 185792)
+++ extra-x86_64/xsane.install 2013-05-19 08:52:55 UTC (rev 185793)
@@ -1,17 +0,0 @@
-# arg 1: the new package version
-# arg 2: the old package version
-
-post_install() {
- echo "NOTE:"
- echo " If you experience any problems after installing xsane "
- echo " it may help to remove the setup and preferences files"
- echo " of xsane:"
- echo ""
- echo " \$ rm -rf ~/.sane/xsane"
- echo ""
- echo "Xsane only supports creation of pdf files in 8bit colour depth!"
-}
-
-post_upgrade() {
- post_install $1
-}
Copied: xsane/repos/extra-x86_64/xsane.install (from rev 185792, xsane/trunk/xsane.install)
===================================================================
--- extra-x86_64/xsane.install (rev 0)
+++ extra-x86_64/xsane.install 2013-05-19 08:52:55 UTC (rev 185793)
@@ -0,0 +1,17 @@
+# arg 1: the new package version
+# arg 2: the old package version
+
+post_install() {
+ echo "NOTE:"
+ echo " If you experience any problems after installing xsane "
+ echo " it may help to remove the setup and preferences files"
+ echo " of xsane:"
+ echo ""
+ echo " \$ rm -rf ~/.sane/xsane"
+ echo ""
+ echo "Xsane only supports creation of pdf files in 8bit colour depth!"
+}
+
+post_upgrade() {
+ post_install $1
+}
More information about the arch-commits
mailing list