Commit Graph

30 Commits

Author SHA1 Message Date
Balint Reczey 18a54fcaa4 debian: Drop menu support
Debian is migrating away from the Debian Menu system to adopt
Freedesktop Desktop Entry Specification instead. (.desktop files)
Packages providing .desktop files should not provide menu files.
https://lists.debian.org/debian-devel-announce/2015/09/msg00000.html

Change-Id: I862deee870e9697c590a8323ba8ae2da892b7bb1
Reviewed-on: https://code.wireshark.org/review/11691
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-11 04:40:42 +00:00
Balint Reczey fd603f6f99 debian: Build .debs with Qt 5
Change-Id: I085d5332a0a1c8151b5781c0a94cffe2fe32aeb7
Reviewed-on: https://code.wireshark.org/review/10800
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-10-05 22:19:10 +00:00
Balint Reczey cd8eb6e92e debian: Enable parallel package build
Debian packages used to build with parallel build enabled when
debian/rules used autotools but with switching to CMake the
parallel build failed sometimes. Now the CMake based build
system seems to be working for parallel builds, too, thus
it seems to be safe to enable parallel building of .debs again.

Change-Id: I79003bf6c4b74640f24d907b763a5cc3da595e68
Reviewed-on: https://code.wireshark.org/review/10657
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-09-28 07:30:34 +00:00
Balint Reczey d4b3a96830 debian: Show hardening results after build
Change-Id: I121d264b86ecf9e0607e6fe00c2791a91d8fe974
Reviewed-on: https://code.wireshark.org/review/10656
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-27 16:15:00 +00:00
Balint Reczey 86f22c2161 Export all hardening options in .deb packages
Change-Id: I0448e564305ce78dee4ec364007e0162c6f74c09
Reviewed-on: https://code.wireshark.org/review/10644
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-09-25 14:11:56 +00:00
Maarten Bezemer cb345eb4bd Use LocatePythonModule to find make-dissector-reg.py in order to make UseMakeDissectorReg.cmake more generally (out-of-source) usable.
Add make-dissector-reg.py to the Debian packages.

Making it possible to generate out-of-source wireshark plugins.

Change-Id: I0bbe5b46205d39e229d31812341540b26a7336d6
Reviewed-on: https://code.wireshark.org/review/5802
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-18 07:42:39 +00:00
Gerald Combs 1ce64e75ab CMake: Make it easier to generate the release notes & NEWS.
Add convenience targets for generating the release notes and the NEWS
file. Make sure we don't run multiple instances of a2x + AsciiDoc at the
same time.

Add the docbook directory to the build by default unless we're running
Windows. Explain why we don't yet build docs on Windows. Make each
docbook makefile target optional.

Split the ENABLE_GUIDES option into ENABLE_HTML_GUIDES and
ENABLE_PDF_GUIDES. Add a default "all_guides" target if either is on.
Remove the Debian patch that hacked around the PDF requirement.

Copy ws.css to the docbook build directory. Don't build PDF release
notes. I'm not sure we ever used them and I don't want to install Java
and FOP just to make a release.

Change-Id: Ia2f710000c17f9e0b4b514fd373d9a5902889553
Reviewed-on: https://code.wireshark.org/review/5712
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-11 21:41:44 +00:00
Gerald Combs b7fb1167e3 Qt → wireshark. GTK+ → wireshark-gtk.
Make sure the Qt UI is named "Wireshark" and its executable is named
"wireshark" or "wireshark.exe". Make sure the GTK+ UI is named
"Wireshark 1" or "Wireshark (GTK+)" depending on how much the target
audience is likely to care about UI toolkits. Make sure the GTK+
executable is named "wireshark-gtk" or "wireshark-gtk.exe".

It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps
package. It's likely even more broken now.

Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake
1.11.3) at some point. The first attempt to compile in ui/qt returns
"error: source_file.cpp: No such file or directory". The second attempt
works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1).

Tested:

- Nmake builds

- NSIS packaging

- CMake builds (Windows, OS X)

- Autotools build and distcheck

- RPM packaging

To do:

- Test Debian packaging

- Fix PortableApps

Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2
Reviewed-on: https://code.wireshark.org/review/3919
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02 15:39:17 +00:00
Gerald Combs d31011572d Convert admon graphics to SVG.
Use a common set of SVG files for AsciiDoc / DocBook admonition
graphics. Put them in a common directory. According to
http://caniuse.com/svg all common browsers have had SVG support for
a while now.

The graphics themselves were created with Inkscape. If you would like
to refine them further you are more than welcome.

Use variables to assemble xsltproc commands in Autotools and Nmake
while we're here.

Try to update Debian rules to reflect ga92c3fb.

Change-Id: If82647af27a60117c517125dff0aca81c033be72
Reviewed-on: https://code.wireshark.org/review/3206
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-24 02:56:35 +00:00
Balint Reczey cb4ec166d8 .deb package format is 'native'
Change-Id: I2b52648c74290df0e98e4be31ac6c51db309eaaf
Reviewed-on: https://code.wireshark.org/review/2001
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-08 15:33:29 +00:00
Balint Reczey 97e1491aa8 Sync .deb packaging from Debian
The sync makes CMake the build system for the .deb package
and starts providing wireshark-qt in the wireshark-qt package.
The package structure, i.e. the libraries are shipped in separate
packages is also sync-ed.

