[arch-commits] Commit in wireshark/repos (4 files)

[Giovanni Scafora]

    Date: Monday, February 9, 2009 @ 13:55:29
  Author: giovanni
Revision: 26572

Merged revisions 26566,26568 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/wireshark/trunk

........
  r26566 | hugo | 2009-02-09 10:23:18 -0800 (lun, 09 feb 2009) | 2 lines
  
  upgpkg: wireshark 1.0.6-1
      Fixing FS#12530
........
  r26568 | hugo | 2009-02-09 10:36:24 -0800 (lun, 09 feb 2009) | 1 line
  
  adding wireshark.png and wireshark.desktop
........

Added:
  wireshark/repos/extra-x86_64/wireshark.desktop
    (from rev 26568, wireshark/trunk/wireshark.desktop)
  wireshark/repos/extra-x86_64/wireshark.png
    (from rev 26568, wireshark/trunk/wireshark.png)
Modified:
  wireshark/repos/extra-x86_64/	(properties)
  wireshark/repos/extra-x86_64/PKGBUILD

-------------------+
 PKGBUILD          |   11 ++++++++---
 wireshark.desktop |   10 ++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)


Property changes on: wireshark/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /wireshark/trunk:1-21977
   + /wireshark/trunk:1-26571

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-02-09 18:40:32 UTC (rev 26571)
+++ extra-x86_64/PKGBUILD	2009-02-09 18:55:29 UTC (rev 26572)
@@ -2,7 +2,7 @@
 # Maintainer: Hugo Doria <hugo at archlinux.org>
 
 pkgname=wireshark
-pkgver=1.0.5
+pkgver=1.0.6
 pkgrel=1
 pkgdesc="A free network protocol analyzer for Unix/Linux and Windows"
 arch=('i686' 'x86_64')
@@ -12,8 +12,10 @@
 url="http://www.wireshark.org/"
 replaces=('ethereal')
 options=(!libtool)
-source=(http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.gz)
-md5sums=('99ac9a9d2c1445658039f1f34c89e3f6')
+source=(http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.gz wireshark.desktop wireshark.png)
+md5sums=('29cf348676ae237189c13719dcabf858'
+         '504ede44c02b2a52f6cbd3bffdf93b8d'
+         'e771800a8c977fe223583a453bc27397')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -21,4 +23,7 @@
   ./configure --prefix=/usr --with-ssl || return 1
   make all || return 1
   make DESTDIR=${pkgdir} install || return 1
+
+  install -Dm644 ${srcdir}/wireshark.png ${pkgdir}/usr/share/icons/wireshark.png
+  install -Dm644 ${srcdir}/wireshark.desktop ${pkgdir}/usr/share/applications/wireshark.desktop
 }

Copied: wireshark/repos/extra-x86_64/wireshark.desktop (from rev 26568, wireshark/trunk/wireshark.desktop)
===================================================================
--- extra-x86_64/wireshark.desktop	                        (rev 0)
+++ extra-x86_64/wireshark.desktop	2009-02-09 18:55:29 UTC (rev 26572)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+GenericName=Wireshark
+Comment=Network protocol analyzer
+Name=wireshark
+Exec=wireshark
+Icon=/usr/share/icons/wireshark.png
+Type=Application
+Terminal=false
+Categories=Application;Network;

Copied: wireshark/repos/extra-x86_64/wireshark.png (from rev 26568, wireshark/trunk/wireshark.png)
===================================================================
(Binary files differ)