[Python-apps-commits] r1692 - in packages/mercurial/trunk/debian (changelog copyright)

[vdanjean at users.alioth.debian.org]

    Date: Tuesday, August 26, 2008 @ 13:30:05
  Author: vdanjean
Revision: 1692

Fix debian/copyright

Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/copyright

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2008-08-26 13:24:47 UTC (rev 1691)
+++ packages/mercurial/trunk/debian/changelog	2008-08-26 13:30:05 UTC (rev 1692)
@@ -1,3 +1,9 @@
+mercurial (1.0.1-5) unstable; urgency=low
+
+  * Fix debian/copyright (GPL-2 only and not GPL-2+) (Closes: #493967)
+
+ -- Vincent Danjean <vdanjean at debian.org>  Tue, 26 Aug 2008 15:28:20 +0200
+
 mercurial (1.0.1-4) unstable; urgency=low
 
   * fix subversion 1.5 compatibility (Closes: #492244)

Modified: packages/mercurial/trunk/debian/copyright
===================================================================
--- packages/mercurial/trunk/debian/copyright	2008-08-26 13:24:47 UTC (rev 1691)
+++ packages/mercurial/trunk/debian/copyright	2008-08-26 13:30:05 UTC (rev 1692)
@@ -1,32 +1,26 @@
-This package was debianized by Vincent Danjean <Vincent.Danjean at ens-lyon.org> on
-Fri, 29 Apr 2005 08:54:25 +0200.
+Format-Specification:
+    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=143
+Upstream-Name: mercurial
+Upstream-Source: http://www.selenic.com/mercurial/
 
-It was downloaded from http://www.selenic.com/mercurial/
+Files: *
+Copyright: Copyright 2005 Matt Mackall <mpm at selenic.com> and others.
+License: GPL-2
+ You can redistribute this software and/or modify it under the terms of
+ the GNU General Public License as published by the Free Software
+ Foundation; version 2 dated June, 1991.
+ .
+ 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.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-2 file.
 
-Copyright 2005 Matt Mackall <mpm at selenic.com>
-Copyright 2002-2004 Michael D. Stenner, Ryan Tomayko (byterange.py)
+Files: debian/*
+Copyright: Copyright 2005-2008, Vincent Danjean <vdanjean at debian.org>
+License: GPL-2
 
-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 can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is licensed under the GPL, see above, and has
-the following copyright:
-
-Copyright (C) 2005-2006  Vincent Danjean <Vincent.Danjean at ens-lyon.org>
+This package was debianized by Vincent Danjean <Vincent.Danjean at ens-lyon.org> on
+Fri, 29 Apr 2005 08:54:25 +0200.