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

[vicho at users.alioth.debian.org]

    Date: Tuesday, July 21, 2015 @ 22:02:10
  Author: vicho
Revision: 12120

Update debian/copyright to match copyright-format 1.0

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

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2015-07-21 16:04:55 UTC (rev 12119)
+++ packages/mercurial/trunk/debian/changelog	2015-07-21 22:02:10 UTC (rev 12120)
@@ -1,6 +1,7 @@
 mercurial (3.5~rc1-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Update debian/copyright to match copyright-format 1.0
 
  -- Javi Merino <vicho at debian.org>  Tue, 21 Jul 2015 17:03:49 +0200
 

Modified: packages/mercurial/trunk/debian/copyright
===================================================================
--- packages/mercurial/trunk/debian/copyright	2015-07-21 16:04:55 UTC (rev 12119)
+++ packages/mercurial/trunk/debian/copyright	2015-07-21 22:02:10 UTC (rev 12120)
@@ -1,33 +1,33 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: mercurial
-Upstream-Source: http://www.selenic.com/mercurial/
+Source: http://www.selenic.com/mercurial/
 
 Files: *
-Copyright: Copyright 2005 Matt Mackall <mpm at selenic.com> and others.
+Copyright: 2005-2015, 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 or any later version.
+ 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.
+ 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.
+ 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'.
 
 Files: debian/*
-Copyright: Copyright 2005-2010, Vincent Danjean <vdanjean at debian.org>
+Copyright: 2005-2010, Vincent Danjean <vdanjean at debian.org>
+           2011-2015, Javi Merino <vicho at debian.org>
 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 or 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.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
+ [LICENSE TEXT]