diff options
author | James Meyer <james.meyer@operamail.com> | 2012-04-21 19:33:46 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2012-04-21 19:33:46 (GMT) |
commit | 4776ad244bf71b6045d3a907ffd7715bbe825668 (patch) | |
tree | 4f97b58fa7d22f48993075283d4aa973963fc07c /abs/extra | |
parent | bdc2af6dda9f7bffcd98a76a71b89347413648a6 (diff) | |
download | linhes_pkgbuild-4776ad244bf71b6045d3a907ffd7715bbe825668.zip linhes_pkgbuild-4776ad244bf71b6045d3a907ffd7715bbe825668.tar.gz linhes_pkgbuild-4776ad244bf71b6045d3a907ffd7715bbe825668.tar.bz2 |
merge_conflict fix..no change
Diffstat (limited to 'abs/extra')
-rw-r--r-- | abs/extra/community/transmission-cli/PKGBUILD | 6 | ||||
-rw-r--r-- | abs/extra/xbmc/PKGBUILD | 4 | ||||
-rw-r--r-- | abs/extra/xbmc/xbmc.sh | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/abs/extra/community/transmission-cli/PKGBUILD b/abs/extra/community/transmission-cli/PKGBUILD index 09609f9..4980466 100644 --- a/abs/extra/community/transmission-cli/PKGBUILD +++ b/abs/extra/community/transmission-cli/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=transmission-cli -pkgver=2.41 -pkgrel=2 +pkgver=2.51 +pkgrel=1 pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)" arch=('i686' 'x86_64') url="http://www.transmissionbt.com/" @@ -38,7 +38,7 @@ package() { install -D -m644 "$srcdir/transmission.include" "$pkgdir/etc/transmission/transmission.include" || return 1 install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING" || return 1 } -md5sums=('799b7bb24e236dbbdc86275f89ea9e67' +md5sums=('dfe2faeb2b76b43954ec943affef2133' 'e876d24b99c401f782395b053976dffd' 'ff22c13dbd52565f9e88b1de22514eb9' 'b5a49ea375333cd0fee40f70dbac4c2e' diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD index 49166cc..0a36e53 100644 --- a/abs/extra/xbmc/PKGBUILD +++ b/abs/extra/xbmc/PKGBUILD @@ -9,7 +9,7 @@ _prefix=/usr pkgname=xbmc pkgver=11.0 -pkgrel=4 +pkgrel=5 pkgdesc="A software media player and entertainment hub for digital media" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -105,4 +105,4 @@ package() { # vim:set ts=2 sw=2 et: md5sums=('9e8a26ee25173c7268abea7f1d82d428' '5aa2e21a1f9fea60a2e5bb345e5aefd0' - 'f30d9a68daedd28482813ee40134f243') + 'fcbf28e440ea3e6f78ae2cebdeb8be76') diff --git a/abs/extra/xbmc/xbmc.sh b/abs/extra/xbmc/xbmc.sh index a27f0f1..81584e4 100644 --- a/abs/extra/xbmc/xbmc.sh +++ b/abs/extra/xbmc/xbmc.sh @@ -1,7 +1,7 @@ #!/bin/bash #Stop XScreensaver -stop_xss.sh & +xscreensaver-command -exit #Launch XBMC /usr/bin/xbmc --lircdev /var/run/lirc/lircd -#Once XBMC exits, kill stop xss -killall stop_xss.sh +#Once XBMC exits, start XSceensager again +xscreensaver -no-splash & |