[Python-modules-commits] [parallax] 02/03: merge patched into master

[Valentin Vidic]

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

vvidic-guest pushed a commit to branch master
in repository parallax.

commit d5564c2ae32a9042ec74c32ff3215e9e9b5a4367
Merge: fb01f01 42c640d
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Thu Sep 28 10:28:59 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...-parallax.egg-info-from-the-master-branch.patch | 93 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 parallax.egg-info/PKG-INFO                         | 29 -------
 parallax.egg-info/SOURCES.txt                      | 21 -----
 parallax.egg-info/dependency_links.txt             |  1 -
 parallax.egg-info/top_level.txt                    |  1 -
 7 files changed, 96 insertions(+), 54 deletions(-)

diff --cc debian/.git-dpm
index b0b9f5a,0000000..391bf76
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
- 628f08d1bcf5e372db15017ef5adbcc4be05f901
- 628f08d1bcf5e372db15017ef5adbcc4be05f901
++42c640d038d6e0bfc18137f9ccb5f50c32071d59
++42c640d038d6e0bfc18137f9ccb5f50c32071d59
 +628f08d1bcf5e372db15017ef5adbcc4be05f901
 +628f08d1bcf5e372db15017ef5adbcc4be05f901
 +parallax_1.0.2.orig.tar.gz
 +9855a7532bb5bb98f929a60b8442e1a2212739db
 +16520
 +
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Drop-parallax.egg-info-from-the-master-branch.patch
index 0000000,0000000..59c6356
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Drop-parallax.egg-info-from-the-master-branch.patch
@@@ -1,0 -1,0 +1,93 @@@
++From 42c640d038d6e0bfc18137f9ccb5f50c32071d59 Mon Sep 17 00:00:00 2001
++From: Valentin Vidic <Valentin.Vidic at CARNet.hr>
++Date: Thu, 28 Sep 2017 10:28:35 +0200
++Subject: Drop parallax.egg-info from the master branch
++
++---
++ parallax.egg-info/PKG-INFO             | 29 -----------------------------
++ parallax.egg-info/SOURCES.txt          | 21 ---------------------
++ parallax.egg-info/dependency_links.txt |  1 -
++ parallax.egg-info/top_level.txt        |  1 -
++ 4 files changed, 52 deletions(-)
++ delete mode 100644 parallax.egg-info/PKG-INFO
++ delete mode 100644 parallax.egg-info/SOURCES.txt
++ delete mode 100644 parallax.egg-info/dependency_links.txt
++ delete mode 100644 parallax.egg-info/top_level.txt
++
++diff --git a/parallax.egg-info/PKG-INFO b/parallax.egg-info/PKG-INFO
++deleted file mode 100644
++index b45ff60..0000000
++--- a/parallax.egg-info/PKG-INFO
+++++ /dev/null
++@@ -1,29 +0,0 @@
++-Metadata-Version: 1.1
++-Name: parallax
++-Version: 1.0.2
++-Summary: Execute commands and copy files over SSH to multiple machines at once
++-Home-page: https://github.com/krig/parallax/
++-Author: Kristoffer Gronlund
++-Author-email: krig at koru.se
++-License: BSD
++-Description: Parallax SSH provides an interface to executing commands on multiple
++-        nodes at once using SSH. It also provides commands for sending and receiving files to
++-        multiple nodes using SCP.
++-Platform: linux
++-Classifier: Development Status :: 3 - Alpha
++-Classifier: Intended Audience :: System Administrators
++-Classifier: License :: OSI Approved :: BSD License
++-Classifier: Operating System :: POSIX
++-Classifier: Programming Language :: Python
++-Classifier: Programming Language :: Python :: 2
++-Classifier: Programming Language :: Python :: 2.6
++-Classifier: Programming Language :: Python :: 2.7
++-Classifier: Programming Language :: Python :: 3
++-Classifier: Programming Language :: Python :: 3.1
++-Classifier: Programming Language :: Python :: 3.2
++-Classifier: Programming Language :: Python :: 3.3
++-Classifier: Programming Language :: Python :: 3.4
++-Classifier: Topic :: Software Development :: Libraries :: Python Modules
++-Classifier: Topic :: System :: Clustering
++-Classifier: Topic :: System :: Networking
++-Classifier: Topic :: System :: Systems Administration
++diff --git a/parallax.egg-info/SOURCES.txt b/parallax.egg-info/SOURCES.txt
++deleted file mode 100644
++index 0650cc7..0000000
++--- a/parallax.egg-info/SOURCES.txt
+++++ /dev/null
++@@ -1,21 +0,0 @@
++-AUTHORS
++-COPYING
++-MANIFEST.in
++-README
++-README.md
++-setup.py
++-bin/parallax-askpass
++-parallax/__init__.py
++-parallax/askpass_client.py
++-parallax/askpass_server.py
++-parallax/callbacks.py
++-parallax/color.py
++-parallax/manager.py
++-parallax/psshutil.py
++-parallax/task.py
++-parallax/version.py
++-parallax.egg-info/PKG-INFO
++-parallax.egg-info/SOURCES.txt
++-parallax.egg-info/dependency_links.txt
++-parallax.egg-info/top_level.txt
++-test/test_api.py
++\ No newline at end of file
++diff --git a/parallax.egg-info/dependency_links.txt b/parallax.egg-info/dependency_links.txt
++deleted file mode 100644
++index 8b13789..0000000
++--- a/parallax.egg-info/dependency_links.txt
+++++ /dev/null
++@@ -1 +0,0 @@
++-
++diff --git a/parallax.egg-info/top_level.txt b/parallax.egg-info/top_level.txt
++deleted file mode 100644
++index 4c7c9ef..0000000
++--- a/parallax.egg-info/top_level.txt
+++++ /dev/null
++@@ -1 +0,0 @@
++-parallax
diff --cc debian/patches/series
index 0000000,0000000..3f61536
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Drop-parallax.egg-info-from-the-master-branch.patch

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