merge improvements from debian/copyright

COPYRIGHT

@@ -1,14 +1,19 @@
-Format: http:https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Source: native package
+Format: https:https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: git:https://git-repair.branchable.com/
 
 Files: *
 Copyright: © 2013-2019 Joey Hess <[email protected]>
 License: AGPL-3+
 
 Files: Utility/*
-Copyright: 2012-2019 Joey Hess <[email protected]>
+Copyright: 2012-2014 Joey Hess <[email protected]>
 License: BSD-2-clause
 
+Files: Utility/Attoparsec.hs
+Copyright: (C) 2019 Joey Hess <[email protected]>
+ (C) 2007-2015 Bryan O'Sullivan
+License: BSD-3-clause
+
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -31,6 +36,34 @@ License: BSD-2-clause
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
+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. Neither the name of the author nor the names of his contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE 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 AUTHORS 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