[Pgp-tools-commit] r687 - trunk/debian

Guilhem Moulin guilhem-guest at moszumanska.debian.org
Tue Jul 15 22:39:44 UTC 2014


Author: guilhem-guest
Date: 2014-07-15 22:39:43 +0000 (Tue, 15 Jul 2014)
New Revision: 687

Modified:
   trunk/debian/changelog
   trunk/debian/copyright
Log:
Upgrade debian/copyright to the new format.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2014-07-09 07:22:14 UTC (rev 686)
+++ trunk/debian/changelog	2014-07-15 22:39:43 UTC (rev 687)
@@ -1,3 +1,11 @@
+signing-party (1.1.9-1) UNRELEASED; urgency=low
+
+  [ Guilhem Moulin ]
+  * debian.copyright:
+    + Upgragrade to the new, machine-readable, format.
+
+ -- Guilhem Moulin <guilhem at guilhem.org>  Wed, 16 Jul 2014 00:07:24 +0200
+
 signing-party (1.1.8-1) unstable; urgency=low
 
   [ Guilhem Moulin ]

Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright	2014-07-09 07:22:14 UTC (rev 686)
+++ trunk/debian/copyright	2014-07-15 22:39:43 UTC (rev 687)
@@ -1,158 +1,173 @@
-This package was debianized by Christoph Berg <cb at df7cb.de> on
-Mon, 16 May 2005 17:16:30 +0200.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: native package
 
-Availability:
-  Homepage:
-    http://pgp-tools.alioth.debian.org/
-  The package source is hosted in a subversion repository:
-    svn://svn.debian.org/pgp-tools/trunk/
+Files: *
+Copyright: © 2000, 2002, 2004-2006  Peter Palfrader <peter at palfrader.org>
+           © 2004-2008  Christoph Berg <cb at df7cb.de>
+           © 2001-2005  Simon Richter <sjr at debian.org>
+           © 2005-2008  Thijs Kinkhorst <thijs at debian.org>
+           © 2008-2011  Franck Joncourt <franck at debian.org>
+License: BSD-3-clause
 
