[arch-commits] Commit in wireshark/trunk (PKGBUILD)

[Guillaume Alaux]

    Date: Sunday, April 22, 2012 @ 09:24:13
  Author: guillaume
Revision: 156653

upgpkg: wireshark 1.6.7-2

Removed split package wireshark-dev

Modified:
  wireshark/trunk/PKGBUILD

----------+
 PKGBUILD |   26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-22 08:07:55 UTC (rev 156652)
+++ PKGBUILD	2012-04-22 13:24:13 UTC (rev 156653)
@@ -1,10 +1,10 @@
 # $Id$
 # Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
-pkgname=('wireshark-cli' 'wireshark-gtk' 'wireshark-dev')
+pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
 pkgver=1.6.7
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL2')
 makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'lua')
@@ -38,6 +38,14 @@
   chgrp 150 "${pkgdir}/usr/bin/dumpcap"
   chmod 754 "${pkgdir}/usr/bin/dumpcap"
   rm "${pkgdir}/usr/bin/wireshark"
+
+  # Headers
+  install -dm755 ${pkgdir}/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil}
+
+  install -m644 color.h config.h register.h "${pkgdir}/usr/include/${pkgbase}"
+  for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do
+    install -m644 ${d}/*.h ${pkgdir}/usr/include/${pkgbase}/${d}
+  done
 }
 
 package_wireshark-gtk() {
@@ -55,17 +63,3 @@
   done
   install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
 }
-
-package_wireshark-dev() {
-  pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - header files"
-  depends=('wireshark-cli')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  install -dm755 ${pkgdir}/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil}
-
-  install -m644 color.h config.h register.h "${pkgdir}/usr/include/${pkgbase}"
-  for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do
-    install -m644 ${d}/*.h ${pkgdir}/usr/include/${pkgbase}/${d}
-  done
-}