aboutsummaryrefslogtreecommitdiffstats
path: root/COPYING
Commit message (Collapse)AuthorAgeFilesLines
* Always use html2text.py for FAQ, improve outputPeter Wu2015-03-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent commit broke compilation with Python 3. The original author of html2text.py is deceased and the fork has increased the number of files for this "simple" helper. The html2text.py script in this patch was rewritten and its output matches with lynx (except for a few newlines around lists). This means that indentation has been added for headings, paragraphs and lists. Also, since it was written from scratch, a new license could be chosen that matches Wireshark. Since now the in-tree html2text.py script provides nicer output, remove detection of the alternative programs (elinks, links). lynx/w3m is somehow still necessary for asciidoc though. (I also looked into reusing html2text.py for the release notes to replace asciidoc, but the --format=html output produces different output (HTML adds a ToC and section numbers). For now still require lynx for release notes) Tested with Python 2.6.6, 2.7.9, 3.2.6 and 3.4.3 under LC_ALL=C and LC_ALL=en_US.UTF-8 on Linux. Tested reading from stdin and file, writing to file, pipe and tty. Tested with cmake (Ninja) and autotools on Arch Linux x86_64. Test: # For each $PATH per python version, execute (with varying LC_ALL) help/faq.py -b | tools/html2text.py /dev/stdin | md5sum help/faq.py -b | tools/html2text.py | md5sum help/faq.py -b | tools/html2text.py help/faq.py -b | tools/html2text.py >/dev/null Change-Id: I6409450a3e6c8b010ca082251f9db7358b0cc2fd Reviewed-on: https://code.wireshark.org/review/7779 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Add a license-ignore for tools/html2text.pyEvan Huus2013-11-061-6/+9
| | | | | | | Update the preamble to COPYING to clarify that pidl isn't the only tool we carry which isn't GPLv2-compatible. svn path=/trunk/; revision=53108
* Update GPL-2 license in COPYINGJakub Zawadzki2012-06-281-13/+13
| | | | svn path=/trunk/; revision=43537
* Handle the Set Buffer Address command differently; this gets rid of theGuy Harris2010-05-131-44/+15
| | | | | | macro with the "give credit" license, so back that out of COPYING. svn path=/trunk/; revision=32798
* From Robert Hogan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4257 :Jeff Morriss2010-05-131-15/+44
| | | | | | | | | Correctly decode and display the buffer address in SBA orders. Note: This includes a macro with a new license which is added to COPYING. svn path=/trunk/; revision=32785
* Update the address to FSF from http://www.gnu.org/licenses/gpl-2.0.txtStig Bjørlykke2009-06-111-4/+3
| | | | svn path=/trunk/; revision=28694
* Address licensing questions as listed in roadmap.Jaap Keuter2008-12-241-5/+145
| | | | svn path=/trunk/; revision=27107
* Fix minor typoStephen Fisher2007-11-201-1/+1
| | | | svn path=/trunk/; revision=23514
* from Jörg Mayer: "a proposed change to the COPYING file"Ulf Lamping2007-11-201-10/+24
| | | | | | from ULFL: some minor changes to wording and alike svn path=/trunk/; revision=23507
* Add two sentences clarifying the license statement on pidl:Jörg Mayer2007-11-061-1/+3
| | | | | | | | | | As a notable exception the pidl utility at tools/pidl is covered by a "GPL version 3 or later" LICENSE. Note that only the tool itself is covered by this license, not the source code generated by it. The pidl authors do not consider that code a derived work of pidl. svn path=/trunk/; revision=23387
* Add a remark that the code under tools/pidl/ is coveredJörg Mayer2007-11-061-0/+6
| | | | | | by GPLv3 (inside the files it only says GPL). svn path=/trunk/; revision=23381
* Removed ^L as they turn up as a strange square in About->LicenseStig Bjørlykke2007-08-271-5/+5
| | | | svn path=/trunk/; revision=22682
* Update the summary at the top of the license text.Gerald Combs2007-05-161-5/+13
| | | | svn path=/trunk/; revision=21806
* eth->wsUlf Lamping2006-06-021-1/+1
| | | | svn path=/trunk/; revision=18315
* make the prefix "Just to avoid some misunderstandings..." a little bit more ↵Ulf Lamping2005-07-211-3/+2
| | | | | | NSIS installer friendly (without making it odd looking) svn path=/trunk/; revision=14979
* Prefix COPYING with the following textJörg Mayer2004-03-091-0/+9
| | | | | | | | | Just to avoid some misunderstandings: While parts of Ethereal can be built and distributed as libraries, these parts are still covered by the license below, and NOT by the Lesser General Public License or any other license. svn path=/trunk/; revision=10355
* * Copied in the correct GNU license (I'm such a goober)Gerald Combs1998-10-161-382/+240
| | | | | | | | | * Hacks to the filter interface (Gerald) * About box (Laurent) * AppleTalk support (Simon) * Mods to the match_strval routine (Gerald) svn path=/trunk/; revision=61
* Initial revisionstartethereal-0.3.15ethereal-0-3-15backups/ethereal@18706etherealGerald Combs1998-09-161-0/+482
svn path=/trunk/; revision=2