[Python-modules-commits] r26593 - in packages/plainbox/trunk/debian (6 files)

Wed Nov 27 21:18:26 UTC 2013

Date: Wednesday, November 27, 2013 @ 21:18:25
  Author: zyga-guest
Revision: 26593

[svn-inject] Applying Debian modifications (0.4~b1-3) to trunk

Modified:
  packages/plainbox/trunk/debian/changelog
  packages/plainbox/trunk/debian/control
  packages/plainbox/trunk/debian/copyright
  packages/plainbox/trunk/debian/patches/01-add-main-module
  packages/plainbox/trunk/debian/patches/02-executable-laucher1
  packages/plainbox/trunk/debian/python3-plainbox.lintian-overrides

Modified: packages/plainbox/trunk/debian/changelog
===================================================================

--- packages/plainbox/trunk/debian/changelog	2013-11-27 20:55:50 UTC (rev 26592)
+++ packages/plainbox/trunk/debian/changelog	2013-11-27 21:18:25 UTC (rev 26593)
@@ -1,8 +1,17 @@
-plainbox (0.4~b1-3) unstable; urgency=low
+plainbox (0.4~b1-3) UNRELEASED; urgency=low
 
   * Initial release (Closes: #730568)
+  * debian/control: Changed chort description of each package to be unique
+  * debian/patches: Fix patches to apply cleanly
+  * debian/copyright: Clarify license for most files as GPL-3+, drop text
+  * debian/copyright: Clairfy signal.py license as GPL-3 (only)
+  * debian/copyright: Add funcsigs license
+  * debian/copyright: Add mock license
+  * debian/copyright: Add extcmd license
+  * debian/python3-plainbox.lintian-overrides: Remove override for licenses
+    removed by the 03-unvendorize patch.
 
- -- Zygmunt Krynicki <zygmunt.krynicki at canonical.com>  Tue, 26 Nov 2013 18:36:45 +0100
+ -- Zygmunt Krynicki <zygmunt.krynicki at canonical.com>  Wed, 27 Nov 2013 11:44:34 +0100
 
 plainbox (0.4~b1-2) unstable; urgency=low
 

Modified: packages/plainbox/trunk/debian/control
===================================================================
--- packages/plainbox/trunk/debian/control	2013-11-27 20:55:50 UTC (rev 26592)
+++ packages/plainbox/trunk/debian/control	2013-11-27 21:18:25 UTC (rev 26593)
@@ -59,7 +59,7 @@
  python3-requests (>= 1.1)
 Suggests:
  python3-xlsxwriter
-Description: toolkit for software and hardware integration testing
+Description: toolkit for software and hardware testing (python3 module)
  PlainBox is a toolkit consisting of python3 library, development tools,
  documentation and examples. It is targeted at developers working on testing or
  certification applications and authors creating tests for such applications.
@@ -88,7 +88,7 @@
 Depends:
  ${misc:Depends},
  ${sphinxdoc:Depends}
-Description: toolkit for software and hardware integration testing
+Description: toolkit for software and hardware testing (documentation)
  PlainBox is a toolkit consisting of python3 library, development tools,
  documentation and examples. It is targeted at developers working on testing or
  certification applications and authors creating tests for such applications.
@@ -114,7 +114,7 @@
 Architecture: all
 Depends: ${misc:Depends},
 Provides: plainbox-policy
-Description: toolkit for software and hardware integration testing
+Description: policykit policy required to use plainbox (secure version)
  PlainBox is a toolkit consisting of python3 library, development tools,
  documentation and examples. It is targeted at developers working on testing or
  certification applications and authors creating tests for such applications.
@@ -144,7 +144,7 @@
 Provides: plainbox-policy
 Conflicts: plainbox-policy
 Replaces: plainbox-policy
-Description: toolkit for software and hardware integration testing
+Description: policykit policy required to use plainbox (insecure version)
  PlainBox is a toolkit consisting of python3 library, development tools,
  documentation and examples. It is targeted at developers working on testing or
  certification applications and authors creating tests for such applications.

Modified: packages/plainbox/trunk/debian/copyright
===================================================================
--- packages/plainbox/trunk/debian/copyright	2013-11-27 20:55:50 UTC (rev 26592)
+++ packages/plainbox/trunk/debian/copyright	2013-11-27 21:18:25 UTC (rev 26593)
@@ -4,19 +4,22 @@
 
 Files: *
 Copyright: Copyright 2012-2013 Canonical Ltd.
+License: GPL-3+
+
+Files: plainbox/impl/signal.py
+Copyright: Copyright 2012 Canonical Ltd.
 License: GPL-3
- This package is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'.
+
+Files: plainbox/impl/vendor/extcmd/*
+Copyright:
+ Copyright (c) 2010-2012 Linaro Limited
+ Copyright (c) 2013 Canonical Ltd.
+License: GPL-3+
+
+Files: plainbox/impl/vendor/funcsigs/*
+Copyright: Copyright 2013 Aaron Iles
+License: Apache-2.0
+
+Files: plainbox/impl/vendor/mock.py
+Copyright: Copyright (C) 2007-2012 Michael Foord & the mock team
+License: BSD-3-clause

Modified: packages/plainbox/trunk/debian/patches/01-add-main-module
===================================================================
--- packages/plainbox/trunk/debian/patches/01-add-main-module	2013-11-27 20:55:50 UTC (rev 26592)
+++ packages/plainbox/trunk/debian/patches/01-add-main-module	2013-11-27 21:18:25 UTC (rev 26593)
@@ -7,6 +7,7 @@
 Bug: https://bugs.launchpad.net/checkbox/+bug/1255066
 Last-Update: 2013-11-26
 Forwarded: yes
+
 --- /dev/null
 +++ plainbox-0.4~b1/plainbox/__main__.py
 @@ -0,0 +1,33 @@

Modified: packages/plainbox/trunk/debian/patches/02-executable-laucher1
===================================================================
--- packages/plainbox/trunk/debian/patches/02-executable-laucher1	2013-11-27 20:55:50 UTC (rev 26592)
+++ packages/plainbox/trunk/debian/patches/02-executable-laucher1	2013-11-27 21:18:25 UTC (rev 26593)
@@ -8,19 +8,7 @@
 Bug: https://bugs.launchpad.net/checkbox/+bug/1255085
 Last-Update: 2013-11-26
 Forwarded: yes
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
 
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
 --- plainbox-0.4~b1.orig/plainbox/impl/secure/launcher1.py
 +++ plainbox-0.4~b1/plainbox/impl/secure/launcher1.py
 @@ -173,3 +173,7 @@ def main(argv=None):

Modified: packages/plainbox/trunk/debian/python3-plainbox.lintian-overrides
===================================================================
--- packages/plainbox/trunk/debian/python3-plainbox.lintian-overrides	2013-11-27 20:55:50 UTC (rev 26592)
+++ packages/plainbox/trunk/debian/python3-plainbox.lintian-overrides	2013-11-27 21:18:25 UTC (rev 26593)
@@ -1,5 +1,2 @@
 # image files are very specific to the application, they don't belong in /usr/share
 python3-plainbox binary: image-file-in-usr-lib
-
-# PlainBox has to keep a copy of vendorized library licenses
-python3-plainbox binary: extra-license-file


