rename {03_,}cflags.patch

[debian/iodine.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 24704c28165a9089e7cd52544b1e89edfeb53ceb..7de562a5bd9f0d64ad955a4c9e180100b71a1650 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,22 +1,15 @@
-Upstream source location: http://code.kryo.se/iodine
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: 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
 License: MIT

- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
- .
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 
 Files: src/md5.*
 
 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


@@ -37,10 +30,43 @@ 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, gregor herrmann <gregor+debian@comodo.priv.at>
- © 2007, tony mancill <tmancill@debian.org>
-License: GPL1+
+Copyright: 2007-2011, gregor herrmann <gregoa@debian.org>
+ 2007-2011, tony mancill <tmancill@debian.org>
+License: GPL-1+
+
+Files: debian/iodine-client-start
+Copyright: 2008, Barak A. Pearlmutter <bap@debian.org>
+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
+ any purpose with or without fee is hereby granted, provided that
+ the above copyright notice and this permission notice appear in
+ all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 
 

-See `/usr/share/common-licenses/GPL'.