-Authors and Copyright:
-  (c) 2000, 2002, 2004, 2005, 2006  Peter Palfrader <peter at palfrader.org>
-  (c) 2004  Uli Martens <uli at youam.net>
-  (c) 2004-2008  Christoph Berg <cb at df7cb.de>
-  (c) 2001-2005  Simon Richter <sjr at debian.org>
-  (c) 2005-2008  Thijs Kinkhorst <thijs at debian.org>
-  (c) 2000, 2002 Christian Kurz <shorty at debian.org>
+Files: caff/*
+Copyright: © 2004-2006  Peter Palfrader <peter at palfrader.org>
+           © 2005-2006  Christoph Berg <cb at df7cb.de>
+           © 2014  Guilhem Moulin <guilhem at guilhem.org>
+License: BSD-3-clause
 
-  sig2dot and springgraph were originally written by:
-  (c) 2002 Darxus at ChaosReigns.com
-  http://www.chaosreigns.com/code/sig2dot/
-  http://www.chaosreigns.com/code/springgraph/
-  Modifications by Kevin Rosenberg.
+Files: gpgdir/*
+Copyright: © 2002-2008  Michael B. Rash (mbr at cipherdyne.org)
+License: GPL-2+
+Comment: Downloaded from http://www.cipherdyne.com/gpgdir/ .
 
-  Other contributors:
-  Enrico Zini
-  Benjamin Hill
-  Philippe Teuwen
-  Franck Joncourt
+Files: gpg-key2ps/*
+Copyright: © 2001-2005  Simon Richter <sjr at debian.org>
+           © 2005-2008  Thijs Kinkhorst <thijs at debian.org>
+           © 2005-2008  Christoph Berg <cb at df7cb.de>
+License: GPL-2+
 
-License for caff and gpgsigs:
-  All rights reserved.
+Files: gpglist/*
+Copyright: © 2004  Uli Martens <uli at youam.net>
+           © 2005  Peter Palfrader <peter at palfrader.org>
+License: BSD-3-clause
 
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-  3. The name of the author may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
+Files: gpg-mailkeys/*
+Copyright: © 2001-2005  Simon Richter <sjr at debian.org>
+           © 2005  Thijs Kinkhorst <thijs at debian.org>
+License: GPL-2+
 
-  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Files: gpgparticipants/*
+Copyright: © 2008  Philippe Teuwen <phil at teuwen.org>
+License: GPL-2+
 
-Licence for gpg-key2ps, gpg-mailkeys, gpgparticipants, keylookup, sig2dot,
-and springgraph:
-  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.
+Files: gpgparticipants/gpgparticipants-prefill*
+Copyright: © 2013  Stefan Huber <shuber at sthu.org>
+           © 2014  Peter Palfrader <peter at palfrader.org>
+License: MIT
 
-  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.
+Files: gpgsigs/*
+Copyright: © 2004  Uli Martens <uli at youam.net>
+           © 2004-2005  Peter Palfrader <peter at palfrader.org>
+           © 2004-2007  Christoph Berg <cb at df7cb.de>
+           © 2014  Guilhem Moulin <guilhem at guilhem.org>
+License: BSD-3-clause
 
-  You should have received a copy of the GNU General Public License with
-  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
-  Fifth Floor, Boston, MA  02110-1301, USA
+Files: gpgwrap/*
+Copyright: © 2004-2006  Karsten Scheibler <gpgwrap at unusedino.de>
+License: GPL-2+
+Comment: Downloaded from http://unusedino.de/gpgwrap/ .
 
-License for keyanalyze:
-  This package was debianised by Matthew Wilcox <willy at debian.org> between
-  March and June of 2003.
+Files: keyanalyze/*
+Copyright: © 2001  M. Drew Streib <dtype at dtype.org>
+           © 1997-2000  Thomas Roessler <roessler at guug.de>
+           © 2001  Hal J. Burch <hburch at halport.lumeta.com>
+           © 2001  Matt Kraai <kraai at alumni.carnegiemellon.edu>
+           © 2001  Steve Langasek <vorlon at netexpress.net>
+           © 2003-2004  Matthew Wilcox <willy at debian.org>
+           © 1996-2000  Michael R. Elkins <me at cs.hmc.edu>
+License: GPL-2
+Comment: Downloaded from http://dtype.org/keyanalyze/code.php .
 
-  It was downloaded from http://dtype.org/keyanalyze/code.php
+Files: keylookup/*
+Copyright: © 2000, 2002  Christian Kurz <shorty at debian.org>
+           © 2000, 2002, 2005  Peter Palfrader <peter at palfrader.org>
+License: GPL-2+
 
-  The primary upstream author is M. Drew Streib <dtype at dtype.org>
+Files: sig2dot/*
+Copyright: © 2002  <Darxus at ChaosReigns.com>
+           © 2003, 2005  Kevin M. Rosenberg <kmr at debian.org>
+           © 2005-2006  Christoph Berg <cb at df7cb.de>
+License: GPL-2+
+Comment: Downloaded from http://www.chaosreigns.com/code/sig2dot/ .
 
-  Copyright:
+Files: springgraph/*
+Copyright: © 2002 <Darxus at ChaosReigns.com>
+           © 2003-2005  Kevin M. Rosenberg <kmr at debian.org>
+License: GPL-2+
+Comment: Downloaded from http://www.chaosreigns.com/code/springgraph/ .
 
-  This software is supplied under the terms of the GNU General Public
-  License version 2.
+Files: keyart/*
+Copyright: © 2014  Aaron Toponce <aaron.toponce at gmail.com>
+License:  BSD-2-clause
 
-  On Debian/GNU systems, this can be found as /usr/share/common-licenses/GPL-2.
+License: GPL-2+
+ The full text of version 2 of the GPL is distributed in
+ /usr/share/common-licenses/GPL-2 on Debian systems.
 
-License for gpgdir:
-  It was downloaded from http://www.cipherdyne.com/gpgdir/
+License: GPL-2
+ The full text of version 2 of the GPL is distributed in
+ /usr/share/common-licenses/GPL-2 on Debian systems.
 
-  Copyright: Copyright 2002-2009 by Michael B. Rash <mbr at cipherdyne.com>
+License: MIT
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
 
-  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. You can find a copy of it in your
-  Debian system under /usr/share/common-licenses/
+License: BSD-2-clause
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License for gpgwrap:
-  It was downloaded from http://unusedino.de/gpgwrap/
-
-  Copyright: Copyright 2004-2006 by Karsten Scheibler <gpgwrap at unusedino.de>
-
-  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. You can find a copy of it in your
-  Debian system under /usr/share/common-licenses/
-
-License for gpgparticipants-prefill:
-  Copyright 2013, Stefan Huber <shuber at sthu.org>
-
-  Permission is hereby granted, free of charge, to any person
-  obtaining a copy of this software and associated documentation
-  files (the "Software"), to deal in the Software without
-  restriction, including without limitation the rights to use,
-  copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the
-  Software is furnished to do so, subject to the following
-  conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-  OTHER DEALINGS IN THE SOFTWARE.
-
-License for keyart:
-  Copyright 2014, Aaron Toponce <aaron.toponce at gmail.com>
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are
-  met:
-
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the
-     distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+License: BSD-3-clause
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.




More information about the Pgp-tools-commit mailing list