[cvs] dists/10.4/stable/main/finkinfo/net wireshark.info,1.10,1.11

[Max Horn]

Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/net
In directory vz-cvs-3.sog:/tmp/cvs-serv25642/net

Modified Files:
        wireshark.info 
Log Message:
Merge wireshark and wireshark-ssl (and remove dep on openssl)

Index: wireshark.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/wireshark.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- wireshark.info      17 Oct 2011 12:42:33 -0000      1.10
+++ wireshark.info      2 Nov 2011 16:07:16 -0000       1.11
@@ -15,7 +15,7 @@
 # maintainership of) the affected package.
 
 Package: wireshark
-Version: 1.6.2
+Version: 1.6.3
 Revision: 1
 Maintainer: Max Horn <m...@quendi.de>
 BuildDepends: <<
@@ -26,6 +26,10 @@
   fontconfig2-dev (>= 2.4.1-1),
   freetype219 (>= 2.3.5-1),
   glitz,
+  libgcrypt (>= 1.2.4-2),
+  gnutls26 (>= 2.2.2-3),
+  libtasn1-3,
+  libgpg-error,
   pkgconfig (>= 0.21-1),
   libpcap1,
   libcares2,
@@ -45,6 +49,9 @@
   xft2-dev
 <<
 Depends: <<
+  libgcrypt-shlibs (>= 1.2.4-2),
+  gnutls26-shlibs (>= 2.2.2-3),
+  libgpg-error-shlibs,
   libpcap1-shlibs,
   libcares2-shlibs,
   lua51-shlibs,
@@ -55,25 +62,22 @@
   pango1-xft2-ft219 (>= 1.18.4-4),
   libgettext8-shlibs
 <<
-Conflicts: wireshark, wireshark-ssl, ethereal (<< 1.0-1), ethereal-ssl (<< 
1.0-1)
-Replaces: wireshark, wireshark-ssl, ethereal (<< 1.0-1), ethereal-ssl (<< 
1.0-1)
+Conflicts: wireshark-ssl (<< 1.6.3-1), ethereal (<< 1.0-1), ethereal-ssl (<< 
1.0-1)
+Replaces: wireshark-ssl (<< 1.6.3-1), ethereal (<< 1.0-1), ethereal-ssl (<< 
1.0-1)
 Source: mirror:sourceforge:wireshark/wireshark-%v.tar.bz2
-Source-MD5: 301677b5f8150265315632fb6247e06e
+Source-MD5: 5012c75c379ffd47fbcf395d9a6e417e
 ConfigureParams: <<
   --mandir=%p/share/man \
   --with-lua=%p \
   --with-c-ares \
   --with-portaudio=%p \
-  --without-net-snmp \
-  --without-ucd-snmp \
   --without-libsmi \
   --without-adns \
   --without-geoip \
   --disable-usr-local \
-  --enable-gtk2 \
   --enable-dependency-tracking \
-  --without-gnutls \
-  --without-gcrypt \
+  --with-gnutls \
+  --with-gcrypt \
   --without-ssl \
   
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
 <<
@@ -103,12 +107,19 @@
 ability to view the reconstructed stream of a TCP session.
 <<
 DescPackaging: <<
-Although this package is licensed under the GPL, the -SSL variant is
-marked Restrictive since it links to OpenSSL.
-
 Might eventually link against and depend on geoip and libsmi.
 Since the former is not in stable and the latter is not maintained,
 I am not (yet) doing this.
 <<
 Homepage: http://www.wireshark.org
 License: GPL2
+#
+SplitOff: <<
+  Package: %N-ssl
+  Depends: %N (= %v-%r), fink-obsolete-packages
+  InstallScript: <<
+    mkdir -p %i/share/doc/installed-packages
+    touch %i/share/doc/installed-packages/%n
+  <<
+  Description: OBSOLETE use package '%N' instead
+<<


------------------------------------------------------------------------------
RSA&#174; Conference 2012
Save $700 by Nov 18
Register now&#33;
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs