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

[Pierre Schmitz]

    Date: Wednesday, March 11, 2009 @ 11:03:30
  Author: pierre
Revision: 29679

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

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sa, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r12125 | ronald | 2008-09-10 19:50:52 +0200 (Mi, 10 Sep 2008) | 1 line
  
  fix license
........
  r29678 | pierre | 2009-03-11 16:02:52 +0100 (Mi, 11 M?\195?\164r 2009) | 2 lines
  
  upgpkg: qt3-doc 3.3.8-1.1
      somehow the x86_64 pacakge depended on qt rather than qt3
........

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

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


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-03-11 15:02:52 UTC (rev 29678)
+++ extra-x86_64/PKGBUILD	2009-03-11 15:03:30 UTC (rev 29679)
@@ -2,17 +2,22 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=qt3-doc
 pkgver=3.3.8
-pkgrel=1
+pkgrel=1.1
 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=('qt')
 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')