[arch-commits] Commit in lirc-utils/repos (5 files)

[Giovanni Scafora]

    Date: Sunday, October 18, 2009 @ 21:39:16
  Author: giovanni
Revision: 56070

Merged revisions 56033 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/lirc-utils/trunk

........
  r56033 | hugo | 2009-10-18 07:10:30 -0700 (dom, 18 ott 2009) | 2 lines
  
  upgpkg: lirc-utils 0.8.6-2
      Fixing FS#16704
........

Added:
  lirc-utils/repos/extra-x86_64/lircd.conf
    (from rev 56033, lirc-utils/trunk/lircd.conf)
Modified:
  lirc-utils/repos/extra-x86_64/	(properties)
  lirc-utils/repos/extra-x86_64/PKGBUILD
  lirc-utils/repos/extra-x86_64/lircd
Deleted:
  lirc-utils/repos/extra-x86_64/lircd.conf.d

--------------+
 PKGBUILD     |   35 ++++++++++++++++++-----------------
 lircd        |    2 +-
 lircd.conf   |    8 ++++++++
 lircd.conf.d |    8 --------
 4 files changed, 27 insertions(+), 26 deletions(-)


Property changes on: lirc-utils/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /lirc-utils/trunk:1-55943
   + /lirc-utils/trunk:1-56069

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-18 21:51:26 UTC (rev 56069)
+++ extra-x86_64/PKGBUILD	2009-10-19 01:39:16 UTC (rev 56070)
@@ -3,7 +3,7 @@
 
 pkgname=lirc-utils
 pkgver=0.8.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux Infrared Remote Control utils"
 arch=('i686' 'x86_64')
 url="http://www.lirc.org/"
@@ -13,15 +13,14 @@
 makedepends=('help2man')
 replaces=('lirc+pctv')
 backup=('etc/lircd.conf' 'etc/lircmd.conf'\
-        'etc/conf.d/lircd')
+        'etc/conf.d/lircd', 'etc/lirc/lircd.conf')
 options=('!libtool' '!makeflags')
-source=(http://prdownloads.sourceforge.net/lirc/lirc-${pkgver}.tar.bz2
-        #http://downloads.sourceforge.net/sourceforge/lirc/lirc-$pkgver.tar.bz2
-	lircd lircmd lirc.logrotate lircd.conf.d)
+source=(http://downloads.sourceforge.net/sourceforge/lirc/lirc-$pkgver.tar.bz2
+	lircd lircmd lirc.logrotate lircd.conf)
 
 build() {
 	# configure
-	cd $startdir/src/lirc-$pkgver || return 1
+	cd ${srcdir}/lirc-$pkgver || return 1
 
       # Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+
 	sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am || return 1
@@ -42,27 +41,29 @@
 
   	# build
 	make || return 1
-	make DESTDIR=$startdir/pkg install || return 1
-	mkdir -p $startdir/pkg/usr/share/lirc $startdir/pkg/etc/rc.d \
+	make DESTDIR=${pkgdir} install || return 1
+	mkdir -p ${pkgdir}/usr/share/lirc ${pkgdir}/etc/rc.d \
 		|| return 1
-	cp $startdir/src/{lircd,lircmd} $startdir/pkg/etc/rc.d/ \
+	cp ${srcdir}/{lircd,lircmd} ${pkgdir}/etc/rc.d/ \
 		|| return 1
-	cp -rp remotes $startdir/pkg/usr/share/lirc || return 1
-	chmod -R go-w $startdir/pkg/usr/share/lirc/ || return 1
+	cp -rp remotes ${pkgdir}/usr/share/lirc || return 1
+	chmod -R go-w ${pkgdir}/usr/share/lirc/ || return 1
 
 	# install the logrotate config
-	install -D -m644 $startdir/src/lirc.logrotate \
-		$startdir/pkg/etc/logrotate.d/lirc || return 1
+	install -D -m644 ${srcdir}/lirc.logrotate \
+		${pkgdir}/etc/logrotate.d/lirc || return 1
 	
 	# install conf.d file
-	install -D -m644 $startdir/src/lircd.conf.d \
-		$startdir/pkg/etc/conf.d/lircd || return 1
+	install -D -m644 ${srcdir}/lircd.conf \
+		${pkgdir}/etc/lirc/lircd.conf || return 1
 
+	install -d -m755 ${pkgdir}/var/run/lirc || return 1
+
 	# remove built modules
-	rm -r $startdir/pkg/lib/
+	rm -r ${pkgdir}/lib/
 }
 md5sums=('4ca24da6f5e7c2dcea74878c27a4a3f7'
-         '909ad968afa10e4511e1da277bb23c3b'
+         'b01189975f573b4ceab8bf3d58d7f77a'
          '85f7fdac55e5256967241864049bf5e9'
          '3deb02604b37811d41816e9b4385fcc3'
          '5b1f8c9cd788a39a6283f93302ce5c6e')

Modified: extra-x86_64/lircd
===================================================================
--- extra-x86_64/lircd	2009-10-18 21:51:26 UTC (rev 56069)
+++ extra-x86_64/lircd	2009-10-19 01:39:16 UTC (rev 56070)
@@ -2,7 +2,7 @@
 
 . /etc/rc.conf
 . /etc/rc.d/functions
-. /etc/conf.d/lircd
+. /etc/lirc/lircd.conf
 
 PID=$(pidof -o %PPID /usr/sbin/lircd)
 case "$1" in

Copied: lirc-utils/repos/extra-x86_64/lircd.conf (from rev 56033, lirc-utils/trunk/lircd.conf)
===================================================================
--- extra-x86_64/lircd.conf	                        (rev 0)
+++ extra-x86_64/lircd.conf	2009-10-19 01:39:16 UTC (rev 56070)
@@ -0,0 +1,8 @@
+#
+# Parameters for lirc daemon
+#
+
+LIRC_DEVICE="/dev/lirc0"
+LIRC_DRIVER=""
+LIRC_EXTRAOPTS=""
+LIRC_CONFIGFILE=""

Deleted: extra-x86_64/lircd.conf.d
===================================================================
--- extra-x86_64/lircd.conf.d	2009-10-18 21:51:26 UTC (rev 56069)
+++ extra-x86_64/lircd.conf.d	2009-10-19 01:39:16 UTC (rev 56070)
@@ -1,8 +0,0 @@
-#
-# Parameters for lirc daemon
-#
-
-LIRC_DEVICE="/dev/lirc0"
-LIRC_DRIVER=""
-LIRC_EXTRAOPTS=""
-LIRC_CONFIGFILE=""