[med-svn] [Git][med-team/readerwriterqueue][master] | -> or in d/copyright

[Steffen Möller]

Steffen Möller pushed to branch master at Debian Med / readerwriterqueue


Commits:
8823dc7e by Steffen Möller at 2020-07-01T00:28:43+02:00
| -> or in d/copyright

- - - - -


1 changed file:

- debian/copyright


Changes:

=====================================
debian/copyright
=====================================
@@ -10,16 +10,21 @@ Files: benchmarks/ext/1024cores/
 Copyright: adapted from
             http://www.1024cores.net/home/lock-free-algorithms/queues/unbounded-spsc-queue
         and http://software.intel.com/en-us/articles/single-producer-single-consumer-queue
-License: Apache-2.0|BSD-2-clause
+License: Apache-2.0 or BSD-2-clause
 
 Files: benchmarks/ext/folly/ProducerConsumerQueue.h
 Copyright:  2013 Facebook, Inc.
 License: Apache-2.0
 
+Files: atomicops.h
+Copyright: 2013-2015 Cameron Desrochers  
+                     Jeff Preshing contributed semaphore implementation
+                     used in the blocking queue under the zlib license
+License: BSD-2-clause and zlib
 
 Files: debian/*
 Copyright: 2020 Steffen Moeller <moeller at debian.org>
-License: BSD-2-clause|Apache-2.0|zlib
+License: BSD-2-clause or Apache-2.0 or zlib
 
 License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,12 +42,6 @@ License: Apache-2.0
  On Debian systems the license is available at
  '/usr/share/common-licenses/Apache-2.0'.
 
-Files: atomicops.h
-Copyright: 2013-2015 Cameron Desrochers  
-                     Jeff Preshing contributed semaphore implementation
-                     used in the blocking queue under the zlib license
-License: BSD-2-clause|zlib
-
 License: zlib
  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages



View it on GitLab: https://salsa.debian.org/med-team/readerwriterqueue/-/commit/8823dc7e3570f7754d723013df565878598fbdf7

-- 
View it on GitLab: https://salsa.debian.org/med-team/readerwriterqueue/-/commit/8823dc7e3570f7754d723013df565878598fbdf7
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200630/97830fa3/attachment-0001.html>