aboutsummaryrefslogtreecommitdiffstats
path: root/COPYING
AgeCommit message (Collapse)AuthorFilesLines
2015-03-25Always use html2text.py for FAQ, improve outputPeter Wu1-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>
2013-11-06Add a license-ignore for tools/html2text.pyEvan Huus1-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
2012-06-28Update GPL-2 license in COPYINGJakub Zawadzki1-13/+13
svn path=/trunk/; revision=43537
2010-05-13Handle the Set Buffer Address command differently; this gets rid of theGuy Harris1-44/+15
macro with the "give credit" license, so back that out of COPYING. svn path=/trunk/; revision=32798
2010-05-13From Robert Hogan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4257 :Jeff Morriss1-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
2009-06-11Update the address to FSF from http://www.gnu.org/licenses/gpl-2.0.txtStig Bjørlykke1-4/+3
svn path=/trunk/; revision=28694
2008-12-24Address licensing questions as listed in roadmap.Jaap Keuter1-5/+145
svn path=/trunk/; revision=27107
2007-11-20Fix minor typoStephen Fisher1-1/+1
svn path=/trunk/; revision=23514
2007-11-20from Jörg Mayer: "a proposed change to the COPYING file"Ulf Lamping1-10/+24
from ULFL: some minor changes to wording and alike svn path=/trunk/; revision=23507
2007-11-06Add two sentences clarifying the license statement on pidl:Jörg Mayer1-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
2007-11-06Add a remark that the code under tools/pidl/ is coveredJörg Mayer1-0/+6
by GPLv3 (inside the files it only says GPL). svn path=/trunk/; revision=23381
2007-08-27Removed ^L as they turn up as a strange square in About->LicenseStig Bjørlykke1-5/+5
svn path=/trunk/; revision=22682
2007-05-16Update the summary at the top of the license text.Gerald Combs1-5/+13
svn path=/trunk/; revision=21806
2006-06-02eth->wsUlf Lamping1-1/+1
svn path=/trunk/; revision=18315
2005-07-21make the prefix "Just to avoid some misunderstandings..." a little bit more ↵Ulf Lamping1-3/+2
NSIS installer friendly (without making it odd looking) svn path=/trunk/; revision=14979
2004-03-09Prefix COPYING with the following textJörg Mayer1-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
1998-10-16* Copied in the correct GNU license (I'm such a goober)Gerald Combs1-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
1998-09-16Initial revisionGerald Combs1-0/+482
svn path=/trunk/; revision=2
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 11:38:32 +0000