[Python-modules-commits] [python-pip] 01/01: Selectively merge packaging changes from the release-1.5.6 branch.

[Barry Warsaw]

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

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

commit bd1c1a150d1bba373ba2ee941127a06577353fc1
Author: Barry Warsaw <barry at python.org>
Date:   Wed May 27 11:58:43 2015 -0400

    Selectively merge packaging changes from the release-1.5.6 branch.
---
 debian/.git-dpm               |  8 ++++++++
 debian/changelog              | 15 +++++++++++++++
 debian/control                |  8 +++++---
 debian/python-pip-whl.install |  2 +-
 debian/watch                  |  2 +-
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
new file mode 100644
index 0000000..be01ed2
--- /dev/null
+++ b/debian/.git-dpm
@@ -0,0 +1,8 @@
+# see git-dpm(1) from git-dpm package
+b42fc879de7be5e3a89a165f23fd0d43bfa5f2a2
+b42fc879de7be5e3a89a165f23fd0d43bfa5f2a2
+eb72925c46a091b609d1ecfbe305d262398a76c3
+eb72925c46a091b609d1ecfbe305d262398a76c3
+python-pip_1.5.6.orig.tar.gz
+e6cd9e6f2fd8d28c9976313632ef8aa8ac31249e
+938120
diff --git a/debian/changelog b/debian/changelog
index d01df4c..64ebac0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,21 @@ python-pip (7.0.1-1) UNRELEASED; urgency=medium
 
  -- Barry Warsaw <barry at debian.org>  Thu, 30 Apr 2015 15:33:33 -0400
 
+python-pip (1.5.6-6) unstable; urgency=medium
+
+  [ Felix C. Stegerman ]
+  * d/patches/0006-bug-785787.patch: Allow pip 1.5.6 to handle the PEP 440
+    "epoch" field.  (Closes: #785787)
+
+  [ Barry Warsaw ]
+  * d/control:
+    - Update Vcs-* header for conversion to git-dpm.
+    - Add myself to Uploaders.
+  * d/watch: Update to pypi.debian.net redirector.
+  * wrap-and-sort
+
+ -- Barry Warsaw <barry at debian.org>  Wed, 27 May 2015 10:11:32 -0400
+
 python-pip (1.5.6-5) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index dc67030..3c442a0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: python-pip
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Carl Chenet <chaica at debian.org>, Jeff Licquia <licquia at debian.org>
+Uploaders: Barry Warsaw <barry at debian.org>,
+           Carl Chenet <chaica at debian.org>,
+           Jeff Licquia <licquia at debian.org>
 Homepage: http://www.pip-installer.org/
 Build-Depends: debhelper (>= 8),
                dh-python,
@@ -22,8 +24,8 @@ Build-Depends: debhelper (>= 8),
 Standards-Version: 3.9.6
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-pip/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-pip/trunk/
+Vcs-Git: git://anonscm.debian.org/python-modules/packages/python-pip.git
+Vcs-Browser: http://anonscm.debian.org/cgit/python-modules/packages/python-pip.git
 
 Package: python-pip
 Architecture: all
diff --git a/debian/python-pip-whl.install b/debian/python-pip-whl.install
index 9e133e9..b6c795b 100644
--- a/debian/python-pip-whl.install
+++ b/debian/python-pip-whl.install
@@ -1,2 +1,2 @@
-usr/share/python-wheels
 debian/pip.dependencies usr/share/python-wheels
+usr/share/python-wheels
diff --git a/debian/watch b/debian/watch
index c2a1cce..fa540c9 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
 #opts=uversionmangle=s/(rc|a|b|c)/~$1/,pgpsigurlmangle=s/$/.asc/ \
 opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
-http://pypi.debian.net/pip/pip-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
\ No newline at end of file
+http://pypi.debian.net/pip/pip-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

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