update year in license, fix debian/copyright

diff --git a/LICENSE b/LICENSE
index 671f20c476a84f2736b5a60ab6f346a1efb9dd3e..443c88a8b00e70258c587e5cc9ddb28312e1d30d 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013 Michael Gernoth <michael@gernoth.net>
+Copyright (c) 2013-2015 Michael Gernoth <michael@gernoth.net>

 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/debian/copyright b/debian/copyright
index 491625819bbabd4c4960310219d79961c3ae2f0a..b78ae749afb9abdccaab9be7bbfbd35076059a95 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,22 +1,30 @@
 Format: http://dep.debian.net/deps/dep5
 Upstream-Name: hmcfgusb
 Format: http://dep.debian.net/deps/dep5
 Upstream-Name: hmcfgusb

+Upstream-Contact: Michael Gernoth <michael@gernoth.net>

 Source: <http://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb>
 
 Files: *
 Source: <http://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb>
 
 Files: *

-Copyright: 2013 Michael Gernoth <michael@gernoth.net>
-License: Open Source
+Copyright: 2013-2015 Michael Gernoth <michael@gernoth.net>
+License: Expat

   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:
   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 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
   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.
\ No newline at end of file
+  IN THE SOFTWARE.
+
+Files: aes.*
+Copyright: No copyright assigned by Brad Conte (brad AT bradconte.com)
+License: public-domain
+  This code is presented "as is" without any guarantees.