merge_conflict fix..no change

6 files changed, 22 insertions, 20 deletions

diff --git a/abs/core/rsyslog/PKGBUILD b/abs/core/rsyslog/PKGBUILD
index 0422880..a4fbf81 100644
--- a/abs/core/rsyslog/PKGBUILD
+++ b/abs/core/rsyslog/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=rsyslog
 pkgver=5.8.6
-pkgrel=1
+pkgrel=2
 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
 url="http://www.rsyslog.com/"
 arch=('i686' 'x86_64')
@@ -13,7 +13,6 @@ makedepends=( 'libmysqlclient'  'gnutls')
 optdepends=( 'libmysqlclient: MySQL Database Support'
 	    'gnutls')
 backup=('etc/rsyslog.conf' \
-	'etc/logrotate.d/rsyslog'
 	'etc/conf.d/rsyslog')
 conflicts=('syslog-ng')
 replaces=('syslog-ng')
@@ -23,7 +22,6 @@ options=('strip' 'zipman' '!libtool')
 install=('rsyslog.install')
 source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
 	'rsyslog'
-	'rsyslog.logrotate'
 	'rsyslog.conf.d' 'rsyslog.conf.linhes' log_care.sh)
 
 build() {
@@ -46,13 +44,11 @@ package() {
   install -D -m644 $srcdir/${pkgname}.conf.linhes ${pkgdir}/etc/${pkgname}.conf
   mkdir -p  ${pkgdir}/etc/rsyslog.d/
   touch ${pkgdir}/etc/rsyslog.d/empty.conf
-  install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname}
   install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
   install -D -m755 ${srcdir}/log_care.sh ${pkgdir}/etc/cron.daily/log_care
 }
 md5sums=('c46db0496066b82faf735bd4222208d7'
          'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da'
-         '8065db4bef3061a4f000ba58779f6829'
          '1a0cd4530dd5d1439456d5ae230574d9'
          '1e4a87a2ffea61c066a0b01fc9392849'
-         '5a4719b7283bba9fc497013848bf5c5c')
+         '86a7e28b59ad80998b2163860d5d612a')
diff --git a/abs/core/rsyslog/__changelog b/abs/core/rsyslog/__changelog
new file mode 100644
index 0000000..69aa96c
--- /dev/null
+++ b/abs/core/rsyslog/__changelog
@@ -0,0 +1 @@
+- removed rsyslog.logrotate from PKGBUILD. LH uses log_care.sh as a cron job to maintain logs 
diff --git a/abs/core/rsyslog/log_care.sh b/abs/core/rsyslog/log_care.sh
index 4337828..ea1db56 100644
--- a/abs/core/rsyslog/log_care.sh
+++ b/abs/core/rsyslog/log_care.sh
@@ -1,8 +1,13 @@
 #!/bin/bash
 . /etc/profile
-DATE=`date +%Y`
-echo "compressing log files"
-find /var/log/$DATE* -mtime  +1 -exec gzip -9 {} \;
-echo "Deleting older log files"
-find /var/log/$DATE*  -mtime +7  -exec rm -rf {} \;
-
+YEAR=`date +%Y`
+LASTYEAR=$(($YEAR - 1))
+for DATE in $YEAR $LASTYEAR
+do
+    echo "Compressing log files"
+    find /var/log/$DATE* -mtime +1 -exec gzip -9 {} \;
+    echo "Deleting old log files"
+    find /var/log/$DATE* -mtime +7 -exec rm -rf {} \;
+    echo "Deleting empty directories"
+    find /var/log/$DATE* -depth -type d -empty -exec rm -rf {} \;
+done
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 &