summaryrefslogtreecommitdiff
path: root/community/calibre/PKGBUILD
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-02-07 15:10:29 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-02-07 15:10:29 +0100
commit4c4400925b792b694511bbbf2f645fb34495d5cf (patch)
tree86a3b3c62e75fdf9c536306d195bbbcbc7ac974c /community/calibre/PKGBUILD
parent08adec2ac14efea1ef452e79ff86f024b9becaf3 (diff)
parent1fa6edfba8d1e31ca1c0d59e8202cd3c62ccf393 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/bwbar/PKGBUILD community/directfb/PKGBUILD community/extremetuxracer/PKGBUILD community/freedroidrpg/PKGBUILD community/gnash/PKGBUILD community/guake/PKGBUILD community/pidgin-libnotify/PKGBUILD community/png2ico/PKGBUILD community/ruby-gtk2/PKGBUILD community/torcs/PKGBUILD community/virtualbox/PKGBUILD extra/abiword/PKGBUILD extra/alsaplayer/PKGBUILD extra/automoc4/PKGBUILD extra/cagibi/PKGBUILD extra/fltk/PKGBUILD extra/gnome-desktop2/PKGBUILD extra/gnome-python/PKGBUILD extra/gnome-sharp/PKGBUILD extra/gnugo/PKGBUILD extra/gstreamer0.10-good/PKGBUILD extra/gtk2/PKGBUILD extra/gtkmm/PKGBUILD extra/imlib2/PKGBUILD extra/koffice/PKGBUILD extra/lcms/PKGBUILD extra/libao/PKGBUILD extra/libcue/PKGBUILD extra/libdaemon/PKGBUILD extra/libgnome-media-profiles/PKGBUILD extra/libotf/PKGBUILD extra/libotr/PKGBUILD extra/libots/PKGBUILD extra/libreoffice/PKGBUILD extra/libtiff/PKGBUILD extra/libwebkit/PKGBUILD extra/libwmf/PKGBUILD extra/libxfcegui4/PKGBUILD extra/mjpegtools/PKGBUILD extra/netpbm/PKGBUILD extra/php/PKGBUILD extra/plotutils/PKGBUILD extra/poppler/PKGBUILD extra/qrencode/PKGBUILD extra/qt/PKGBUILD extra/qtiplot/PKGBUILD extra/rssh/PKGBUILD extra/scim-chewing/PKGBUILD extra/scim-m17n/PKGBUILD extra/scim-pinyin/PKGBUILD extra/scim-tables/PKGBUILD extra/scim-uim/PKGBUILD extra/tsocks/PKGBUILD extra/vigra/PKGBUILD extra/w3m/PKGBUILD extra/wv/PKGBUILD extra/xclip/PKGBUILD extra/xfce4-datetime-plugin/PKGBUILD extra/xfce4-notes-plugin/PKGBUILD extra/xfce4-quicklauncher-plugin/PKGBUILD extra/xfce4-sensors-plugin/PKGBUILD extra/xorg-font-util/PKGBUILD extra/xorg-setxkbmap/PKGBUILD extra/xorg-xev/PKGBUILD extra/xsane/PKGBUILD extra/yakuake/PKGBUILD extra/zvbi/PKGBUILD multilib/lib32-cairo/PKGBUILD multilib/lib32-gdk-pixbuf2/PKGBUILD multilib/lib32-libcanberra/PKGBUILD multilib/lib32-libcups/PKGBUILD multilib/lib32-libglade/PKGBUILD multilib/lib32-libpng/PKGBUILD multilib/lib32-libtiff/PKGBUILD multilib/lib32-pango/PKGBUILD multilib/lib32-qt/PKGBUILD multilib/lib32-sdl_image/PKGBUILD multilib/wine/PKGBUILD testing/vlc/PKGBUILD testing/xulrunner/PKGBUILD
Diffstat (limited to 'community/calibre/PKGBUILD')
-rw-r--r--community/calibre/PKGBUILD4
1 files changed, 2 insertions, 2 deletions
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index ceb897cf9..6dd6ae7e7 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 63441 2012-02-03 13:48:06Z giovanni $
+# $Id: PKGBUILD 63508 2012-02-05 11:52:12Z ibiru $
# 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.38
-pkgrel=1
+pkgrel=2
pkgdesc="Ebook management application"
arch=('i686' 'x86_64' 'mips64el')
url="http://calibre-ebook.com/"