Re: [Gnash-commit] gnash ChangeLog Makefile.am configure.ac backen...

[Bastiaan Jacques]

On Thu, 27 Sep 2007, Tomas Groth wrote:

> Index: libmedia/AudioDecoderNellymoser.cpp
> ===================================================================
> RCS file: libmedia/AudioDecoderNellymoser.cpp
> diff -N libmedia/AudioDecoderNellymoser.cpp
> --- /dev/null   1 Jan 1970 00:00:00 -0000
> +++ libmedia/AudioDecoderNellymoser.cpp 27 Sep 2007 23:59:52 -0000      1.1
> @@ -0,0 +1,823 @@
> +// AudioDecoderNellymoser.cpp: Nellymoser decoding
> +//
> +//   Copyright (C) 2007 Free Software Foundation, Inc.
> +//
> +// This program is free software; you can redistribute it and/or modify
> +// it under the terms of the GNU General Public License as published by
> +// the Free Software Foundation; either version 3 of the License, or
> +// (at your option) any later version.
> +//
> +// This program is distributed in the hope that it will be useful,
> +// but WITHOUT ANY WARRANTY; without even the implied warranty of
> +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +// GNU General Public License for more details.
> +//
> +// You should have received a copy of the GNU General Public License
> +// along with this program; if not, write to the Free Software
> +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
> +//
> +
> +// Original copyright notice:

In http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html 
, the
Software Freedom Law Center suggests that you use the following sentence:

"This file incorporates work covered by the following copyright and permission 
notice:"

> +
> +/*
> + * Copyright (c) 2007 a840bda5870ba11f19698ff6eb9581dfb0f95fa5,
> + *                    539459aeb7d425140b62a3ec7dbf6dc8e408a306, and
> + *                    520e17cd55896441042b14df2566a6eb610ed444

That's an interesting set of author names...

> Index: libmedia/Makefile.in
> ===================================================================

Hm... I assume this file was unintentionally checked in?

Bastiaan