[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. eda668423fa87898c59d1075118693714aa5a053

[Holger Levsen]

The following commit has been merged in the master branch:
commit 0a711ae790c17aa89227b7154468f7fc33603385
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Oct 10 10:13:23 2011 +0200

    debian/copyright: apply patch by Scott Schaefer to make it compliant with  DEP-5. Thanks Scott!

diff --git a/debian/changelog b/debian/changelog
index 3500141..152299a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ piuparts (0.42) UNRELEASED; urgency=low
   * piuparts-slave.py: Replace deprecated os.popen2 with subprocess.Popen,
     thanks to Scott Schaefer and Evgeni Golov for their patches. 
     (Closes: #640646)
+  * debian/copyright: apply patch by Scott Schaefer to make it compliant with 
+    DEP-5. Thanks Scott!
 
   [ Mika Pflüger ]
   * piuparts-analyze.py: Rewrite to use python-debianbts to analyze if bugs
diff --git a/debian/copyright b/debian/copyright
index 9548aca..5db4394 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,17 +1,35 @@
-This is piuparts, packaged for Debian by Lars Wirzenius <liw at iki.fi>.
-Original author is also Lars Wirzenius.
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: piuparts 
+Upstream-Contact: Holger Levsen <holger at debian.org> 
+Source: http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git
+Copyright: 2005-2008 Lars Wirzenius 
+           2008-2011 Holger Levsen 
+Comment: Original author is also Lars Wirzenius <liw at iki.fi>
+ Upstream is bunch of lunatics who don't make release tarballs publicly
+ available. The Debian .orig.tar.gz is what would be released, though.
 
-Upstream source repository: http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git
-Upstream is bunch of lunatics who don't make release tarballs publicly
-available. The Debian .orig.tar.gz is what would be released, though.
+Files: *
+Copyright: 2005-2008 Lars Wirzenius <liw at iki.fi> 
+           2008-2011 Holger Levsen <holger at debian.org> 
+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'.
 
-Copyright (C) 2005-2008 Lars Wirzenius and others
-
-piuparts is free software.  You may copy it according to the
-GNU General Public License, version 2, or at your option, any
-later version. A copy of the license is not included, but you
-can get one from most FTP sites that have GNU software, for 
-example, prep.ai.mit.edu.
-
-On a Debian GNU/Linux system, the GPL version 2 can be found in
-/usr/share/common-licenses/GPL-2.

-- 
piuparts git repository