[arch-commits] Commit in qt3-doc/repos (extra-i686 extra-i686/PKGBUILD)

[Eric Bélanger]

    Date: Thursday, April 30, 2009 @ 00:24:01
  Author: eric
Revision: 37034

Merged revisions 356,12125,29678,29684 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/qt3-doc/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r12125 | ronald | 2008-09-10 13:50:52 -0400 (Wed, 10 Sep 2008) | 1 line
  
  fix license
........
  r29678 | pierre | 2009-03-11 11:02:52 -0400 (Wed, 11 Mar 2009) | 2 lines
  
  upgpkg: qt3-doc 3.3.8-1.1
      somehow the x86_64 pacakge depended on qt rather than qt3
........
  r29684 | pierre | 2009-03-11 11:11:30 -0400 (Wed, 11 Mar 2009) | 2 lines
  
  upgpkg: qt3-doc 3.3.8-1.2
      second try
........

Modified:
  qt3-doc/repos/extra-i686/	(properties)
  qt3-doc/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)


Property changes on: qt3-doc/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /qt3-doc/trunk:1
   + /qt3-doc/trunk:1-37033

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-30 04:12:08 UTC (rev 37033)
+++ extra-i686/PKGBUILD	2009-04-30 04:24:01 UTC (rev 37034)
@@ -2,17 +2,22 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=qt3-doc
 pkgver=3.3.8
-pkgrel=1
+pkgrel=1.2
 pkgdesc="The QT gui toolkit documentation."
 arch=('i686' 'x86_64')
 url="http://www.trolltech.com/products/qt/index.html"
 pkgfqn=qt-x11-free-${pkgver}
 depends=('qt3')
 source=(ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.gz)
+license=('GPL2' 'custom:QPL')
+md5sums=('37aec12c8c7b0e164957ec1aa3fd0189')
 
 build() {
   cd $startdir/src/$pkgfqn
   mkdir -p $startdir/pkg/opt/qt/doc/
   cp -r $startdir/src/$pkgfqn/doc/html $startdir/pkg/opt/qt/doc/
+
+# install QPL license
+install -Dm644 $srcdir/qt-x11-free-$pkgver/LICENSE.QPL \
+	$pkgdir/usr/share/licenses/$pkgname/LICENSE.QPL
 }
-md5sums=('37aec12c8c7b0e164957ec1aa3fd0189')