[Python-modules-commits] [pyside] 05/06: merge patched into master

[Luke Faraone]

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

lfaraone pushed a commit to branch master
in repository pyside.

commit d4d4250a10b108214ed2f2287dcb9d8567283c93
Merge: 806eb67 b18278b
Author: Luke W Faraone <luke at faraone.cc>
Date:   Wed May 17 02:23:00 2017 +0000

    merge patched into master

 debian/.git-dpm                                |    6 +-
 debian/patches/cmake_selectDefaultPython.patch |    2 +-
 debian/patches/lessBuildVerbosity.patch        |    2 +-
 setup/.gitignore                               |   13 +
 setup/.gitmodules                              |   12 +
 setup/CHANGES.rst                              |  394 ++++
 setup/MANIFEST.in                              |   45 +
 setup/README.rst                               |  434 ++++
 setup/ez_setup.py                              |  361 ++++
 setup/popenasync.py                            |  311 +++
 setup/pyside_postinstall.py                    |  331 +++
 setup/qtinfo.py                                |   54 +
 setup/setup.py                                 | 1002 +++++++++
 setup/sources/patchelf/COPYING                 |  674 ++++++
 setup/sources/patchelf/README                  |  107 +
 setup/sources/patchelf/elf.h                   | 2674 ++++++++++++++++++++++++
 setup/sources/patchelf/patchelf.cc             | 1239 +++++++++++
 setup/utils.py                                 |  447 ++++
 18 files changed, 8103 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 850d4a9,0000000..4f77605
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,12 -1,0 +1,12 @@@
 +# see git-dpm(1) from git-dpm package
- a0a7342c79a0d92bb97d7395317da5e1966a4f5b
- a0a7342c79a0d92bb97d7395317da5e1966a4f5b
- 072231c30e397ccade158d5ec510b04c7c9bda73
++b18278bb3b2503e69b8e14fc43f49c455ba0b2f4
++b18278bb3b2503e69b8e14fc43f49c455ba0b2f4
++51c241688b5e423db70c690a31e760b556b9ebc9
 +51c241688b5e423db70c690a31e760b556b9ebc9
 +pyside_1.2.2+source1.orig.tar.bz2
 +955e32d193d173faa64edc51111289cdcbe3b96e
 +3765472
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
 +component:2dc79edc5559cfb7acebcf9c28ed622b0d3d4d49:81807:pyside_1.2.2+source1.orig-setup.tar.gz
diff --cc debian/patches/cmake_selectDefaultPython.patch
index 6a2f3b9,0000000..09fba6b
mode 100644,000000..100644
--- a/debian/patches/cmake_selectDefaultPython.patch
+++ b/debian/patches/cmake_selectDefaultPython.patch
@@@ -1,24 -1,0 +1,24 @@@
- From a0a7342c79a0d92bb97d7395317da5e1966a4f5b Mon Sep 17 00:00:00 2001
++From b18278bb3b2503e69b8e14fc43f49c455ba0b2f4 Mon Sep 17 00:00:00 2001
 +From: Didier Raboud <odyx at debian.org>
 +Date: Thu, 8 Oct 2015 10:59:25 -0700
 +Subject: Allows a different choice for the default python version.
 +
 +Origin: vendor
 +Last-Update: 2011-02-14
 +Patch-Name: cmake_selectDefaultPython.patch
 +---
 + libpyside/PySideConfig.cmake.in | 4 ++--
 + 1 file changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/libpyside/PySideConfig.cmake.in b/libpyside/PySideConfig.cmake.in
 +index b7f45e8..58847d9 100644
 +--- a/libpyside/PySideConfig.cmake.in
 ++++ b/libpyside/PySideConfig.cmake.in
 +@@ -1,5 +1,5 @@
 + if (NOT PYTHON_BASENAME)
 +-    message(STATUS "Using default python: @SHIBOKEN_PYTHON_SUFFIX@")
 +-    SET(PYTHON_BASENAME @SHIBOKEN_PYTHON_SUFFIX@)
 ++    message(STATUS "Using default python: @DEFAULT_PYTHON_BASENAME@")
 ++    SET(PYTHON_BASENAME @DEFAULT_PYTHON_BASENAME@)
 + endif()
 + include(@LIB_INSTALL_DIR@/cmake/PySide- at BINDING_API_VERSION@/PySideConfig${PYTHON_BASENAME}.cmake)
diff --cc debian/patches/lessBuildVerbosity.patch
index 8498952,0000000..f659806
mode 100644,000000..100644
--- a/debian/patches/lessBuildVerbosity.patch
+++ b/debian/patches/lessBuildVerbosity.patch
@@@ -1,26 -1,0 +1,26 @@@
- From ce8bd36195b3ba064fb5cca0321567270860eb0d Mon Sep 17 00:00:00 2001
++From 50a1e493490cc7a83f677808e746f656be6dc047 Mon Sep 17 00:00:00 2001
 +From: Didier Raboud <didier at raboud.com>
 +Date: Thu, 8 Oct 2015 10:59:24 -0700
 +Subject: Reduce the verbosity of generatorrunner
 +
 +Origin: vendor
 +Forwarded: http://bugs.openbossa.org/249
 +Last-Update: 2011-02-03
 +Patch-Name: lessBuildVerbosity.patch
 +---
 + CMakeLists.txt | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/CMakeLists.txt b/CMakeLists.txt
 +index 9e0e3d0..966fe6e 100644
 +--- a/CMakeLists.txt
 ++++ b/CMakeLists.txt
 +@@ -151,7 +151,7 @@ if (NOT SITE_PACKAGE)
 +     endif()
 + endif()
 + 
 +-set(GENERATOR_EXTRA_FLAGS --generator-set=shiboken --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic --use-isnull-as-nb_nonzero)
 ++set(GENERATOR_EXTRA_FLAGS --generator-set=shiboken --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic --use-isnull-as-nb_nonzero --silent)
 + if(WIN32 OR DEFINED AVOID_PROTECTED_HACK)
 +     message(STATUS "PySide will be generated avoiding the protected hack!")
 +     set(GENERATOR_EXTRA_FLAGS ${GENERATOR_EXTRA_FLAGS} --avoid-protected-hack)

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