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

Timothy Redaelli tredaelli at archlinux.org
Thu Nov 20 13:27:04 UTC 2014


    Date: Thursday, November 20, 2014 @ 14:27:04
  Author: tredaelli
Revision: 122833

archrelease: copy trunk to community-i686, community-x86_64

Added:
  wireshark/repos/community-i686/PKGBUILD
    (from rev 122832, wireshark/trunk/PKGBUILD)
  wireshark/repos/community-i686/wireshark-gtk.install
    (from rev 122832, wireshark/trunk/wireshark-gtk.install)
  wireshark/repos/community-i686/wireshark-qt.install
    (from rev 122832, wireshark/trunk/wireshark-qt.install)
  wireshark/repos/community-i686/wireshark.install
    (from rev 122832, wireshark/trunk/wireshark.install)
  wireshark/repos/community-x86_64/PKGBUILD
    (from rev 122832, wireshark/trunk/PKGBUILD)
  wireshark/repos/community-x86_64/wireshark-gtk.install
    (from rev 122832, wireshark/trunk/wireshark-gtk.install)
  wireshark/repos/community-x86_64/wireshark-qt.install
    (from rev 122832, wireshark/trunk/wireshark-qt.install)
  wireshark/repos/community-x86_64/wireshark.install
    (from rev 122832, wireshark/trunk/wireshark.install)
Deleted:
  wireshark/repos/community-i686/PKGBUILD
  wireshark/repos/community-i686/wireshark-gtk.install
  wireshark/repos/community-i686/wireshark-qt.install
  wireshark/repos/community-i686/wireshark.install
  wireshark/repos/community-x86_64/PKGBUILD
  wireshark/repos/community-x86_64/wireshark-gtk.install
  wireshark/repos/community-x86_64/wireshark-qt.install
  wireshark/repos/community-x86_64/wireshark.install

----------------------------------------+
 /PKGBUILD                              |  190 +++++++++++++++++++++++++++++++
 /wireshark-gtk.install                 |   24 +++
 /wireshark-qt.install                  |   22 +++
 /wireshark.install                     |   36 +++++
 community-i686/PKGBUILD                |   95 ---------------
 community-i686/wireshark-gtk.install   |   12 -
 community-i686/wireshark-qt.install    |   11 -
 community-i686/wireshark.install       |   18 --
 community-x86_64/PKGBUILD              |   95 ---------------
 community-x86_64/wireshark-gtk.install |   12 -
 community-x86_64/wireshark-qt.install  |   11 -
 community-x86_64/wireshark.install     |   18 --
 12 files changed, 272 insertions(+), 272 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-11-20 13:23:26 UTC (rev 122832)
