[Python-modules-commits] [python-pex] 01/02: More initial package build tweaks.

Barry Warsaw barry at moszumanska.debian.org
Thu Feb 19 15:57:20 UTC 2015


This is an automated email from the git hooks/post-receive script.

barry pushed a commit to branch master
in repository python-pex.

commit e07e8c99c7e41f2c793ed10ef6978a4358963cbe
Author: Barry Warsaw <barry at python.org>
Date:   Thu Feb 19 10:45:16 2015 -0500

    More initial package build tweaks.
---
 debian/control                 |   7 +-
 debian/copyright               | 221 +----------------------------------------
 debian/python-pex-cli.manpages |   1 +
 debian/rules                   |  30 +++++-
 4 files changed, 39 insertions(+), 220 deletions(-)

diff --git a/debian/control b/debian/control
index 8f1bfff..18866b4 100644
--- a/debian/control
+++ b/debian/control
@@ -7,12 +7,14 @@ Section: python
 X-Python-Version: >= 2.7
 X-Python3-Version: >= 3.4
 Priority: optional
-Build-Depends: debhelper (>= 0),
+Build-Depends: debhelper (>= 9),
                dh-python,
+               help2man,
                python-all (>= 2.6.6-3~),
                python-setuptools,
                python-sphinx (>= 1.0.7+dfsg-1~),
                python3-all,
+               python3-wheel,
                python3-setuptools
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/python-modules/packages/python-pex.git
@@ -54,7 +56,7 @@ Description: library for generating Python executable zip files
 
 Package: python-pex-cli
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}, python3-pex
+Depends: ${misc:Depends}, ${python3:Depends}, python3-pex, python3-wheel, python3-setuptools
 Suggests: python-pex-doc
 Description: library for generating Python executable zip files
  pex is a library for generating .pex (Python EXecutable) files which
@@ -70,6 +72,7 @@ Description: library for generating Python executable zip files
  This is the command line package.
 
 Package: python-pex-doc
+Section: doc
 Architecture: all
 Depends: ${misc:Depends}, ${sphinxdoc:Depends}
 Description: library for generating Python executable zip files
diff --git a/debian/copyright b/debian/copyright
index 5a9c471..5ec8ae0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,224 +5,11 @@ Source: https://pypi.python.org/pypi/pex
 Files: *
 Copyright: Copyright 2014 Pants project contributors (see CONTRIBUTORS.md).
 License: Apache-2.0
- Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
- .
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- .
-   1. Definitions.
- .
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
- .
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
- .
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
- .
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
- .
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
- .
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
- .
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
- .
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
- .
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
- .
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
- .
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
- .
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
- .
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
- .
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
- .
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
- .
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
- .
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
- .
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
- .
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
- .
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
- .
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
- .
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
- .
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
- .
-   END OF TERMS AND CONDITIONS
- .
-   APPENDIX: How to apply the Apache License to your work.
- .
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
- .
-   Copyright {yyyy} {name of copyright owner}
- .
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
- .
-       http://www.apache.org/licenses/LICENSE-2.0
- .
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+ On Debian-based systems the full text of the Apache 2.0 license can be found
+ at /usr/share/common-licenses/Apache-2.0
 
 Files: debian/*
 Copyright: 2015 Barry A. Warsaw
 License: Apache-2.0
-   Copyright 2015 Barry A. Warsaw
- .
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
- .
-       http://www.apache.org/licenses/LICENSE-2.0
- .
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- .
- On Debian-based systems the full text of the LGPL can be found at
- /usr/share/common-licenses/Apache-2.0
+ On Debian-based systems the full text of the Apache 2.0 license can be found
+ at /usr/share/common-licenses/Apache-2.0
diff --git a/debian/python-pex-cli.manpages b/debian/python-pex-cli.manpages
new file mode 100644
index 0000000..88750d2
--- /dev/null
+++ b/debian/python-pex-cli.manpages
@@ -0,0 +1 @@
+debian/pex.1
diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
index 4e8695e..e1cd727
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,37 @@
 export PYBUILD_NAME=pex
 export DH_VERBOSE=1
 
+export pkgversion=$(shell dpkg-parsechangelog --show-field version)
+
+
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
+override_dh_auto_install:
+	dh_auto_install
+	# Use the Python 3 binary.
+	mkdir -p debian/python-pex-cli/usr/bin
+	mv debian/python3-pex/usr/bin/pex debian/python-pex-cli/usr/bin
+	rm -rf debian/python3-pex/usr/bin
+	rm -rf debian/python-pex/usr/bin
+
+override_dh_installman:
+	PYTHONPATH=$(CURDIR) help2man -n pex -s 1 -o debian/pex.1 \
+		--version-string=$(pkgversion) \
+		--no-discard-stderr --no-info \
+		debian/python-pex-cli/usr/bin/pex
+	dh_installman
+
+# Disable docs and tests until upstream tarball includes them.
+
 override_dh_installdocs:
-	python setup.py build_sphinx
 	dh_installdocs
+	echo "https://github.com/pantsbuild/pex/issues/51"
+
+override_dh_autotest:
+	dh_autotest
+	echo "https://github.com/pantsbuild/pex/issues/51"
+
+# override_dh_installdocs:
+# 	python setup.py build_sphinx
+# 	dh_installdocs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-pex.git



More information about the Python-modules-commits mailing list