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

[Paul Mattal]

    Date: Friday, October 31, 2008 @ 10:07:26
  Author: paul
Revision: 17678

merge error

Modified:
  truecrypt/repos/extra-i686/	(properties)
Deleted:
  truecrypt/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   32 --------------------------------
 1 file changed, 32 deletions(-)


Property changes on: truecrypt/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /truecrypt/trunk:1-285
   + /truecrypt/trunk:1-17677

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-10-31 14:03:47 UTC (rev 17677)
+++ extra-i686/PKGBUILD	2008-10-31 14:07:26 UTC (rev 17678)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Tom K <tom at archlinux.org>
-
-pkgname=truecrypt
-pkgver=5.1a
-pkgrel=1
-pkgdesc="Free open-source cross-platform disk encryption software"
-arch=('i686' 'x86_64')
-depends=('fuse' 'gtk2' 'libsm')
-# N.B. Truecrypt's web-based source download is incompatible with
-# makepkg. Source has been placed on ftp.archlinux.org instead
-source=(http://ftp.archlinux.org/other/truecrypt/TrueCrypt-$pkgver-Source.tar.gz
-	http://prdownloads.sourceforge.net/wxwindows/wxWidgets-2.8.7.tar.bz2
-	gcc-4.3.patch)
-url="http://www.truecrypt.org/"
-license=('custom')
-conflicts=('truecrypt-utils')
-replaces=('truecrypt-utils')
-install=truecrypt.install
-options=('force')
-
-build() {
-  cd $startdir/src/truecrypt-$pkgver-source
-  patch -Np1 -i ../gcc-4.3.patch || return 1
-  make WX_ROOT=$startdir/src/wxWidgets-2.8.7 wxbuild || return 1
-  make || return 1
-  install -Dm755 Main/truecrypt $startdir/pkg/usr/bin/truecrypt
-  install -Dm644 License.txt $startdir/pkg/usr/share/licenses/truecrypt/License.txt
-}
-md5sums=('bf8363f2bb3a24c2fcea588b210b3a16'
-         'e3455083afdf6404a569a8bf0701cf13'
-         '3ac33867555479f6b935daa32ee7889b')