New upstream release

[bcachefs-tools-debian] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 4ed68cc67cb3b0dc3adf3333077d466c18473b7b..3125db17e51cb5ed15b1e5769fd67b36ec91611a 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,16 +4,17 @@ Upstream-Contact: kmo@daterainc.com
 Source: https://evilpiepirate.org/git/bcachefs-tools.git
 
 Files: *
-Copyright: 2013-2019 Kent Overstreet <kmo@daterainc.com>
+Copyright: 2013-2020 Kent Overstreet <kmo@daterainc.com>
+           2013 Gabriel de Perthuis <g2p.code@gmail.com>
+           2008 Intel Corporation <willy@linux.intel.com>
 License: GPL-2
 
-Files: bcache-super-show.c
-Copyright: 2013 Gabriel de Perthuis <g2p.code@gmail.com>
-License: GPL-2
-
-Files: bcache.c
-Copyright: 1996-2001, PostgreSQL Global Development Group
-License: PostgreSQL
+Files: ccan/*
+Copyright: Copyright waived
+License: cc0-1.0
+ On Debian systems, the complete text of the Creative Commons CC0 1.0
+ Universal license (CC0-1.0) can be found in
+ "/usr/share/common-licenses/CC0-1.0".
 
 Files: ccan/darray/*
 Copyright: 2011 Joseph Adams <joeyadams3.14159@gmail.com>
@@ -36,15 +37,8 @@ License: expat
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 
-Files: ccan/*
-Copyright: Copyright waived
-License: cc0-1.0
- On Debian systems, the complete text of the Creative Commons CC0 1.0
- Universal license (CC0-1.0) can be found in
- "/usr/share/common-licenses/CC0-1.0".
-
 Files: debian/*
-Copyright: 2019 Jonathan Carter <jcc@debian.org>
+Copyright: 2019-2020 Jonathan Carter <jcc@debian.org>
            2014 Tom Strickx <tstrickx@rootcu.be>,
            2014 David Mohr <david@mcbf.net>
 License: GPL-2+
@@ -91,25 +85,3 @@ License: GPL-2+
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
-
-License: PostgreSQL
- Permission to use, copy, modify, and distribute this
- software and its documentation for any purpose, without fee,
- and without a written agreement is hereby granted, provided
- that the above copyright notice and this paragraph and the
- following two paragraphs appear in all copies.
- .
- IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO
- ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
- CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT
- OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
- THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
- .
- THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
- BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS
- TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
- MODIFICATIONS.