[Python-modules-commits] r16483 - in packages/python-pip/trunk/debian (9 files)

chaica-guest at users.alioth.debian.org chaica-guest at users.alioth.debian.org
Wed Apr 13 00:21:54 UTC 2011 

    Date: Wednesday, April 13, 2011 @ 00:21:42
  Author: chaica-guest
Revision: 16483

  * New upstream version
  * debian/control
    - Remove python-support from Build-Depends-Indep
    - Bump python to 2.6.6-3
    - Bump Standards-Version to 3.9.1
  * debian/patches
    - Replaced remove_hardcoded_python_version by
      remove_hardcoded_python_version.patch
    - Replaced format_egg_string by format_egg_string.patch
  * debian/rules
    - Added --with python2 to dh $@
  * debian/copyright
    - updated copyright dates and authors

Added:
  packages/python-pip/trunk/debian/patches/format_egg_string.patch
  packages/python-pip/trunk/debian/patches/remove_hardcoded_python_version.patch
Modified:
  packages/python-pip/trunk/debian/changelog
  packages/python-pip/trunk/debian/control
  packages/python-pip/trunk/debian/copyright
  packages/python-pip/trunk/debian/patches/series
  packages/python-pip/trunk/debian/rules
Deleted:
  packages/python-pip/trunk/debian/patches/format_egg_string
  packages/python-pip/trunk/debian/patches/remove_hardcoded_python_version

Modified: packages/python-pip/trunk/debian/changelog
===================================================================
--- packages/python-pip/trunk/debian/changelog	2011-04-12 21:39:00 UTC (rev 16482)
+++ packages/python-pip/trunk/debian/changelog	2011-04-13 00:21:42 UTC (rev 16483)
@@ -1,3 +1,21 @@
+python-pip (1.0-1) unstable; urgency=low
+
+  * New upstream version
+  * debian/control
+    - Remove python-support from Build-Depends-Indep
+    - Bump python to 2.6.6-3
+    - Bump Standards-Version to 3.9.1
+  * debian/patches
+    - Replaced remove_hardcoded_python_version by
+      remove_hardcoded_python_version.patch
+    - Replaced format_egg_string by format_egg_string.patch
+  * debian/rules
+    - Added --with python2 to dh $@
+  * debian/copyright
+    - updated copyright dates and authors
+
+ -- Carl Chenet <chaica at ohmytux.com>  Wed, 13 Apr 2011 04:12:53 +0200
+
 python-pip (0.8.1-1) unstable; urgency=low
 
   * New upstream version

Modified: packages/python-pip/trunk/debian/control
===================================================================
--- packages/python-pip/trunk/debian/control	2011-04-12 21:39:00 UTC (rev 16482)
+++ packages/python-pip/trunk/debian/control	2011-04-13 00:21:42 UTC (rev 16483)
@@ -4,10 +4,10 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Carl Chenet <chaica at ohmytux.com>, Jeff Licquia <licquia at debian.org>
 Homepage: http://pip.openplans.org/
-Build-Depends: debhelper (>= 7.0.50~), python
-Build-Depends-Indep: python-support (>= 1.0.0), python-setuptools (>= 0.6c1)
+Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3)
+Build-Depends-Indep: python-setuptools (>= 0.6c1)
 Standards-Version: 3.9.1
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.5
 Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/python-pip/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/python-pip/trunk/
 

