From 1cf1f411390e039ec6f01dd02eb296da790b5fc9 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xssn.at>
Date: Mon, 1 Mar 2010 21:00:21 +0100
Subject: update

Signed-off-by: Florian Pritz <bluewind@xssn.at>
---
 murmur/ChangeLog   | 10 +++++++---
 murmur/PKGBUILD    | 12 ++++--------
 murmur/murmur.rc.d |  4 ++++
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/murmur/ChangeLog b/murmur/ChangeLog
index 84fa086..7537836 100644
--- a/murmur/ChangeLog
+++ b/murmur/ChangeLog
@@ -1,8 +1,12 @@
-2010-01-9 Otto Allmendinger <otto.allmendinger@googlemail.com>
+2010-02-11 Otto Allmendinger <otto.allmendinger@googlemail.com>
+	* 1.2.2-1:
+	bump to version 1.2.2
+
+2010-01-09 Otto Allmendinger <otto.allmendinger@googlemail.com>
 	* 1.2.1-1:
 	bump to version 1.2.1
 
-2009-12-18 Otto Allmendinger <otto.allmendinger@gmail.com>
+2009-12-18 Otto Allmendinger <otto.allmendinger@googlemail.com>
 	* 1.2.0-8:
 	included dbus configuration file, changed default dbus settings
 
@@ -18,7 +22,7 @@
 	added some files to backup array
 	added logrotate configuration file
 
-2009-12-15 Otto Allmendinger <otto.allmendinger@gmail.com>
+2009-12-15 Otto Allmendinger <otto.allmendinger@googlemail.com>
 	* 1.2.0-5 :
 	simplified dependencies
 	increased visibility of install messages
diff --git a/murmur/PKGBUILD b/murmur/PKGBUILD
index f9ce48a..295560a 100644
--- a/murmur/PKGBUILD
+++ b/murmur/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Malte Rabenseifner <malte@zearan.de> 
 
 pkgname=murmur
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=1
 pkgdesc="The voice chat application server for Mumble"
 arch=('i686' 'x86_64')
@@ -50,13 +50,9 @@ build() {
     install -Dm644 README ${pkgdir}/usr/share/doc/murmur/README
     install -Dm644 man/murmurd.1 ${pkgdir}/usr/share/man/man1/murmurd.1
 }
-md5sums=('94b59aef3233b91705fa8cfcdd04d3e1'
-         '43203340a5210379228f2b0dffea6173'
-         '11c1cc875e8021739ec2087252cf0533'
-         'eddea4cdbd0bde4b960a67e16b5d5478'
-         'c56726cb267ead68f37f35c28e36e6fa')
-md5sums=('94b59aef3233b91705fa8cfcdd04d3e1'
-         'f13b927a1a18115199f8305c8aad330e'
+
+md5sums=('de30ee85170e183b66568b53b04c5727'
+         'a577febe880ea104a2b00582b9cb0ddd'
          '11c1cc875e8021739ec2087252cf0533'
          'eddea4cdbd0bde4b960a67e16b5d5478'
          'c56726cb267ead68f37f35c28e36e6fa')
diff --git a/murmur/murmur.rc.d b/murmur/murmur.rc.d
index 08f3223..fac3fb3 100755
--- a/murmur/murmur.rc.d
+++ b/murmur/murmur.rc.d
@@ -1,8 +1,12 @@
 #!/bin/bash
 
+CONF=/etc/conf.d/murmur
+
 . /etc/rc.conf
 . /etc/rc.d/functions
 
+[ -f $CONF ] && . $CONF
+
 PID=$(pidof -o %PPID /usr/sbin/murmurd)
 case "$1" in
   start)
-- 
cgit v1.2.3-24-g4f1b