[Python-modules-commits] [python-psutil] 04/10: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Sun Jan 17 21:10:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
morph pushed a commit to branch master
in repository python-psutil.
commit 4a02e36eadcabb321515955ebb4eb152b5fb59c8
Merge: 254eee2 aeec97c
Author: Sandro Tosi <morph at debian.org>
Date: Sun Jan 17 14:08:40 2016 +0000
merge patched into master
.coveragerc | 21 +
.git-pre-commit | 47 +
.gitignore | 18 +
.travis.yml | 41 +-
CREDITS | 80 +-
DEVNOTES.rst | 10 +
HISTORY.rst | 197 +++
INSTALL.rst | 70 +-
MANIFEST.in | 10 +-
Makefile | 70 +-
PKG-INFO | 86 +-
README.rst | 83 +-
TODO | 74 +-
appveyor.yml | 77 +
debian/.git-dpm | 6 +-
debian/patches/remove-google-analytics.patch | 2 +-
docs/index.rst | 363 +++--
examples/ifconfig.py | 80 ++
examples/iotop.py | 15 +-
examples/nettop.py | 10 +-
examples/process_detail.py | 21 +-
examples/ps.py | 0
examples/pstree.py | 2 +-
examples/top.py | 12 +-
make.bat | 163 +--
psutil.egg-info/PKG-INFO | 86 +-
psutil.egg-info/SOURCES.txt | 25 +-
psutil.egg-info/top_level.txt | 2 -
psutil/__init__.py | 846 +++++------
psutil/_common.py | 161 ++-
psutil/_compat.py | 87 +-
psutil/_psbsd.py | 420 ++++--
psutil/_pslinux.py | 570 +++++---
psutil/_psosx.py | 48 +-
psutil/_psposix.py | 15 +-
psutil/_pssunos.py | 76 +-
psutil/_psutil_bsd.c | 1988 +++++---------------------
psutil/_psutil_bsd.h | 17 -
psutil/_psutil_linux.c | 277 ++--
psutil/_psutil_linux.h | 1 +
psutil/_psutil_osx.c | 592 ++++----
psutil/_psutil_posix.c | 454 +++++-
psutil/_psutil_posix.h | 5 +
psutil/_psutil_sunos.c | 402 ++++--
psutil/_psutil_sunos.h | 1 +
psutil/_psutil_windows.c | 1699 +++++++++++-----------
psutil/_psutil_windows.h | 10 +-
psutil/_pswindows.py | 168 ++-
psutil/arch/bsd/freebsd.c | 976 +++++++++++++
psutil/arch/bsd/freebsd.h | 30 +
psutil/arch/bsd/freebsd_socks.c | 631 ++++++++
psutil/arch/bsd/freebsd_socks.h | 11 +
psutil/arch/bsd/netbsd.c | 668 +++++++++
psutil/arch/bsd/netbsd.h | 29 +
psutil/arch/bsd/netbsd_socks.c | 542 +++++++
psutil/arch/bsd/netbsd_socks.h | 10 +
psutil/arch/bsd/openbsd.c | 793 ++++++++++
psutil/arch/bsd/openbsd.h | 28 +
psutil/arch/bsd/process_info.c | 272 ----
psutil/arch/bsd/process_info.h | 15 -
psutil/arch/osx/process_info.c | 109 +-
psutil/arch/osx/process_info.h | 2 +-
psutil/arch/solaris/v10/ifaddrs.c | 124 ++
psutil/arch/solaris/v10/ifaddrs.h | 26 +
psutil/arch/windows/inet_ntop.c | 38 +
psutil/arch/windows/inet_ntop.h | 10 +
psutil/arch/windows/ntextapi.h | 106 +-
psutil/arch/windows/process_handles.c | 771 ++++++----
psutil/arch/windows/process_handles.h | 101 ++
psutil/arch/windows/process_info.c | 112 +-
psutil/arch/windows/process_info.h | 11 +-
psutil/arch/windows/security.c | 33 +-
setup.py | 142 +-
test/README | 15 -
test/README.rst | 21 +
test/__init__.py | 0
test/_bsd.py | 165 ++-
test/_linux.py | 455 +++++-
test/_osx.py | 80 +-
test/_posix.py | 68 +-
test/_sunos.py | 18 +-
test/_windows.py | 212 ++-
test/test_memory_leaks.py | 90 +-
test/test_psutil.py | 1489 +++++++++++++------
tox.ini | 22 +-
85 files changed, 11894 insertions(+), 5839 deletions(-)
diff --cc debian/.git-dpm
index 3fd0b45,0000000..6c15928
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
- 4b8250744472c9bae5643f2487aed334a331815c
- 4b8250744472c9bae5643f2487aed334a331815c
- 69f008a0846587f9ec116a67fc3b66f0cafcd1c6
++aeec97c5f70bb4489751ec239f21fdefc027b9c3
++aeec97c5f70bb4489751ec239f21fdefc027b9c3
++ec23e9849bfff47c4e3c0be5bca05aba3c8bdb65
+ec23e9849bfff47c4e3c0be5bca05aba3c8bdb65
+python-psutil_3.4.1.orig.tar.gz
+5b87726d33f976e9b10f4a9b83fb83573927611f
+271657
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/remove-google-analytics.patch
index 2522acf,0000000..b0a4dec
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 4b8250744472c9bae5643f2487aed334a331815c Mon Sep 17 00:00:00 2001
++From aeec97c5f70bb4489751ec239f21fdefc027b9c3 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
More information about the Python-modules-commits
mailing list