Modified: packages/python-pip/trunk/debian/copyright
===================================================================
--- packages/python-pip/trunk/debian/copyright	2011-04-12 21:39:00 UTC (rev 16482)
+++ packages/python-pip/trunk/debian/copyright	2011-04-13 00:21:42 UTC (rev 16483)
@@ -2,10 +2,51 @@
 Files: debian/*
 Copyright: Copyright 2009 Jeff Licquia <licquia at debian.org>
 License: other
-    The Debian packaging informatin is licensed under the same license
+    The Debian packaging information is licensed under the same license
     as the rest of pip.
+
 Files: *
-Copyright: Copyright (c) 2007 Ian Bicking and Contributors
+Copyright: Copyright © 2008-2011 The pip developers
+
+pip developers are:
+Alex Grönholm
+Alex Morega
+Alexandre Conrad
+Armin Ronacher
+Brian Rosner
+Carl Meyer
+Christian Oudard
+Cody Soyland
+Daniel Holth
+Dave Abrahams
+Francesco
+Hugo Lopes Tavares
+Ian Bicking
+Igor Sobreira
+Ionel Maries Cristian
+Jakub Vysoky
+Jannis Leidel
+Jay Graves
+John-Scott Atlakson
+Jon Parise
+Josh Bronson
+Kelsey Hightower
+Kenneth Belitzky
+Kumar McMillan
+Luke Macken
+Masklinn
+Nowell Strite
+Oliver Tonnhofer
+Patrick Jenkins
+Paul Nasrat
+Peter Waller
+Ronny Pfannschmidt
+Simon Cross
+Thomas Johansson
+Vinay Sajip
+Vitaly Babiy
+Wil Tan
+
 License: other
     Permission is hereby granted, free of charge, to any person obtaining
     a copy of this software and associated documentation files (the

Deleted: packages/python-pip/trunk/debian/patches/format_egg_string
===================================================================
--- packages/python-pip/trunk/debian/patches/format_egg_string	2011-04-12 21:39:00 UTC (rev 16482)
+++ packages/python-pip/trunk/debian/patches/format_egg_string	2011-04-13 00:21:42 UTC (rev 16483)
@@ -1,16 +0,0 @@
-# Description: use the same .egg string format than Debian python-setuptools
-# Author: Carl Chenet <chaica at ohmytux.com>
-Index: pip-0.8.1/pip/req.py
-===================================================================
---- pip-0.8.1.orig/pip/req.py	2010-09-15 01:14:08.000000000 +0200
-+++ pip-0.8.1/pip/req.py	2010-09-15 01:24:03.000000000 +0200
-@@ -405,7 +405,8 @@
-         paths_to_remove = UninstallPathSet(dist)
- 
-         pip_egg_info_path = os.path.join(dist.location,
--                                         dist.egg_name()) + '.egg-info'
-+                                         #dist.egg_name()) + '.egg-info'
-+                                         dist.egg_name().split('-py')[0]) + '.egg-info'
-         easy_install_egg = dist.egg_name() + '.egg'
-         develop_egg_link = egg_link_path(dist)
-         if os.path.exists(pip_egg_info_path):

Added: packages/python-pip/trunk/debian/patches/format_egg_string.patch
===================================================================
--- packages/python-pip/trunk/debian/patches/format_egg_string.patch	                        (rev 0)
+++ packages/python-pip/trunk/debian/patches/format_egg_string.patch	2011-04-13 00:21:42 UTC (rev 16483)
@@ -0,0 +1,16 @@
+# Description: use the same .egg string format than Debian python-setuptools
+# Author: Carl Chenet <chaica at ohmytux.com>
+
+Index: pip-1.0/pip/req.py
+===================================================================
+--- pip-1.0.orig/pip/req.py	2011-04-13 03:38:11.000000000 +0200
++++ pip-1.0/pip/req.py	2011-04-13 03:40:17.000000000 +0200
+@@ -403,7 +403,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, '')

Deleted: packages/python-pip/trunk/debian/patches/remove_hardcoded_python_version
===================================================================
--- packages/python-pip/trunk/debian/patches/remove_hardcoded_python_version	2011-04-12 21:39:00 UTC (rev 16482)
+++ packages/python-pip/trunk/debian/patches/remove_hardcoded_python_version	2011-04-13 00:21:42 UTC (rev 16483)
@@ -1,24 +0,0 @@
-# Description: remove the harcoded python version in console exe
-# Author: Carl Chenet <chaica at ohmytux.com>
-Index: pip-0.8.1/pip.egg-info/entry_points.txt
-===================================================================
---- pip-0.8.1.orig/pip.egg-info/entry_points.txt	2010-10-06 00:40:00.000000000 +0200
-+++ pip-0.8.1/pip.egg-info/entry_points.txt	2010-10-06 00:40:49.000000000 +0200
-@@ -1,4 +1,2 @@
- [console_scripts]
- pip = pip:main
--pip-2.6 = pip:main
--
-Index: pip-0.8.1/setup.py
-===================================================================
---- pip-0.8.1.orig/setup.py	2010-10-06 00:39:42.000000000 +0200
-+++ pip-0.8.1/setup.py	2010-10-06 00:40:37.000000000 +0200
-@@ -35,7 +35,7 @@
-       url='http://pip.openplans.org',
-       license='MIT',
-       packages=['pip', 'pip.commands', 'pip.vcs'],
--      entry_points=dict(console_scripts=['pip=pip:main', 'pip-%s=pip:main' % sys.version[:3]]),
-+      entry_points=dict(console_scripts=['pip=pip:main']),
-       test_suite='nose.collector',
-       tests_require=['nose', 'virtualenv', 'scripttest', 'mock'],
-       zip_safe=False)

Added: packages/python-pip/trunk/debian/patches/remove_hardcoded_python_version.patch
===================================================================
--- packages/python-pip/trunk/debian/patches/remove_hardcoded_python_version.patch	                        (rev 0)
+++ packages/python-pip/trunk/debian/patches/remove_hardcoded_python_version.patch	2011-04-13 00:21:42 UTC (rev 16483)
@@ -0,0 +1,25 @@
+# Description: remove the harcoded python version in console exe
+# Author: Carl Chenet <chaica at ohmytux.com>
+
+Index: pip-1.0/pip.egg-info/entry_points.txt
+===================================================================
+--- pip-1.0.orig/pip.egg-info/entry_points.txt	2011-04-13 03:44:07.000000000 +0200
++++ pip-1.0/pip.egg-info/entry_points.txt	2011-04-13 03:44:19.000000000 +0200
+@@ -1,4 +1,3 @@
+ [console_scripts]
+ pip = pip:main
+-pip-2.6 = pip:main
+ 
+Index: pip-1.0/setup.py
+===================================================================
+--- pip-1.0.orig/setup.py	2011-04-13 03:44:07.000000000 +0200
++++ pip-1.0/setup.py	2011-04-13 03:44:39.000000000 +0200
+@@ -48,7 +48,7 @@
+           'https://github.com/pypa/virtualenv/tarball/master#egg=virtualenv-1.5.2.post2',
+           ],
+       packages=['pip', 'pip.commands', 'pip.vcs'],
+-      entry_points=dict(console_scripts=['pip=pip:main', 'pip-%s=pip:main' % sys.version[:3]]),
++      entry_points=dict(console_scripts=['pip=pip:main']),
+       test_suite='nose.collector',
+       tests_require=['nose', 'virtualenv==1.5.2.post2', 'scripttest==1.1.1', 'mock'],
+       zip_safe=False)

Modified: packages/python-pip/trunk/debian/patches/series
===================================================================
--- packages/python-pip/trunk/debian/patches/series	2011-04-12 21:39:00 UTC (rev 16482)
+++ packages/python-pip/trunk/debian/patches/series	2011-04-13 00:21:42 UTC (rev 16483)
@@ -1,2 +1,2 @@
-format_egg_string
-remove_hardcoded_python_version
+format_egg_string.patch
+remove_hardcoded_python_version.patch

Modified: packages/python-pip/trunk/debian/rules
===================================================================
--- packages/python-pip/trunk/debian/rules	2011-04-12 21:39:00 UTC (rev 16482)
+++ packages/python-pip/trunk/debian/rules	2011-04-13 00:21:42 UTC (rev 16483)
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh $@ --with python2
 
+

More information about the Python-modules-commits mailing list