[Python-apps-commits] r6622 - in packages/hg-git/trunk/debian (changelog control copyright)

[fqj1994-guest at users.alioth.debian.org]

    Date: Tuesday, February 8, 2011 @ 02:45:03
  Author: fqj1994-guest
Revision: 6622

some changes

Modified:
  packages/hg-git/trunk/debian/changelog
  packages/hg-git/trunk/debian/control
  packages/hg-git/trunk/debian/copyright

Modified: packages/hg-git/trunk/debian/changelog
===================================================================
--- packages/hg-git/trunk/debian/changelog	2011-02-07 22:59:42 UTC (rev 6621)
+++ packages/hg-git/trunk/debian/changelog	2011-02-08 02:45:03 UTC (rev 6622)
@@ -2,8 +2,10 @@
 
   * New upstream release.
   * Maintainer changed to Qijiang Fan(closes: #589961).
+  * Copyright has been updated.
+  * NEWS has been deleted.
 
- -- Qijiang Fan <fqj1994 at gmail.com>  Sun, 05 Dec 2010 12:12:00 +0800
+ -- Qijiang Fan <fqj1994 at gmail.com>  Sun, 08 Feb 2011 10:30:41 +0800
 
 hg-git (0.2.4-1) experimental; urgency=low
 

Modified: packages/hg-git/trunk/debian/control
===================================================================
--- packages/hg-git/trunk/debian/control	2011-02-07 22:59:42 UTC (rev 6621)
+++ packages/hg-git/trunk/debian/control	2011-02-08 02:45:03 UTC (rev 6622)
@@ -5,7 +5,7 @@
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7.0.8), python-support (>= 0.90)
 Standards-Version: 3.9.1
-XS-Python-Version: >= 2.5	
+XS-Python-Version: >= 2.5
 Homepage: http://hg-git.github.com/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/hg-git/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/hg-git/trunk/
@@ -13,7 +13,7 @@
 Package: mercurial-git
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, mercurial (>= 1.1), python-dulwich (>= 0.6)
-Description: Git plugin for Mercurial 
+Description: Git plugin for Mercurial
  The Hg-Git plugin for Mercurial adds the ability to push and pull to/from
  a Git server repository. This means you can collaborate on Git based
  projects from Mercurial, or use a Git server as a collaboration point
@@ -23,4 +23,3 @@
  another, so you can push via a Mercurial repository and another
  Mercurial client can pull it and their changeset node ids will be
  identical - Mercurial data does not get lost in translation.
-

Modified: packages/hg-git/trunk/debian/copyright
===================================================================
--- packages/hg-git/trunk/debian/copyright	2011-02-07 22:59:42 UTC (rev 6621)
+++ packages/hg-git/trunk/debian/copyright	2011-02-08 02:45:03 UTC (rev 6622)
@@ -4,29 +4,16 @@
 
 Files: *
 Copyright: 2010, Scott Chacon <schacon at gmail.com>
-License: GPL-2.0+
+License: GPL-2
 
 Files: tests/run-tests.py
 Copyright: 2006, Matt Mackall <mpm at selenic.com>
-License: GPL-2.0+
+License: GPL-2
 
 Files: debian/*
 Copyright: 2009, 2010, Jakub Wilk <jwilk at debian.org>
-License: GPL-2.0+
+License: GPL-2
 
-License: GPL-2.0+
- 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 program. If not, see <http://www.gnu.org/licenses/>
- .
+License: GPL-2
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2"