diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-07 11:24:34 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-07 11:24:34 -0300 |
| commit | a607668699d0ed030ac69ed31969dfa266439e38 (patch) | |
| tree | 5b3e076437e78d8624668454afc1d82750d54c8a /community/calibre | |
| parent | 6b015d22b5b59eddb6e8c40989017d8492ac912c (diff) | |
| parent | a4d309341dbcd3c28ee68e818c1d5ef54114adf8 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/libraw/PKGBUILD
community-testing/virtualbox-modules/PKGBUILD
community-testing/virtualbox-modules/virtualbox-modules.install
community-testing/virtualbox/PKGBUILD
community-testing/virtualbox/vboxdrv-reference.patch
community-testing/virtualbox/virtualbox.install
community-testing/vtk/PKGBUILD
community/audex/PKGBUILD
community/critter/PKGBUILD
community/egoboo/PKGBUILD
community/fcgiwrap/PKGBUILD
community/hping/PKGBUILD
community/libesmtp/PKGBUILD
community/lockdev/PKGBUILD
community/pidgin-musictracker/PKGBUILD
community/pidgin-otr/PKGBUILD
community/pylibacl/PKGBUILD
community/pypanel/PKGBUILD
community/rdiff-backup/PKGBUILD
community/steghide/PKGBUILD
community/tabbed/PKGBUILD
community/transset-df/PKGBUILD
community/wyrd/PKGBUILD
core/openldap/PKGBUILD
core/sqlite3/PKGBUILD
extra/fltk/PKGBUILD
extra/thunar/PKGBUILD
extra/xfce4-clipman-plugin/PKGBUILD
multilib/lib32-acl/PKGBUILD
multilib/lib32-alsa-oss/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-libffi/PKGBUILD
multilib/lib32-libmng/PKGBUILD
multilib/lib32-libpciaccess/PKGBUILD
multilib/lib32-libusb-compat/PKGBUILD
multilib/lib32-libusb/PKGBUILD
multilib/wine/PKGBUILD
Diffstat (limited to 'community/calibre')
| -rw-r--r-- | community/calibre/PKGBUILD | 14 | ||||
| -rwxr-xr-x | community/calibre/calibre-mount-helper | 28 |
2 files changed, 38 insertions, 4 deletions
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 2b7be9e93..4b3e0291b 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 57448 2011-10-27 21:24:16Z giovanni $ +# $Id: PKGBUILD 57853 2011-11-03 15:52:53Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre pkgver=0.8.24 -pkgrel=1 +pkgrel=2 pkgdesc="Ebook management application" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" @@ -19,9 +19,11 @@ makedepends=('python2-pycountry') optdepends=('ipython: to use calibre-debug') install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'desktop_integration.patch') + 'desktop_integration.patch' + 'calibre-mount-helper') md5sums=('9ab82f7d4d072cc6858ef92f29d6029a' - '253ce4fe5d01f8ff76b63cd3825755ea') + '253ce4fe5d01f8ff76b63cd3825755ea' + '675cd87d41342119827ef706055491e7') build() { cd "${srcdir}/${pkgname}" @@ -64,4 +66,8 @@ package() { for decom in "${pkgdir}"/usr/share/man/man1/*.bz2; do bzip2 -d "${decom}" done + + # See http://lwn.net/SubscriberLink/465311/7c299471a5399167/ + rm -rf ${pkgdir}/usr/bin/calibre-mount-helper + install -m 755 ${srcdir}/calibre-mount-helper "${pkgdir}/usr/bin" } diff --git a/community/calibre/calibre-mount-helper b/community/calibre/calibre-mount-helper new file mode 100755 index 000000000..00cac4270 --- /dev/null +++ b/community/calibre/calibre-mount-helper @@ -0,0 +1,28 @@ +#!/bin/sh -e +# Replacement for upstream mount helper using udisks/eject +# (C) 2010 Martin Pitt <mpitt@debian.org> + +ACTION="$1" +DEV="$2" + +case "$ACTION" in + mount) + udisks --mount "$DEV" + + # check if mount worked. If not, fail + # udisks does return 0 even if mount failed + mount | grep -q "$DEV" || exit 0 + ;; + + eject) + eject "$DEV" + ;; + + cleanup) + ;; + + *) + echo "unknown action" >&2 + exit 1 +esac + |