summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/calibre-libre/PKGBUILD6
-rw-r--r--libre/grub/60_memtest86+2
-rw-r--r--libre/grub/PKGBUILD4
3 files changed, 6 insertions, 6 deletions
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 8a42d10c3..2057bf70b 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92801 2013-06-15 11:25:47Z jelle $
+# $Id: PKGBUILD 92904 2013-06-18 12:33:10Z andrea $
# Maintainer: jelle van der Waa <jelle@vdwaa.nl>
# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -10,7 +10,7 @@
_pkgname=calibre
pkgname=calibre-libre
pkgver=0.9.35
-pkgrel=1.1
+pkgrel=2
pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
arch=('i686' 'x86_64' 'mips64el')
url="http://calibre-ebook.com/"
@@ -19,7 +19,7 @@ depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3'
'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx'
'python2-imaging' 'shared-mime-info' 'python2-dnspython'
- 'unar' 'python2-pyqt' 'python2-psutil' 'icu' 'libmtp'
+ 'unar' 'python2-pyqt4' 'python2-psutil' 'icu' 'libmtp'
'python2-netifaces' 'python2-cssselect')
makedepends=('python2-pycountry' 'qt4-private-headers')
optdepends=('ipython2: to use calibre-debug')
diff --git a/libre/grub/60_memtest86+ b/libre/grub/60_memtest86+
index 064922ef2..086f0cc84 100644
--- a/libre/grub/60_memtest86+
+++ b/libre/grub/60_memtest86+
@@ -22,7 +22,7 @@ if [ -e "${MEMTEST86_IMAGE}" ] && is_path_readable_by_grub "${MEMTEST86_IMAGE}"
_GRUB_MEMTEST_FS_UUID="$(${grub_probe} --target=fs_uuid ${MEMTEST86_IMAGE})"
_GRUB_MEMTEST_REL_PATH="$(make_system_path_relative_to_its_root ${MEMTEST86_IMAGE})"
cat << EOF
-if [ "${grub_platform}" == "pc" ]; then
+if [ "\${grub_platform}" == "pc" ]; then
menuentry "Memory Tester (memtest86+)" ${CLASS} {
search --fs-uuid --no-floppy --set=root ${_GRUB_MEMTEST_HINTS_STRING} ${_GRUB_MEMTEST_FS_UUID}
linux16 ${_GRUB_MEMTEST_REL_PATH} ${GRUB_CMDLINE_MEMTEST86}
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 50a8eda05..522c1517d 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -9,7 +9,7 @@ _grub_915_ver=9
pkgname=('grub-common' 'grub-bios' 'grub-efi-i386')
pkgbase=grub
pkgver=2.00
-pkgrel=4
+pkgrel=5
url="https://www.gnu.org/software/grub/"
arch=('i686' 'x86_64')
license=('GPL3')
@@ -34,7 +34,7 @@ md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91'
'c776aaf2cc35488a7c531b59e697470d'
'52d374e0194e3f2e39ff7c92ecd58a6c'
'255eafb440b8c285b20431366c2d2d27'
- 'ae9f1bc1a579ddc88b9b2e8b46f7e1d5'
+ 'be55eabc102f2c60b38ed35c203686d6'
'f343ed2340ebc86c427873641bb72419'
'ab751d1d8cd3fd47e5ee24d71ecc31ed'
'342dd18472a24e5fd252458b24f39a29')