[SCM] qtbase packaging branch, experimental, updated. debian/5.2.1+dfsg-2-2-gf5fc93a

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Wed Mar 5 18:22:57 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=f5fc93a

The following commit has been merged in the experimental branch:
commit f5fc93a60647455e7c96ebcd504748c12a7976d7
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Mar 5 15:22:39 2014 -0300

    Add license to mark_private_symbols.
---
 debian/changelog               |  4 ++++
 debian/copyright               | 20 ++++++++++++++++++++
 debian/mark_private_symbols.sh | 20 ++++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f2afc9d..5308f3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtbase-opensource-src (5.2.1+dfsg-3) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add license to mark_private_symbols.sh and corresponding entry in
+    debian/copyright.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 05 Mar 2014 15:21:04 -0300
 
 qtbase-opensource-src (5.2.1+dfsg-2) experimental; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index 45260f8..ca46ae1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,6 +11,10 @@ Files: examples/* doc/src/snippets/* src/*/doc/snippets/* tests/manual/qlocale/*
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
 License: BSD-3-clause
 
+Files: debian/mark_private_symbols.sh
+Copyright: 2013 Sune Vuorela <sune at debian.org>
+License: Expat
+
 Files: debian/*
 Copyright: 2007-2013 Fathi Boudra <fabo at debian.org>
            2007-2013 Sune Vuorela <debian at pusling.com>
@@ -939,3 +943,19 @@ License: GFDL-1.3
  .
  On Debian systems, the complete text of the GFDL-1.3 license can be found in
  `/usr/share/common-licenses/GFDL-1.3`,
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
diff --git a/debian/mark_private_symbols.sh b/debian/mark_private_symbols.sh
index 7f0a0d3..e2d74e8 100755
--- a/debian/mark_private_symbols.sh
+++ b/debian/mark_private_symbols.sh
@@ -1,4 +1,24 @@
 #! /bin/sh
+# Copyright (c) 2013 Sune Vuorela <sune at debian.org>
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 PRIVATE_HEADERS=qtbase5-private-dev/usr/include
 

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list