[arch-commits] Commit in libksane4/repos (8 files)
Antonio Rojas
arojas at archlinux.org
Sat Mar 26 19:58:14 UTC 2016
Date: Saturday, March 26, 2016 @ 20:58:13
Author: arojas
Revision: 262587
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libksane4/repos/extra-i686/PKGBUILD
(from rev 262586, libksane4/trunk/PKGBUILD)
libksane4/repos/extra-i686/libksane4.install
(from rev 262586, libksane4/trunk/libksane4.install)
libksane4/repos/extra-x86_64/PKGBUILD
(from rev 262586, libksane4/trunk/PKGBUILD)
libksane4/repos/extra-x86_64/libksane4.install
(from rev 262586, libksane4/trunk/libksane4.install)
Deleted:
libksane4/repos/extra-i686/PKGBUILD
libksane4/repos/extra-i686/libksane4.install
libksane4/repos/extra-x86_64/PKGBUILD
libksane4/repos/extra-x86_64/libksane4.install
--------------------------------+
/PKGBUILD | 82 +++++++++++++++++++++++++++++++++++++++
/libksane4.install | 22 ++++++++++
extra-i686/PKGBUILD | 38 ------------------
extra-i686/libksane4.install | 11 -----
extra-x86_64/PKGBUILD | 38 ------------------
extra-x86_64/libksane4.install | 11 -----
6 files changed, 104 insertions(+), 98 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-03-26 19:57:39 UTC (rev 262586)
+++ extra-i686/PKGBUILD 2016-03-26 19:58:13 UTC (rev 262587)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=libksane4
-_pkgname=libksane
-pkgver=15.08.3
-pkgrel=2
-pkgdesc="An image scanning library"
-url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane"
-arch=(i686 x86_64)
-license=(GPL LGPL FDL)
-depends=(kdelibs sane)
-makedepends=(cmake automoc4)
-replaces=('libksane<15.11')
-conflicts=('libksane<15.11')
-install=$pkgname.install
-source=("http://download.kde.org/stable/applications/$pkgver/src/$_pkgname-$pkgver.tar.xz")
-sha1sums=('2707d84bdcd0ec568ff47066012c3086b07477cc')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../$_pkgname-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: libksane4/repos/extra-i686/PKGBUILD (from rev 262586, libksane4/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-03-26 19:58:13 UTC (rev 262587)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=libksane4
+_pkgname=libksane
+pkgver=15.08.3
+pkgrel=3
+pkgdesc="An image scanning library"
+url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane"
+arch=(i686 x86_64)
+license=(GPL LGPL FDL)
+depends=(kdelibs sane)
+makedepends=(cmake automoc4)
+replaces=('libksane<15.11')
+conflicts=('libksane<15.11')
+install=$pkgname.install
+source=("http://download.kde.org/stable/applications/$pkgver/src/$_pkgname-$pkgver.tar.xz")
+sha1sums=('2707d84bdcd0ec568ff47066012c3086b07477cc')
+
+prepare() {
+ mkdir -p build
+}
+
+build() {
+ cd build
+ cmake ../$_pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+
+# Fix conflicts with libksane>=16.04
+ rm -r "$pkgdir"/usr/share
+}
Deleted: extra-i686/libksane4.install
===================================================================
--- extra-i686/libksane4.install 2016-03-26 19:57:39 UTC (rev 262586)
+++ extra-i686/libksane4.install 2016-03-26 19:58:13 UTC (rev 262587)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: libksane4/repos/extra-i686/libksane4.install (from rev 262586, libksane4/trunk/libksane4.install)
===================================================================
--- extra-i686/libksane4.install (rev 0)
+++ extra-i686/libksane4.install 2016-03-26 19:58:13 UTC (rev 262587)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-03-26 19:57:39 UTC (rev 262586)
+++ extra-x86_64/PKGBUILD 2016-03-26 19:58:13 UTC (rev 262587)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=libksane4
-_pkgname=libksane
-pkgver=15.08.3
-pkgrel=2
-pkgdesc="An image scanning library"
-url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane"
-arch=(i686 x86_64)
-license=(GPL LGPL FDL)
-depends=(kdelibs sane)
-makedepends=(cmake automoc4)
-replaces=('libksane<15.11')
-conflicts=('libksane<15.11')
-install=$pkgname.install
-source=("http://download.kde.org/stable/applications/$pkgver/src/$_pkgname-$pkgver.tar.xz")
-sha1sums=('2707d84bdcd0ec568ff47066012c3086b07477cc')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../$_pkgname-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: libksane4/repos/extra-x86_64/PKGBUILD (from rev 262586, libksane4/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-03-26 19:58:13 UTC (rev 262587)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=libksane4
+_pkgname=libksane
+pkgver=15.08.3
+pkgrel=3
+pkgdesc="An image scanning library"
+url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane"
+arch=(i686 x86_64)
+license=(GPL LGPL FDL)
+depends=(kdelibs sane)
+makedepends=(cmake automoc4)
+replaces=('libksane<15.11')
+conflicts=('libksane<15.11')
+install=$pkgname.install
+source=("http://download.kde.org/stable/applications/$pkgver/src/$_pkgname-$pkgver.tar.xz")
+sha1sums=('2707d84bdcd0ec568ff47066012c3086b07477cc')
+
+prepare() {
+ mkdir -p build
+}
+
+build() {
+ cd build
+ cmake ../$_pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+
+# Fix conflicts with libksane>=16.04
+ rm -r "$pkgdir"/usr/share
+}
Deleted: extra-x86_64/libksane4.install
===================================================================
--- extra-x86_64/libksane4.install 2016-03-26 19:57:39 UTC (rev 262586)
+++ extra-x86_64/libksane4.install 2016-03-26 19:58:13 UTC (rev 262587)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: libksane4/repos/extra-x86_64/libksane4.install (from rev 262586, libksane4/trunk/libksane4.install)
===================================================================
--- extra-x86_64/libksane4.install (rev 0)
+++ extra-x86_64/libksane4.install 2016-03-26 19:58:13 UTC (rev 262587)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list