Wireshark-qt uses the Qt 4 libraries, but it is easy to switch
it to Qt 5.

Change-Id: I849d18bdb8ca6ebf4072cf1d73d749080ac5dac2
Reviewed-on: https://code.wireshark.org/review/1986
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-08 15:32:10 +00:00
Balint Reczey 02a8e72b43 Generate wsicon32.xpm during building Debian package
svn path=/trunk/; revision=52773
2013-10-22 22:33:05 +00:00
Gerald Combs ce7c8bc9d7 Resurrect wsicon32.xpm using 'svn cp' then update it based on
wsicon32.png. This should hopefully preserve its history in SVN. Revert
r48565 in debian/.

svn path=/trunk/; revision=48639
2013-03-29 15:44:14 +00:00
Gerald Combs d1b87423df More icon updates.
Use the PNG versions of the new application icons.

Remove the XPM versions of the Wireshark application and capture icons.
To paraphrase Zoidberg, XPMs are bad and we should feel bad. Remove
xpm_to_widget_from_parent (which we weren't using and likely won't use
in the future).

Replace wiki_24.xpm (which was a GNOME or GTK+ stock icon IIRC) with the
16x16 and 24x24 versions emblem-web.png from GNOME icon theme 2.30.3.
This version was used specifically because it's GPLv2 and later versions
are GPLv3.

Update image/README.

svn path=/trunk/; revision=48565
2013-03-26 19:51:33 +00:00
Balint Reczey a8f543b56b Merge asn2deb and idl2deb from official Debian package
svn path=/trunk/; revision=48133
2013-03-06 13:31:08 +00:00
Jeff Morriss e54831aef1 Don't install idl2wrs except in Debian's special wireshark-dev package.
(Normal Wireshark installations can't be used to develop dissectors so there's
no need to install it or its man page.)

http://www.wireshark.org/lists/wireshark-dev/201206/msg00073.html

(The Debian changes are untested.)

svn path=/trunk/; revision=43370
2012-06-19 15:39:52 +00:00
Balint Reczey f15662eaa6 Unconditionally install idl2wrs
svn path=/trunk/; revision=39985
2011-11-22 13:53:17 +00:00
Balint Reczey f0642db264 hardcode /bin/sh to idl2wrs
svn path=/trunk/; revision=39984
2011-11-22 13:53:06 +00:00
Jaap Keuter 22768eeca9 Drop obsolete --enable-gtk2 CFLAG
Make fakeroot actually work by setting proper LD_LIBRARY_PATH

svn path=/trunk/; revision=29009
2009-07-08 05:24:55 +00:00
Stephen Fisher 412525b59d From Toralf Förster: Fix minor typo: MAde -> Made
svn path=/trunk/; revision=25407
2008-06-01 18:45:19 +00:00
Jaap Keuter 9323e90cc5 Update Debian packaging files for Wireshark 1.0.
These files build the package with all features and
minimum changes from the released sources.

svn path=/trunk/; revision=25406
2008-05-31 16:44:02 +00:00
Jaap Keuter 830903c56a From Frederic Peters:
Update of de Debian Packaging files from 0.99.2 to 0.99.6pre1.

svn path=/trunk/; revision=22238
2007-07-04 07:22:57 +00:00
Jörg Mayer 52e9a9c012 Frederic Peters <fpeters@debian.org>:
Update to match the current debian package


svn path=/trunk/; revision=18799
2006-07-27 17:15:34 +00:00
Tomas Kukosa 62179dd08f eicon3d*.xpm -> wsicon*.xpm
svn path=/trunk/; revision=18309
2006-06-02 05:43:38 +00:00
Gerald Combs eb71f7fb96 Rename the main executable to "wireshark", along with more conversions:
ethereal.com -> wireshark.org
  mailing lists and addresses
  ETHEREAL -> WIRESHARK
  Man pages
  Automake/Autoconf names


svn path=/trunk/; revision=18271
2006-05-31 19:12:15 +00:00
Gerald Combs 8958bab6de Tethereal/tethereal -> TShark/tshark.
svn path=/trunk/; revision=18268
2006-05-31 17:38:42 +00:00
Jörg Mayer 46c021dffd Aplly those parts of ethereal_0.10.12-3.diff.gz
from Debian, that change debian/


svn path=/trunk/; revision=15331
2005-08-13 05:55:06 +00:00
Ulf Lamping e7a72ba624 from Frederic Peters: bring debian package generation .deb up to date
I don't have the facility to test this, hopefully Frederic knows what he's doing :-) 

However, this was out of date since a long time ago, so can't get worse anyway...

svn path=/trunk/; revision=13754
2005-03-14 20:46:46 +00:00
Olivier Abad e0926b556a Update Debian packaging files. Ethereal is now split in 4 packages :
ethereal-common, ethereal, tethereal, ethereal-dev

svn path=/trunk/; revision=6513
2002-10-26 08:56:39 +00:00
Olivier Abad 744ab22245 Add a debian subdirectory and the files needed to generate a debian package.
The files were created by Frederic Peters <fpeters@debian.org>, the maintainer
of the ethereal debian package.
I just modified `rules' to use autogen.sh when building from a CVS tree.
Building a debian package is now very easy :
- in debian/changelog : change the version number (and replace my name with
                        yours)
- dpkg-buildpackage -rfakeroot -us -uc

svn path=/trunk/; revision=1569
2000-01-26 07:00:26 +00:00