diff options
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/copyright | 66 |
2 files changed, 39 insertions, 32 deletions
diff --git a/debian/changelog b/debian/changelog index 8607dfa..cfd7fb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,10 +14,11 @@ rbootd (3.0) unstable; urgency=medium * Drop trailing spaces in debian/rules file * Clean up rbootd init.d file, add status and LSB description * Add hardening flags - * Fix copyright tag in debian/copyright + * Fix copyright tag in debian/copyright, and wrong copyright statement for + the main source code * Fix copying changelog file in debian/rules - -- Helge Deller <deller@gmx.de> Thu, 15 Oct 2020 18:05:11 +0200 + -- Helge Deller <deller@gmx.de> Thu, 15 Oct 2020 23:35:39 +0200 rbootd (2.0-11) unstable; urgency=medium diff --git a/debian/copyright b/debian/copyright index 6ed7b36..3de927c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,37 +4,44 @@ Upstream-Contact: deller@gmx.de Source: https://git.kernel.org/pub/scm/linux/kernel/git/deller/rbootd.git/ Files: * -Copyright: (c) The Regents of the University of California. -All rights reserved. - -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 University nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. - -Copyright: 1988-2020 The University of Utah +Copyright: 1992, 1993 The Regents of the University of California. + 1988-2020 The University of Utah 1998 Peter Maydell <pmaydell@chiark.greenend.org.uk> 2020 Helge Deller <deller@gmx.de> -License: BSD-3-Clause +License: BSD-4-Clause + This code is derived from software contributed to Berkeley by + the Center for Software Science of the University of Utah Computer + Science Department. CSS requests users of this software to return + to css-dist@cs.utah.edu any improvements that they make and grant + CSS redistribution rights. + . + 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. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by the University of + California, Berkeley and its contributors. + 4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. Files: debian/* Copyright: 2020 Helge Deller <deller@gmx.de> @@ -64,4 +71,3 @@ License: BSD-3-Clause 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. - |