changelog & copyright for new upstream ver

2 files changed, 1 insertions, 35 deletions

diff --git a/debian/changelog b/debian/changelog
index 8d4e574..ce9ab1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-keysafe (0.20160927-1) UNRELEASED; urgency=medium
+keysafe (0.20161007-1) UNRELEASED; urgency=medium
 
   * Initial release (Closes: #834869).
 
diff --git a/debian/copyright b/debian/copyright
index 0c629eb..81a0a5b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,10 +7,6 @@ Files: *
 Copyright: (C) 2016 Joey Hess <id@joeyh.name>
 License: AGPL-3+
 
-Files: Crypto/Argon2.hs Crypto/Argon2/FFI.hsc
-Copyright: (C) 2016 Ollie Charles
-License: BSD-3-clause
-
 Files: Utility/*
 Copyright: (C) 2011-2015 Joey Hess <id@joeyh.name>
 License: BSD-2-clause
@@ -41,36 +37,6 @@ License: BSD-2-clause
  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:
- .
-     * Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
- .
-     * 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.
- .
-     * Neither the name of Ollie Charles nor the names of other
-       contributors may be used to endorse or promote products derived
-       from this software without specific prior written permission.
- .
- 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: AGPL-3
                      GNU AFFERO GENERAL PUBLIC LICENSE
                         Version 3, 19 November 2007