Skip to content

Commit

Permalink
Update copyright file (make lintian happy)
Browse files Browse the repository at this point in the history
  • Loading branch information
mika committed Aug 17, 2009
1 parent 58dee06 commit ea31eec
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion debian/changelog
Expand Up @@ -52,6 +52,7 @@ grml-live (0.9.21) UNRELEASED; urgency=low
see http://wiki.debian.org/DebianGeoMirror for details.
Thanks for the idea, Marc Haber!
* Register grml-live html docs using doc-base.
* Update copyright file (make lintian happy).
* Software related changes:
- Add git-email to GRML_FULL (thanks to Joerg Woelke for mentioning).
- Add aesfix, aeskeyfind, bios-memimage, chaosreader, ext3grep, fatback,
Expand All @@ -70,7 +71,7 @@ grml-live (0.9.21) UNRELEASED; urgency=low
* Fix going back to GNU GRUB from ldbsd.com via alternative boot method;
while here, add the grml release info to the appropriate file.

-- Michael Prokop <mika@grml.org> Tue, 18 Aug 2009 00:30:26 +0200
-- Michael Prokop <mika@grml.org> Tue, 18 Aug 2009 00:33:48 +0200

grml-live (0.9.20) unstable; urgency=low

Expand Down
10 changes: 5 additions & 5 deletions debian/copyright
Expand Up @@ -5,9 +5,9 @@ It was downloaded from http://grml.org/

Upstream Author: Michael Prokop <mika@grml.org>

Copyright:
Copyright:

Copyright 2007++ Michael Prokop <mika@grml.org>
© 2007++ by Michael Prokop <mika@grml.org>

Copyright of /usr/share/grml-live/i386_files/boot/grub/splash.xpm.gz by
Robin Bakels <robin@crondor.net>, which is licensed under "GPL v2 or higher"
Expand All @@ -20,12 +20,12 @@ License:
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.

This package 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 package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Expand Down Expand Up @@ -72,5 +72,5 @@ License information for the pci.ids file shipped as
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.

The Debian packaging is (C) 2007, Michael Prokop <mika@grml.org> and
The Debian packaging is © 2007++, Michael Prokop <mika@grml.org> and
is licensed under the GPL, see above.

0 comments on commit ea31eec

Please sign in to comment.