[SCM] qtquick1 packaging branch, master, updated. debian/5.2.1-2-2-g18693dc
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Tue Mar 25 14:18:39 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtquick1.git;a=commitdiff;h=18693dc
The following commit has been merged in the master branch:
commit 18693dcc13dbaf826e53ad8ec51ee61e09608b7d
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Wed Mar 5 15:27:16 2014 -0300
Add license to mark_private_symbols.sh.
---
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 410e2e5..c53d4e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
qtquick1-opensource-src (5.2.1-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:25:41 -0300
qtquick1-opensource-src (5.2.1-2) experimental; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index 4b14384..f53905e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,10 @@ Files: *
Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+Files: debian/mark_private_symbols.sh
+Copyright: 2013 Sune Vuorela <sune at debian.org>
+License: Expat
+
Files: debian/*
Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
2007-2012 Sune Vuorela <debian at pusling.com>
@@ -141,3 +145,19 @@ License: GFDL-NIV-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 3f46ec2..2a01ce9 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=qtquick1-5-private-dev/usr/include
--
qtquick1 packaging
More information about the pkg-kde-commits
mailing list