[Python-modules-commits] r28469 - in packages/plainbox/trunk/debian (5 files)

zyga-guest at users.alioth.debian.org zyga-guest at users.alioth.debian.org
Mon Apr 7 09:28:50 UTC 2014


    Date: Monday, April 7, 2014 @ 09:28:48
  Author: zyga-guest
Revision: 28469

* debian/control: drop build and runtime dependency on python3-requests
* debian/copyright: move python license to dedicated license section (reused
  by three modules) per example 2 on http://dep.debian.net/deps/dep5/
* debian/rules: move plainbox/data and plainbox/test-data to
  /usr/share/python3-plainbox/ and use symlinks to keep original directories
  available. 
  https://launchpad.net/plainbox/+milestone/0.5.3

Added:
  packages/plainbox/trunk/debian/python3-plainbox.links
Modified:
  packages/plainbox/trunk/debian/changelog
  packages/plainbox/trunk/debian/control
  packages/plainbox/trunk/debian/copyright
  packages/plainbox/trunk/debian/rules

Modified: packages/plainbox/trunk/debian/changelog
===================================================================
--- packages/plainbox/trunk/debian/changelog	2014-04-05 00:06:11 UTC (rev 28468)
+++ packages/plainbox/trunk/debian/changelog	2014-04-07 09:28:48 UTC (rev 28469)
@@ -1,14 +1,21 @@
-plainbox (0.5.2-1) UNRELEASED; urgency=medium
+plainbox (0.5.3-1) UNRELEASED; urgency=medium
 
   * New upstream release
   * debian/control: make python3-plainbox, plainbox, plainbox-secure-policy
     and plainbox-insecure-policy all depend on one version on themselves.
     LP: #1298284
   * debian/control: break python3-checkbox-ng << 0.3
+  * debian/control: drop build and runtime dependency on python3-requests
   * debian/copyright: add entry for new file (_shlex.py)
+  * debian/copyright: move python license to dedicated license section (reused
+    by three modules) per example 2 on http://dep.debian.net/deps/dep5/
   * debian/rules: regenerate translation templates 
+  * debian/rules: move plainbox/data and plainbox/test-data to
+    /usr/share/python3-plainbox/ and use symlinks to keep original directories
+    available. 
   * List of fixed bugs:
     https://launchpad.net/checkbox/+milestone/plainbox-0.5.2
+    https://launchpad.net/plainbox/+milestone/0.5.3
 
  -- Zygmunt Krynicki <zygmunt.krynicki at canonical.com>  Tue, 01 Apr 2014 01:36:20 +0200
 

Modified: packages/plainbox/trunk/debian/control
===================================================================
--- packages/plainbox/trunk/debian/control	2014-04-05 00:06:11 UTC (rev 28468)
+++ packages/plainbox/trunk/debian/control	2014-04-07 09:28:48 UTC (rev 28469)
@@ -11,7 +11,6 @@
  python3-docutils,
  python3-lxml,
  python3-pkg-resources,
- python3-requests ( >= 1.1),
  python3-setuptools,
  python3-sphinx,
 Standards-Version: 3.9.5
@@ -60,7 +59,6 @@
  policykit-1,
  python3-lxml,
  python3-pkg-resources,
- python3-requests (>= 1.1),
 Suggests:
  python3-xlsxwriter
 Breaks:

