summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2016-10-12 21:57:00 +0900
committerDaniel Silverstone <dsilvers@digital-scurf.org>2016-10-12 21:57:00 +0900
commit9bedff813ab1db7bf2d50cd105eae066e2b8d6aa (patch)
tree52fd450a7cec7e1d044456761af773b8823b6508
parent6532b4f2be79b83e351289a2d5cee8e37f0c534a (diff)
downloaddebian-9bedff813ab1db7bf2d50cd105eae066e2b8d6aa.tar.bz2
Tweak copyright1.1-2
-rw-r--r--changelog3
-rw-r--r--copyright16
2 files changed, 9 insertions, 10 deletions
diff --git a/changelog b/changelog
index 087f72c..5217c1f 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
lua-scrypt (1.1-2) unstable; urgency=medium
* Added Multi-Arch markers.
+ * Tweak copyright to be cleaner (it's BSD not ISC for a start)
- -- Daniel Silverstone <dsilvers@digital-scurf.org> Wed, 12 Oct 2016 21:02:18 +0900
+ -- Daniel Silverstone <dsilvers@digital-scurf.org> Wed, 12 Oct 2016 21:03:51 +0900
lua-scrypt (1.1-1) unstable; urgency=medium
diff --git a/copyright b/copyright
index 89c9fe4..6754d06 100644
--- a/copyright
+++ b/copyright
@@ -4,7 +4,7 @@ Source: https://git.gitano.org.uk/lua-scrypt.git/
Files: *
Copyright: Copyright 2015 Daniel Silverstone <dsilvers@digital-scurf.org>
-License: ISC
+License: BSD-3-clause
Copyright 2015 Daniel Silverstone <dsilvers@digital-scurf.org>
All rights reserved.
.
@@ -35,6 +35,12 @@ License: ISC
Files: base64.c base64.h
Copyright: Copyright (c) 1994-2006 Lars Wirzenius. All rights reserved.
License: BSD-2-clause
+
+Files: debian/*
+Copyright: Copyright 2015 Daniel Silverstone <dsilvers@digital-scurf.org>
+License: BSD-2-clause
+
+License: BSD-2-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -58,11 +64,3 @@ License: BSD-2-clause
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.
-
-Files: debian/*
-Copyright: Copyright 2015 Daniel Silverstone <dsilvers@digital-scurf.org>
-License: permissive
- Copying and distribution of this package, with or without
- modification, are permitted in any medium without royalty
- provided the copyright notice and this notice are
- preserved.