[SCM] crtmpserver/master: Clean up tinyxml from copyright
jet-guest at users.alioth.debian.org
jet-guest at users.alioth.debian.org
Mon Apr 4 09:52:51 UTC 2011
The following commit has been merged in the master branch:
commit 0935d6d36c6dab39ce6a54dfb6c0ac7795a128f8
Author: Andriy Beregovenko <jet at jet.kiev.ua>
Date: Mon Apr 4 12:51:47 2011 +0300
Clean up tinyxml from copyright
diff --git a/debian/copyright b/debian/copyright
index 87ecee4..bacce00 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,10 +10,6 @@ Files: debian/*
Copyright: 2011 Andriy Beregovenko <jet at jet.kiev.ua>
License: GPL-3+
-Files: common/src/utils/tinyxml/* common/include/utils/tinyxml/*
-Copyright: 2000-2006 Lee Thomason
-License: zlib
-
Files: common/src/platform/solaris/timegm.cpp
common/src/platform/windows/strncasecmp.cpp
common/src/platform/windows/timegm.cpp
@@ -73,23 +69,3 @@ License: BSD-3-clause
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: 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 arising from the use of this software.
- .
- Permission is granted to anyone to use this software for any
- purpose, including commercial applications, and to alter it and
- redistribute it freely, subject to the following restrictions:
- .
- 1. The origin of this software must not be misrepresented; you must
- not claim that you wrote the original software. If you use this
- software in a product, an acknowledgment in the product documentation
- would be appreciated but is not required.
- .
- 2. Altered source versions must be plainly marked as such, and
- must not be misrepresented as being the original software.
- .
- 3. This notice may not be removed or altered from any source
- distribution.
--
crtmpserver packaging
More information about the pkg-multimedia-commits
mailing list