[Python-modules-commits] r25647 - in packages/python-pip/trunk/debian (5 files)
barry at users.alioth.debian.org
barry at users.alioth.debian.org
Mon Aug 19 22:30:09 UTC 2013
Date: Monday, August 19, 2013 @ 22:30:07
Author: barry
Revision: 25647
* Team upload.
* New upstream release.
- d/control: Update Standards-Version to 3.9.4 with no additional
changes required.
- d/patches/no-python-specific-scripts.patch: Refreshed.
- d/patches/format_egg_string.patch: Refreshed.
- d/patches/system-ca-certificates.patch: Refreshed.
Modified:
packages/python-pip/trunk/debian/changelog
packages/python-pip/trunk/debian/control
packages/python-pip/trunk/debian/patches/format_egg_string.patch
packages/python-pip/trunk/debian/patches/no-python-specific-scripts.patch
packages/python-pip/trunk/debian/patches/system-ca-certificates.patch
Modified: packages/python-pip/trunk/debian/changelog
===================================================================
--- packages/python-pip/trunk/debian/changelog 2013-08-19 20:15:12 UTC (rev 25646)
+++ packages/python-pip/trunk/debian/changelog 2013-08-19 22:30:07 UTC (rev 25647)
@@ -1,3 +1,15 @@
+python-pip (1.4.1-1) UNRELEASED; urgency=low
+
+ * Team upload.
+ * New upstream release.
+ - d/control: Update Standards-Version to 3.9.4 with no additional
+ changes required.
+ - d/patches/no-python-specific-scripts.patch: Refreshed.
+ - d/patches/format_egg_string.patch: Refreshed.
+ - d/patches/system-ca-certificates.patch: Refreshed.
+
+ -- Barry Warsaw <barry at debian.org> Mon, 19 Aug 2013 17:17:24 -0400
+
python-pip (1.3.1-1) unstable; urgency=low
[ Stefano Rivera ]
Modified: packages/python-pip/trunk/debian/control
===================================================================
--- packages/python-pip/trunk/debian/control 2013-08-19 20:15:12 UTC (rev 25646)
+++ packages/python-pip/trunk/debian/control 2013-08-19 22:30:07 UTC (rev 25647)
@@ -6,7 +6,7 @@
Homepage: http://www.pip-installer.org/
Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6), python3-all (>= 3.2)
Build-Depends-Indep: python-setuptools (>= 0.6c1), python3-setuptools
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
X-Python-Version: >= 2.6
X-Python3-Version: >= 3.2
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-pip/trunk/
Modified: packages/python-pip/trunk/debian/patches/format_egg_string.patch
===================================================================
--- packages/python-pip/trunk/debian/patches/format_egg_string.patch 2013-08-19 20:15:12 UTC (rev 25646)
+++ packages/python-pip/trunk/debian/patches/format_egg_string.patch 2013-08-19 22:30:07 UTC (rev 25647)
@@ -4,12 +4,12 @@
--- a/pip/req.py
+++ b/pip/req.py
-@@ -420,7 +420,7 @@
+@@ -443,7 +443,7 @@
paths_to_remove = UninstallPathSet(dist)
pip_egg_info_path = os.path.join(dist.location,
- dist.egg_name()) + '.egg-info'
-+ dist.egg_name().split('-py')[0]) + '.egg-info'
- # workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=618367
- debian_egg_info_path = pip_egg_info_path.replace(
- '-py%s' % pkg_resources.PY_MAJOR, '')
++ dist.egg_name().split('-py')[0]) + '.egg-info'
+ dist_info_path = os.path.join(dist.location,
+ '-'.join(dist.egg_name().split('-')[:2])
+ ) + '.dist-info'
Modified: packages/python-pip/trunk/debian/patches/no-python-specific-scripts.patch
===================================================================
--- packages/python-pip/trunk/debian/patches/no-python-specific-scripts.patch 2013-08-19 20:15:12 UTC (rev 25646)
+++ packages/python-pip/trunk/debian/patches/no-python-specific-scripts.patch 2013-08-19 22:30:07 UTC (rev 25647)
@@ -8,7 +8,7 @@
@@ -50,7 +50,7 @@
url='http://www.pip-installer.org',
license='MIT',
- packages=['pip', 'pip.commands', 'pip.vcs', 'pip.backwardcompat'],
+ packages=find_packages(exclude=["contrib", "docs", "tests*"]),
- entry_points=dict(console_scripts=['pip=pip:main', 'pip-%s=pip:main' % sys.version[:3]]),
+ entry_points=dict(console_scripts=['pip=pip:main', 'pip%i=pip:main' % sys.version_info[0]]),
test_suite='nose.collector',
Modified: packages/python-pip/trunk/debian/patches/system-ca-certificates.patch
===================================================================
--- packages/python-pip/trunk/debian/patches/system-ca-certificates.patch 2013-08-19 20:15:12 UTC (rev 25646)
+++ packages/python-pip/trunk/debian/patches/system-ca-certificates.patch 2013-08-19 22:30:07 UTC (rev 25647)
@@ -4,28 +4,28 @@
--- a/pip/locations.py
+++ b/pip/locations.py
-@@ -8,7 +8,7 @@
+@@ -9,7 +9,7 @@
from pip.backwardcompat import get_python_lib
import pip.exceptions
-default_cert_path = os.path.join(os.path.dirname(__file__), 'cacert.pem')
+default_cert_path = '/etc/ssl/certs/ca-certificates.crt'
- def running_under_virtualenv():
- """
+ DELETE_MARKER_MESSAGE = '''\
+ This file is placed here by pip to indicate the source was put
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,6 @@
url='http://www.pip-installer.org',
license='MIT',
- packages=['pip', 'pip.commands', 'pip.vcs', 'pip.backwardcompat'],
+ packages=find_packages(exclude=["contrib", "docs", "tests*"]),
- package_data={'pip': ['*.pem']},
entry_points=dict(console_scripts=['pip=pip:main', 'pip-%s=pip:main' % sys.version[:3]]),
test_suite='nose.collector',
tests_require=tests_require,
--- a/pip/download.py
+++ b/pip/download.py
-@@ -96,6 +96,11 @@
+@@ -128,6 +128,11 @@
# get alternate bundle or use our included bundle
cert_path = os.environ.get('PIP_CERT', '') or default_cert_path
More information about the Python-modules-commits
mailing list