[Pkg-mediawiki-commits] r580 - geshi/trunk/debian

[Jan Dittberner]

Author: jandd
Date: 2016-05-06 07:32:51 +0000 (Fri, 06 May 2016)
New Revision: 580

Modified:
   geshi/trunk/debian/changelog
   geshi/trunk/debian/copyright
Log:
update debian/copyright, switch to DEP-5 format

Modified: geshi/trunk/debian/changelog
===================================================================
--- geshi/trunk/debian/changelog	2016-05-06 07:14:59 UTC (rev 579)
+++ geshi/trunk/debian/changelog	2016-05-06 07:32:51 UTC (rev 580)
@@ -9,6 +9,7 @@
   * Bump Standards-Version to 3.9.8 (no changes)
   * remove deprecated DEB_DH_BUILDDEB_ARGS in debian/rules
   * change Vcs-* to canonical URLs
+  * update debian/copyright, switch to DEP-5 format
 
  -- Jan Dittberner <jandd at debian.org>  Fri, 06 May 2016 08:37:57 +0200
 

Modified: geshi/trunk/debian/copyright
===================================================================
--- geshi/trunk/debian/copyright	2016-05-06 07:14:59 UTC (rev 579)
+++ geshi/trunk/debian/copyright	2016-05-06 07:32:51 UTC (rev 580)
@@ -1,37 +1,37 @@
-This package was debianized by Romain Beauxis <toots at rastageeks.org> on
-Tue, 11 Jul 2006 18:28:17 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://qbnz.com/highlighter/
+Upstream-Contact: Benny Baumann <BenBE at geshi.org>
 
-It was downloaded from http://qbnz.com/highlighter/
+Files: *
+Copyright:
+ Copyright 2004-2007 Nigel McNie <nigel at geshi.org>
+ Copyright 2007-2012 Benny Baumann <BenBE at geshi.org>
+License: GPL-2+
 
-Upstream Author: Nigel McNie <nigel at geshi.org>
+Files: debian/*
+Copyright:
+ Copyright 2008-2009 Romain Beauxis <toots at rastageeks.org>
+ Copyright 2012-2016 Jan Dittberner <jandd at debian.org>
+License: GPL-2+
 
-Copyright © 2004-2006 Nigel McNie
-	Other contributors are listed in THANKS file and in file headers.
-
-License:
-
-   This package 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 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
-
-On Debian systems, the complete text of the GNU General
-Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-
-The file geshi.php contains source code distributed under the GNU
-Lesser General Public License. 
-
-On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
-
-The Debian packaging is © 2006, Romain Beauxis <toots at rastageeks.org> and
-is licensed under the GPL, see above.
+License: GPL-2+
+ 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 2 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 package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'