add bugs to changelog

[debian/iodine.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index fd8ee74000d933be532c3527e475910a1dc570c1..accdf9e902f78b900a26e1ea3de6f90cb73d9870 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,15 @@
-Format-Specification:
- http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/

 Upstream-Name: iodine
 Upstream-Name: iodine

-Upstream-Maintainer: Bjorn Andersson <flex@kryo.se>, Erik Ekman <yarrick@kryo.se>
-Upstream-Source: http://code.kryo.se/iodine
+Upstream-Contact: Bjorn Andersson <flex@kryo.se>, Erik Ekman <yarrick@kryo.se>
+Source: http://code.kryo.se/iodine

 
 Files: *
 
 Files: *

-Copyright: © 2006-2007 Bjorn Andersson <flex@kryo.se>,
- Erik Ekman <yarrick@kryo.se>
+Copyright: 2006-2009, Bjorn Andersson <flex@kryo.se>
+ 2006-2009, Erik Ekman <yarrick@kryo.se>

 License: MIT
 
 Files: src/md5.*
 License: MIT
 
 Files: src/md5.*

-Copyright: © 1999, [2000, ]2002 Aladdin Enterprises.  All rights reserved.
+Copyright: 1999, [2000, ]2002 Aladdin Enterprises.  All rights reserved.

 License: other
  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
 License: other
  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages


@@ -31,15 +30,30 @@ License: other
  L. Peter Deutsch
  ghost@aladdin.com
 
  L. Peter Deutsch
  ghost@aladdin.com
 

+Files: src/common.c
+Copyright: 2006-2009, Bjorn Andersson <flex@kryo.se>
+ 2006-2009, Erik Ekman <yarrick@kryo.se>
+ 2007 Albert Lee <trisk@acm.jhu.edu>
+License: MIT
+

 Files: debian/*
 Files: debian/*

-Copyright:
- © 2007-2009, gregor herrmann <gregoa@debian.org>
- © 2007-2009, tony mancill <tmancill@debian.org>
+Copyright: 2007-2012, gregor herrmann <gregoa@debian.org>
+ 2007-2012, tony mancill <tmancill@debian.org>

 License: GPL-1+
 
 License: GPL-1+
 

-Files: debian/iodine-jigger
-Copyright: © 2008 Barak A. Pearlmutter <bap@debian.org>
+Files: debian/iodine-client-start
+Copyright: 2008, Barak A. Pearlmutter <bap@debian.org>

 License: MIT
 License: MIT

+Comment: git://github.com/barak/iodine-client-start.git
+
+License: GPL-1+
+ 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 1, or (at your option)
+ any later version.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'

 
 License: MIT
  Permission to use, copy, modify, and distribute this software for
 
 License: MIT
  Permission to use, copy, modify, and distribute this software for


@@ -56,11 +70,3 @@ License: MIT
  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 

-License: GPL-1+
- 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 1, or (at your option)
- any later version.
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'
-