[arch-commits] Commit in ivtv-utils/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Giovanni Scafora]

    Date: Tuesday, June 16, 2009 @ 17:00:05
  Author: giovanni
Revision: 42602

Merged revisions 42538-42539,42601 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/ivtv-utils/trunk

........
  r42538 | giovanni | 2009-06-15 05:13:57 -0700 (lun, 15 giu 2009) | 2 lines
  
  upgpkg: ivtv-utils 1.4.0-1
      New version 1.4.0
........
  r42539 | giovanni | 2009-06-15 05:14:22 -0700 (lun, 15 giu 2009) | 2 lines
  
  upgpkg: ivtv-utils 1.4.0-1
      New version 1.4.0
........
  r42601 | giovanni | 2009-06-16 13:59:20 -0700 (mar, 16 giu 2009) | 2 lines
  
  upgpkg: ivtv-utils 1.4.0-2
      Fixed FS15133
........

Modified:
  ivtv-utils/repos/extra-x86_64/	(properties)
  ivtv-utils/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


Property changes on: ivtv-utils/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /ivtv-utils/trunk:1-42537
   + /ivtv-utils/trunk:1-42601

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-06-16 20:59:20 UTC (rev 42601)
+++ extra-x86_64/PKGBUILD	2009-06-16 21:00:05 UTC (rev 42602)
@@ -4,7 +4,7 @@
 
 pkgname=ivtv-utils
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace utilities for Hauppauge PVR cards"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -23,5 +23,7 @@
   for file in `ls *.fw` v4l-cx2341x-init.mpg; do
     install -D -m644 $file "${pkgdir}/lib/firmware/$file" || return 1
   done
+  # FS#15133 - files already provided by the kernel-headers package
+  rm -rf ${pkgdir}/usr/include
 }