Modified: packages/plainbox/trunk/debian/copyright
===================================================================
--- packages/plainbox/trunk/debian/copyright	2014-04-05 00:06:11 UTC (rev 28468)
+++ packages/plainbox/trunk/debian/copyright	2014-04-07 09:28:48 UTC (rev 28469)
@@ -113,56 +113,13 @@
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Files: plainbox/impl/_argparse.py
 Files: plainbox/vendor/argparse/*.py
-Copyright:
- Steven J. Bethard <steven.bethard at gmail.com>.
+Copyright: Steven J. Bethard <steven.bethard at gmail.com>.
 License: Python Software Foundation License Version 2 
- PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
- --------------------------------------------
- . 
- 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"),
-    and the Individual or Organization ("Licensee") accessing and otherwise
-    using this software ("Python") in source or binary form and its associated
-    documentation.
- . 
- 2. Subject to the terms and conditions of this License Agreement, PSF hereby
-    grants Licensee a nonexclusive, royalty-free, world-wide license to
-    reproduce, analyze, test, perform and/or display publicly, prepare
-    derivative works, distribute, and otherwise use Python alone or in any
-    derivative version, provided, however, that PSF's License Agreement and
-    PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004,
-    2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Python Software
-    Foundation; All Rights Reserved" are retained in Python alone or in any
-    derivative version prepared by Licensee.
- . 
- 3. In the event Licensee prepares a derivative work that is based on or
-    incorporates Python or any part thereof, and wants to make the derivative
-    work available to others as provided herein, then Licensee hereby agrees
-    to include in any such work a brief summary of the changes made to Python.
- . 
- 4. PSF is making Python available to Licensee on an "AS IS" basis.  PSF MAKES
-    NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED.  BY WAY OF EXAMPLE,
-    BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR
-    WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
-    THE USE OF PYTHON WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
- . 
- 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON FOR ANY
-    INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
-    MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY DERIVATIVE
-    THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
- . 
- 6. This License Agreement will automatically terminate upon a material breach
-    of its terms and conditions.
- . 
- 7. Nothing in this License Agreement shall be deemed to create any
-    relationship of agency, partnership, or joint venture between PSF and
-    Licensee.  This License Agreement does not grant permission to use PSF
-    trademarks or trade name in a trademark sense to endorse or promote
-    products or services of Licensee, or any third party.
- . 
- 8. By copying, installing or otherwise using Python, Licensee agrees to be
-    bound by the terms and conditions of this License Agreement.
+
+Files: plainbox/impl/_argparse.py
+Copyright: Steven J. Bethard <steven.bethard at gmail.com>.
+License: Python Software Foundation License Version 2 
  
 Files: plainbox/impl/_shlex.py
 Copyright:
@@ -172,6 +129,8 @@
  Posix compliance, split(), string arguments, and
  iterator interface by Gustavo Niemeyer, April 2003.
 License: Python Software Foundation License Version 2 
+
+License: Python Software Foundation License Version 2 
  PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
  --------------------------------------------
  . 

Added: packages/plainbox/trunk/debian/python3-plainbox.links
===================================================================
--- packages/plainbox/trunk/debian/python3-plainbox.links	                        (rev 0)
+++ packages/plainbox/trunk/debian/python3-plainbox.links	2014-04-07 09:28:48 UTC (rev 28469)
@@ -0,0 +1,2 @@
+usr/share/python3-plainbox/data /usr/lib/python3/dist-packages/plainbox/data
+usr/share/python3-plainbox/test-data /usr/lib/python3/dist-packages/plainbox/test-data

Modified: packages/plainbox/trunk/debian/rules
===================================================================
--- packages/plainbox/trunk/debian/rules	2014-04-05 00:06:11 UTC (rev 28468)
+++ packages/plainbox/trunk/debian/rules	2014-04-07 09:28:48 UTC (rev 28469)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 export PYBUILD_NAME=plainbox
+export LANG=
+export LANGUAGE=
 export NO_PNG_PKG_MANGLE=1
 
 %:
@@ -15,12 +17,17 @@
 	# Build stubbox translations
 	PYTHONPATH=. ./plainbox/impl/providers/stubbox/manage.py i18n
 
-# Override dh_install to ensure that /usr/bin/plainbox is in the 
-# plainbox package and not in the python3-plainbox package.
+# Override dh_install to ensure that /usr/bin/plainbox is in the plainbox
+# package and not in the python3-plainbox package. Also move the data and
+# test-data directories to usr/share and provide symlinks (via
+# python3-plainbox.links) for everything to work.
 override_dh_install:
 	dh_install
 	mkdir -p debian/plainbox/usr/bin
+	mkdir -p debian/python3-plainbox/usr/share/python3-plainbox/
 	mv debian/python3-plainbox/usr/bin/plainbox debian/plainbox/usr/bin/
+	mv debian/python3-plainbox/usr/lib/$(shell py3versions -d)/dist-packages/plainbox/data debian/python3-plainbox/usr/share/python3-plainbox/
+	mv debian/python3-plainbox/usr/lib/$(shell py3versions -d)/dist-packages/plainbox/test-data debian/python3-plainbox/usr/share/python3-plainbox/
 
 # Override dh_clean to remove stubbox's translation directory
 override_dh_clean:




More information about the Python-modules-commits mailing list