[arch-commits] Commit in twinkle/repos (3 files)

[Giovanni Scafora]

    Date: Saturday, February 7, 2009 @ 13:34:51
  Author: giovanni
Revision: 26400

Merged revisions 26258,26261 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/twinkle/trunk

........
  r26258 | andrea | 2009-02-04 08:11:30 -0800 (mer, 04 feb 2009) | 1 line
  
  upgpkg: twinkle 1.4.1-1
........
  r26261 | andrea | 2009-02-04 08:14:46 -0800 (mer, 04 feb 2009) | 1 line
  
  removed twinkle.desktop
........

Modified:
  twinkle/repos/extra-x86_64/	(properties)
  twinkle/repos/extra-x86_64/PKGBUILD
Deleted:
  twinkle/repos/extra-x86_64/twinkle.desktop

-----------------+
 PKGBUILD        |   21 ++++++++++-----------
 twinkle.desktop |    9 ---------
 2 files changed, 10 insertions(+), 20 deletions(-)


Property changes on: twinkle/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /twinkle/trunk:1-7615
   + /twinkle/trunk:1-26399

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-02-07 16:47:34 UTC (rev 26399)
+++ extra-x86_64/PKGBUILD	2009-02-07 18:34:51 UTC (rev 26400)
@@ -1,22 +1,21 @@
 # $Id$
 # Maintainer: Jeff Mickey <jeff at archlinux.org>
-# Maintainer: Alexander Baldeck <alexander at archlinux.org>
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
 # AUR Contributor: Federico Quagliata (quaqo) <quaqo at despammed.com>
+
 pkgname=twinkle
-pkgver=1.2
-pkgrel=2
-pkgdesc="A SIP softphone for Qt"
+pkgver=1.4.1
+pkgrel=1
+pkgdesc="A softphone for voice over IP and instant messaging communications using the SIP protocol."
 arch=(i686 x86_64)
 url="http://www.twinklephone.com/"
-license=("GPL")
-depends=('speex>=1.2rc1' 'boost>=1.34.1' 'libsndfile' 'qt3' 'libzrtpcpp>=0.9.0-2')
+license=('GPL')
+depends=('speex>=1.2rc1' 'boost>=1.34.1' 'libsndfile' 'qt3' 'libzrtpcpp>=1.3.0')
 makedepends=('pkgconfig')
 conflicts=('twinkle-kdefree')
 replaces=('twinkle-kdefree')
-source=(http://www.xs4all.nl/~mfnboer/${pkgname}/download/${pkgname}-${pkgver}.tar.gz 
-	twinkle.desktop)
-md5sums=('bd83f658ec0d1f59750b7464ea1e2318'
-         '55741e3a4163578bb165da6c10a6475b')
+source=(http://www.xs4all.nl/~mfnboer/${pkgname}/download/${pkgname}-${pkgver}.tar.gz)
+md5sums=('af15449bad373f1166feb75508656c8f')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -25,5 +24,5 @@
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
   install -m755 -d ${pkgdir}/usr/share/applications
-  install -m644 ${srcdir}/twinkle.desktop ${pkgdir}/usr/share/applications/ || return 1
+  install -m644 twinkle.desktop ${pkgdir}/usr/share/applications/ || return 1
 }

Deleted: extra-x86_64/twinkle.desktop
===================================================================
--- extra-x86_64/twinkle.desktop	2009-02-07 16:47:34 UTC (rev 26399)
+++ extra-x86_64/twinkle.desktop	2009-02-07 18:34:51 UTC (rev 26400)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Twinkle
-Comment=A SIP softphone for Qt
-Icon=/usr/share/twinkle/twinkle48.png
-Exec=twinkle
-Terminal=false
-Type=Application
-Categories=Network;
-StartupNotify=false