+++ community-i686/PKGBUILD	2014-11-20 13:27:04 UTC (rev 122833)
@@ -1,95 +0,0 @@
-# $Id$
-# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
-# Contributor: Guillaume ALAUX <guillaume at archlinux.org>
-# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
-pkgname=('wireshark-cli' 'wireshark-gtk' 'wireshark-qt')
-pkgbase=wireshark
-pkgver=1.12.1
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL2')
-makedepends=('qt4' 'gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
-             'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
-url='http://www.wireshark.org/'
-source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('82b26bd416ec15903b27785e35a622687008a743342054e96eaaeaa249be584b')
-
-prepare() {
-  cd ${pkgbase}-${pkgver}
-  sed -i 's/$(AM_V_RCC)rcc/&-qt4/p' ui/qt/Makefile.am
-}
-
-build() {
-  cd ${pkgbase}-${pkgver}
-
-  ./autogen.sh
-  ./configure \
-      --prefix=/usr \
-      --with-qt \
-      --with-gtk3=yes \
-      --with-pcap \
-      --with-zlib \
-      --with-lua \
-      --with-portaudio \
-      --with-ssl \
-      --with-krb5
-  make all
-}
-
-package_wireshark-cli() {
-  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
-  depends=('krb5' 'libgcrypt' 'libcap' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua')
-  install=wireshark.install
-  conflicts=(wireshark)
-
-  cd ${pkgbase}-${pkgver}
-
-  make DESTDIR="${pkgdir}" install
-
-  #wireshark uid group is 150
-  chgrp 150 "${pkgdir}/usr/bin/dumpcap"
-  chmod 754 "${pkgdir}/usr/bin/dumpcap"
-  rm "${pkgdir}/usr/bin/wireshark" "${pkgdir}/usr/bin/wireshark-qt"
-
-  # Headers
-  install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes,wmem},wiretap,wsutil}
-
-  install -m644 color.h config.h register.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}"
-  for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes epan/wmem wiretap wsutil; do
-    install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgbase}/${d}
-  done
-}
-
-package_wireshark-gtk() {
-  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend'
-  depends=('gtk3' 'portaudio' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme')
-  install=wireshark-gtk.install
-  replaces=(wireshark)
-  conflicts=(wireshark)
-
-  cd ${pkgbase}-${pkgver}
-
-  install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
-  for d in 16 32 48; do
-    install -Dm644 image/hi${d}-app-wireshark.png  \
-                   "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png"
-  done
-
-  for d in 16 24 32 48 64 128 256 ; do
-    install -Dm644 image/WiresharkDoc-${d}.png \
-                   "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png"
-  done
-  install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
-}
-
-package_wireshark-qt() {
-  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - Qt frontend'
-  depends=('qt4' 'wireshark-cli')
-  install=wireshark-qt.install
-
-  cd ${pkgbase}-${pkgver}
-  install -Dm755 .libs/wireshark-qt "${pkgdir}/usr/bin/wireshark-qt"
-
-  install -d "${pkgdir}/usr/share/applications"
-  sed -e 's/^Name.*=Wireshark/& (QT)/g' -e '/Exec=/s/wireshark/&-qt/g' wireshark.desktop > "${pkgdir}/usr/share/applications/wireshark-qt.desktop"
-}

Copied: wireshark/repos/community-i686/PKGBUILD (from rev 122832, wireshark/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-11-20 13:27:04 UTC (rev 122833)
@@ -0,0 +1,95 @@
+# $Id$
+# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
+# Contributor: Guillaume ALAUX <guillaume at archlinux.org>
+# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
+pkgname=('wireshark-cli' 'wireshark-gtk' 'wireshark-qt')
+pkgbase=wireshark
+pkgver=1.12.2
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('qt4' 'gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
+             'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
+url='http://www.wireshark.org/'
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
+sha1sums=('0598fe285725f97045d7d08e6bde04686044b335')
+
+prepare() {
+  cd ${pkgbase}-${pkgver}
+  sed -i 's/$(AM_V_RCC)rcc/&-qt4/p' ui/qt/Makefile.am
+}
+
+build() {
+  cd ${pkgbase}-${pkgver}
+
+  ./autogen.sh
+  ./configure \
+      --prefix=/usr \
+      --with-qt \
+      --with-gtk3=yes \
+      --with-pcap \
+      --with-zlib \
+      --with-lua \
+      --with-portaudio \
+      --with-ssl \
+      --with-krb5
+  make all
+}
+
+package_wireshark-cli() {
+  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
+  depends=('krb5' 'libgcrypt' 'libcap' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua')
+  install=wireshark.install
+  conflicts=(wireshark)
+
+  cd ${pkgbase}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+
+  #wireshark uid group is 150
+  chgrp 150 "${pkgdir}/usr/bin/dumpcap"
+  chmod 754 "${pkgdir}/usr/bin/dumpcap"
+  rm "${pkgdir}/usr/bin/wireshark" "${pkgdir}/usr/bin/wireshark-qt"
+
+  # Headers
+  install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes,wmem},wiretap,wsutil}
+
+  install -m644 color.h config.h register.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}"
+  for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes epan/wmem wiretap wsutil; do
+    install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgbase}/${d}
+  done
+}
+
+package_wireshark-gtk() {
+  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend'
+  depends=('gtk3' 'portaudio' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme')
+  install=wireshark-gtk.install
+  replaces=(wireshark)
+  conflicts=(wireshark)
+
+  cd ${pkgbase}-${pkgver}
+
+  install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
+  for d in 16 32 48; do
+    install -Dm644 image/hi${d}-app-wireshark.png  \
+                   "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png"
+  done
+
+  for d in 16 24 32 48 64 128 256 ; do
+    install -Dm644 image/WiresharkDoc-${d}.png \
+                   "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png"
+  done
+  install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
+}
+
+package_wireshark-qt() {
+  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - Qt frontend'
+  depends=('qt4' 'wireshark-cli')
+  install=wireshark-qt.install
+
+  cd ${pkgbase}-${pkgver}
+  install -Dm755 .libs/wireshark-qt "${pkgdir}/usr/bin/wireshark-qt"
+
+  install -d "${pkgdir}/usr/share/applications"
+  sed -e 's/^Name.*=Wireshark/& (QT)/g' -e '/Exec=/s/wireshark/&-qt/g' wireshark.desktop > "${pkgdir}/usr/share/applications/wireshark-qt.desktop"
+}

Deleted: community-i686/wireshark-gtk.install
===================================================================
--- community-i686/wireshark-gtk.install	2014-11-20 13:23:26 UTC (rev 122832)
+++ community-i686/wireshark-gtk.install	2014-11-20 13:27:04 UTC (rev 122833)
@@ -1,12 +0,0 @@
-post_install() {
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: wireshark/repos/community-i686/wireshark-gtk.install (from rev 122832, wireshark/trunk/wireshark-gtk.install)
===================================================================
--- community-i686/wireshark-gtk.install	                        (rev 0)
+++ community-i686/wireshark-gtk.install	2014-11-20 13:27:04 UTC (rev 122833)
@@ -0,0 +1,12 @@
+post_install() {
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: community-i686/wireshark-qt.install
===================================================================
--- community-i686/wireshark-qt.install	2014-11-20 13:23:26 UTC (rev 122832)
+++ community-i686/wireshark-qt.install	2014-11-20 13:27:04 UTC (rev 122833)
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: wireshark/repos/community-i686/wireshark-qt.install (from rev 122832, wireshark/trunk/wireshark-qt.install)
===================================================================
--- community-i686/wireshark-qt.install	                        (rev 0)
+++ community-i686/wireshark-qt.install	2014-11-20 13:27:04 UTC (rev 122833)
@@ -0,0 +1,11 @@
+post_install() {
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: community-i686/wireshark.install
===================================================================
--- community-i686/wireshark.install	2014-11-20 13:23:26 UTC (rev 122832)
+++ community-i686/wireshark.install	2014-11-20 13:27:04 UTC (rev 122833)
@@ -1,18 +0,0 @@
-post_install() {
-    getent group wireshark >/dev/null 2>&1 ||  groupadd -g 150 wireshark &>/dev/null
-
-    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
-    echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group"
-}
-
-post_upgrade() {
-    getent group wireshark >/dev/null 2>&1 ||  groupadd -g 150 wireshark &>/dev/null
-
-    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
-}
-
-post_remove() {
-    if getent group wireshark >/dev/null 2>&1; then
-        groupdel wireshark
-    fi
-}

Copied: wireshark/repos/community-i686/wireshark.install (from rev 122832, wireshark/trunk/wireshark.install)
===================================================================
--- community-i686/wireshark.install	                        (rev 0)
+++ community-i686/wireshark.install	2014-11-20 13:27:04 UTC (rev 122833)
@@ -0,0 +1,18 @@
+post_install() {
+    getent group wireshark >/dev/null 2>&1 ||  groupadd -g 150 wireshark &>/dev/null
+
+    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+    echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group"
+}
+
+post_upgrade() {
+    getent group wireshark >/dev/null 2>&1 ||  groupadd -g 150 wireshark &>/dev/null
+
+    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+}
+
+post_remove() {
+    if getent group wireshark >/dev/null 2>&1; then
+        groupdel wireshark
+    fi
+}

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-11-20 13:23:26 UTC (rev 122832)
+++ community-x86_64/PKGBUILD	2014-11-20 13:27:04 UTC (rev 122833)
@@ -1,95 +0,0 @@
-# $Id$
-# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
-# Contributor: Guillaume ALAUX <guillaume at archlinux.org>
-# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
-pkgname=('wireshark-cli' 'wireshark-gtk' 'wireshark-qt')
-pkgbase=wireshark
-pkgver=1.12.1
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL2')
-makedepends=('qt4' 'gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
-             'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
-url='http://www.wireshark.org/'
-source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('82b26bd416ec15903b27785e35a622687008a743342054e96eaaeaa249be584b')
-
-prepare() {
-  cd ${pkgbase}-${pkgver}
-  sed -i 's/$(AM_V_RCC)rcc/&-qt4/p' ui/qt/Makefile.am
-}
-
-build() {
-  cd ${pkgbase}-${pkgver}
-
-  ./autogen.sh
-  ./configure \
-      --prefix=/usr \
-      --with-qt \
-      --with-gtk3=yes \
-      --with-pcap \
-      --with-zlib \
-      --with-lua \
-      --with-portaudio \
-      --with-ssl \
-      --with-krb5
-  make all
-}
-
-package_wireshark-cli() {
-  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
-  depends=('krb5' 'libgcrypt' 'libcap' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua')
-  install=wireshark.install
-  conflicts=(wireshark)
-
-  cd ${pkgbase}-${pkgver}
-
-  make DESTDIR="${pkgdir}" install
-
-  #wireshark uid group is 150
-  chgrp 150 "${pkgdir}/usr/bin/dumpcap"
-  chmod 754 "${pkgdir}/usr/bin/dumpcap"
-  rm "${pkgdir}/usr/bin/wireshark" "${pkgdir}/usr/bin/wireshark-qt"
-
-  # Headers
-  install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes,wmem},wiretap,wsutil}
-
-  install -m644 color.h config.h register.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}"
-  for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes epan/wmem wiretap wsutil; do
-    install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgbase}/${d}
-  done
-}
-
-package_wireshark-gtk() {
-  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend'
-  depends=('gtk3' 'portaudio' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme')
-  install=wireshark-gtk.install
-  replaces=(wireshark)
-  conflicts=(wireshark)
-
-  cd ${pkgbase}-${pkgver}
-
-  install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
-  for d in 16 32 48; do
-    install -Dm644 image/hi${d}-app-wireshark.png  \
-                   "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png"
-  done
-
-  for d in 16 24 32 48 64 128 256 ; do
-    install -Dm644 image/WiresharkDoc-${d}.png \
-                   "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png"
-  done
-  install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
-}
-
-package_wireshark-qt() {
-  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - Qt frontend'
-  depends=('qt4' 'wireshark-cli')
-  install=wireshark-qt.install
-
-  cd ${pkgbase}-${pkgver}
-  install -Dm755 .libs/wireshark-qt "${pkgdir}/usr/bin/wireshark-qt"
-
-  install -d "${pkgdir}/usr/share/applications"
-  sed -e 's/^Name.*=Wireshark/& (QT)/g' -e '/Exec=/s/wireshark/&-qt/g' wireshark.desktop > "${pkgdir}/usr/share/applications/wireshark-qt.desktop"
-}

Copied: wireshark/repos/community-x86_64/PKGBUILD (from rev 122832, wireshark/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-11-20 13:27:04 UTC (rev 122833)
@@ -0,0 +1,95 @@
+# $Id$
+# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
+# Contributor: Guillaume ALAUX <guillaume at archlinux.org>
+# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
+pkgname=('wireshark-cli' 'wireshark-gtk' 'wireshark-qt')
+pkgbase=wireshark
+pkgver=1.12.2
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('qt4' 'gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
+             'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
+url='http://www.wireshark.org/'
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
+sha1sums=('0598fe285725f97045d7d08e6bde04686044b335')
+
+prepare() {
+  cd ${pkgbase}-${pkgver}
+  sed -i 's/$(AM_V_RCC)rcc/&-qt4/p' ui/qt/Makefile.am
+}
+
+build() {
+  cd ${pkgbase}-${pkgver}
+
+  ./autogen.sh
+  ./configure \
+      --prefix=/usr \
+      --with-qt \
+      --with-gtk3=yes \
+      --with-pcap \
+      --with-zlib \
+      --with-lua \
+      --with-portaudio \
+      --with-ssl \
+      --with-krb5
+  make all
+}
+
+package_wireshark-cli() {
+  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
+  depends=('krb5' 'libgcrypt' 'libcap' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua')
+  install=wireshark.install
+  conflicts=(wireshark)
+
+  cd ${pkgbase}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+
+  #wireshark uid group is 150
+  chgrp 150 "${pkgdir}/usr/bin/dumpcap"
+  chmod 754 "${pkgdir}/usr/bin/dumpcap"
+  rm "${pkgdir}/usr/bin/wireshark" "${pkgdir}/usr/bin/wireshark-qt"
+
+  # Headers
+  install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes,wmem},wiretap,wsutil}
+
+  install -m644 color.h config.h register.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}"
+  for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes epan/wmem wiretap wsutil; do
+    install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgbase}/${d}
+  done
+}
+
+package_wireshark-gtk() {
+  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend'
+  depends=('gtk3' 'portaudio' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme')
+  install=wireshark-gtk.install
+  replaces=(wireshark)
+  conflicts=(wireshark)
+
+  cd ${pkgbase}-${pkgver}
+
+  install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
+  for d in 16 32 48; do
+    install -Dm644 image/hi${d}-app-wireshark.png  \
+                   "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png"
+  done
+
+  for d in 16 24 32 48 64 128 256 ; do
+    install -Dm644 image/WiresharkDoc-${d}.png \
+                   "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png"
+  done
+  install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
+}
+
+package_wireshark-qt() {
+  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - Qt frontend'
+  depends=('qt4' 'wireshark-cli')
+  install=wireshark-qt.install
+
+  cd ${pkgbase}-${pkgver}
+  install -Dm755 .libs/wireshark-qt "${pkgdir}/usr/bin/wireshark-qt"
+
+  install -d "${pkgdir}/usr/share/applications"
+  sed -e 's/^Name.*=Wireshark/& (QT)/g' -e '/Exec=/s/wireshark/&-qt/g' wireshark.desktop > "${pkgdir}/usr/share/applications/wireshark-qt.desktop"
+}

Deleted: community-x86_64/wireshark-gtk.install
===================================================================
--- community-x86_64/wireshark-gtk.install	2014-11-20 13:23:26 UTC (rev 122832)
+++ community-x86_64/wireshark-gtk.install	2014-11-20 13:27:04 UTC (rev 122833)
@@ -1,12 +0,0 @@
-post_install() {
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: wireshark/repos/community-x86_64/wireshark-gtk.install (from rev 122832, wireshark/trunk/wireshark-gtk.install)
===================================================================
--- community-x86_64/wireshark-gtk.install	                        (rev 0)
+++ community-x86_64/wireshark-gtk.install	2014-11-20 13:27:04 UTC (rev 122833)
@@ -0,0 +1,12 @@
+post_install() {
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: community-x86_64/wireshark-qt.install
===================================================================
--- community-x86_64/wireshark-qt.install	2014-11-20 13:23:26 UTC (rev 122832)
+++ community-x86_64/wireshark-qt.install	2014-11-20 13:27:04 UTC (rev 122833)
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: wireshark/repos/community-x86_64/wireshark-qt.install (from rev 122832, wireshark/trunk/wireshark-qt.install)
===================================================================
--- community-x86_64/wireshark-qt.install	                        (rev 0)
+++ community-x86_64/wireshark-qt.install	2014-11-20 13:27:04 UTC (rev 122833)
@@ -0,0 +1,11 @@
+post_install() {
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: community-x86_64/wireshark.install
===================================================================
--- community-x86_64/wireshark.install	2014-11-20 13:23:26 UTC (rev 122832)
+++ community-x86_64/wireshark.install	2014-11-20 13:27:04 UTC (rev 122833)
@@ -1,18 +0,0 @@
-post_install() {
-    getent group wireshark >/dev/null 2>&1 ||  groupadd -g 150 wireshark &>/dev/null
-
-    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
-    echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group"
-}
-
-post_upgrade() {
-    getent group wireshark >/dev/null 2>&1 ||  groupadd -g 150 wireshark &>/dev/null
-
-    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
-}
-
-post_remove() {
-    if getent group wireshark >/dev/null 2>&1; then
-        groupdel wireshark
-    fi
-}

Copied: wireshark/repos/community-x86_64/wireshark.install (from rev 122832, wireshark/trunk/wireshark.install)
===================================================================
--- community-x86_64/wireshark.install	                        (rev 0)
+++ community-x86_64/wireshark.install	2014-11-20 13:27:04 UTC (rev 122833)
@@ -0,0 +1,18 @@
+post_install() {
+    getent group wireshark >/dev/null 2>&1 ||  groupadd -g 150 wireshark &>/dev/null
+
+    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+    echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group"
+}
+
+post_upgrade() {
+    getent group wireshark >/dev/null 2>&1 ||  groupadd -g 150 wireshark &>/dev/null
+
+    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+}
+
+post_remove() {
+    if getent group wireshark >/dev/null 2>&1; then
+        groupdel wireshark
+    fi
+}


More information about the arch-commits mailing list