[Python-modules-commits] [python-psutil] 04/07: merge patched into master

[Sandro Tosi]

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

morph pushed a commit to branch master
in repository python-psutil.

commit 5c288246e522210e0248f145dfc71b293f48f5e8
Merge: 554f62b 0cd0ed4
Author: Sandro Tosi <morph at debian.org>
Date:   Mon Feb 8 22:17:46 2016 +0000

    merge patched into master

 .ci/README                                   |  3 +
 .ci/appveyor/README                          |  2 +
 .ci/appveyor/install.ps1                     | 85 ++++++++++++++++++++++++++++
 .ci/appveyor/run_with_compiler.cmd           | 47 +++++++++++++++
 .ci/travis/README                            |  2 +
 .ci/travis/install.sh                        | 51 +++++++++++++++++
 .ci/travis/run.sh                            | 18 ++++++
 CREDITS                                      |  4 ++
 HISTORY.rst                                  | 23 +++++---
 MANIFEST.in                                  |  2 +-
 PKG-INFO                                     |  6 +-
 README.rst                                   |  1 +
 debian/.git-dpm                              |  6 +-
 debian/patches/remove-google-analytics.patch |  2 +-
 docs/index.rst                               | 63 +++++++++++----------
 psutil.egg-info/PKG-INFO                     |  6 +-
 psutil.egg-info/SOURCES.txt                  |  7 +++
 psutil/__init__.py                           |  8 ++-
 psutil/_pssunos.py                           | 83 +++++++++++++++++----------
 psutil/_psutil_sunos.c                       | 59 +++++++++++--------
 psutil/arch/bsd/freebsd.c                    |  3 +-
 setup.py                                     |  3 +
 22 files changed, 380 insertions(+), 104 deletions(-)

diff --cc debian/.git-dpm
index 520919c,0000000..4f9530f
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- aeec97c5f70bb4489751ec239f21fdefc027b9c3
- aeec97c5f70bb4489751ec239f21fdefc027b9c3
- ec23e9849bfff47c4e3c0be5bca05aba3c8bdb65
++0cd0ed4652a397992bb43c5a1a316b80146139f7
++0cd0ed4652a397992bb43c5a1a316b80146139f7
++120c55e707cbc9152171f0d82890d996e7484598
 +120c55e707cbc9152171f0d82890d996e7484598
 +python-psutil_3.4.2.orig.tar.gz
 +d146356920138acc021c6e8912a03e06320b9f90
 +274361
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/remove-google-analytics.patch
index b0a4dec,0000000..6ce6253
mode 100644,000000..100644
--- a/debian/patches/remove-google-analytics.patch
+++ b/debian/patches/remove-google-analytics.patch
@@@ -1,26 -1,0 +1,26 @@@
- From aeec97c5f70bb4489751ec239f21fdefc027b9c3 Mon Sep 17 00:00:00 2001
++From 0cd0ed4652a397992bb43c5a1a316b80146139f7 Mon Sep 17 00:00:00 2001
 +From: Sandro Tosi <morph at debian.org>
 +Date: Thu, 8 Oct 2015 12:44:13 -0700
 +Subject: remove Google Analytics tracking from documentation
 +
 +Origin: vendor
 +Forwarded: not-needed
 +Last-Update: 2014-05-02
 +Patch-Name: remove-google-analytics.patch
 +---
 + docs/_template/page.html | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/docs/_template/page.html b/docs/_template/page.html
 +index 04b47b4..6f699f9 100644
 +--- a/docs/_template/page.html
 ++++ b/docs/_template/page.html
 +@@ -42,7 +42,7 @@
 + 
 +   (function() {
 +     var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
 +-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
 ++    ga.src = '';
 +     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
 +   })();
 + 

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