Merge lp:~mitya57/ubuntu/raring/python-pip/scripts-and-manpages into lp:ubuntu/raring/python-pip

Proposed by Dmitry Shachnev on 2013-03-14
Status: Merged
Merged at revision: 16
Proposed branch: lp:~mitya57/ubuntu/raring/python-pip/scripts-and-manpages
Merge into: lp:ubuntu/raring/python-pip
Diff against target: 187 lines (+14/-140)
5 files modified
debian/changelog (+7/-0)
debian/pip-2.6.1 (+0/-135)
debian/python-pip.manpages (+0/-1)
debian/python3-pip.manpages (+1/-1)
debian/rules (+6/-3)
To merge this branch: bzr merge lp:~mitya57/ubuntu/raring/python-pip/scripts-and-manpages
Reviewer Review Type Date Requested Status
Martin Pitt 2013-03-14 Approve on 2013-03-25
Dimitri John Ledkov 2013-03-14 Pending
Review via email: mp+153357@code.launchpad.net

Description of the Change

python-pip (1.1-3ubuntu4) raring; urgency=low

  * Really install the pip3 symlink (by fixing name of dh_link command).
  * Install manpages for all scripts, and drop manpage for 2.6.

 -- Dmitry Shachnev <email address hidden> Thu, 14 Mar 2013 16:53:35 +0400

To post a comment you must log in.
Martin Pitt (pitti) wrote :

Thanks, this looks fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-11-06 22:48:27 +0000
+++ debian/changelog 2013-03-14 13:09:28 +0000
@@ -1,3 +1,10 @@
1python-pip (1.1-3ubuntu4) raring; urgency=low
2
3 * Really install the pip3 symlink (by fixing name of dh_link command).
4 * Install manpages for all scripts, and drop manpage for 2.6.
5
6 -- Dmitry Shachnev <mitya57@ubuntu.com> Thu, 14 Mar 2013 16:53:35 +0400
7
1python-pip (1.1-3ubuntu3) raring; urgency=low8python-pip (1.1-3ubuntu3) raring; urgency=low
29
3 * Drop python3.2.10 * Drop python3.2.
411
=== removed file 'debian/pip-2.6.1'
--- debian/pip-2.6.1 2012-06-05 23:03:13 +0000
+++ debian/pip-2.6.1 1970-01-01 00:00:00 +0000
@@ -1,135 +0,0 @@
1'\" t
2.\" Title: pip-2.6
3.\" Author: [see the "AUTHORS" section]
4.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
5.\" Date: 05/27/2012
6.\" Manual: \ \&
7.\" Source: \ \&
8.\" Language: English
9.\"
10.TH "PIP-2.6" "1" "05/27/2012" "\ \&" "\ \&"
11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------
14.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
15.\" http://bugs.debian.org/507673
16.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
17.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
18.ie \n(.g .ds Aq \(aq
19.el .ds Aq '
20.\" -----------------------------------------------------------------
21.\" * set default formatting
22.\" -----------------------------------------------------------------
23.\" disable hyphenation
24.nh
25.\" disable justification (adjust text to left margin only)
26.ad l
27.\" -----------------------------------------------------------------
28.\" * MAIN CONTENT STARTS HERE *
29.\" -----------------------------------------------------------------
30.SH "NAME"
31pip-2.6 \- install Python packages
32.SH "SYNOPSIS"
33.sp
34\fBpip-2.6\fR [\fIcommand\fR] [\fIoptions\fR]
35.SH "DESCRIPTION"
36.sp
37pip is an alternative Python package installer\&. It performs the same basic job as easy_install, but with some extra features\&. It can work with version control repositories (currently only Git, Mercurial, and Bazaar repositories), logs output extensively, and prevents partial installs by downloading all requirements before starting installation\&.
38.sp
39It has some disadvantages when compared to easy_install\&. It does not use egg files, although it does preserve egg metadata\&. Some setuptools features are not yet supported, and some custom setup\&.py features won\(aat work\&.
40.SH "COMMANDS"
41.sp
42The command comes before any options\&. The following commands are recognized:
43.PP
44\fBhelp\fR
45.RS 4
46Show the help text\&.
47.RE
48.PP
49\fBbundle\fR
50.RS 4
51Create "bundles" which can be used by pip to install the group of Python packages in multiple places\&.
52.RE
53.PP
54\fBfreeze\fR
55.RS 4
56Write the current list of installed packages to a requirements file, which can be used by pip to reinstall the same set of packages\&.
57.RE
58.PP
59\fBinstall\fR
60.RS 4
61Install packages\&.
62.RE
63.PP
64\fBunzip\fR
65.RS 4
66Unzip an individual package\&.
67.RE
68.PP
69\fBzip\fR
70.RS 4
71Zip an individual package\&.
72.RE
73.SH "OPTIONS"
74.PP
75\fB\-h, \-\-help\fR
76.RS 4
77Show summary of options\&.
78.RE
79.PP
80\fB\-\-version\fR
81.RS 4
82Show the version of the program\&.
83.RE
84.PP
85\fB\-v, \-\-verbose\fR
86.RS 4
87Be more verbose\&.
88.RE
89.PP
90\fB\-q, \-\-quiet\fR
91.RS 4
92Be less verbose; suppress unimportant output\&.
93.RE
94.PP
95\fB\-\-log\fR=\fIFILENAME\fR
96.RS 4
97Log file where a complete (maximum verbosity) record will be kept\&.
98.RE
99.PP
100\fB\-\-proxy\fR=\fIPROXY\fR
101.RS 4
102Have pip use a proxy server to access sites\&. This can be specified using "user:password@proxy\&.server:port" notation\&. If the password is left out, pip will ask for it\&.
103.RE
104.PP
105\fB\-\-exists\-action\fR=\fIEXISTS_ACTION\fR
106.RS 4
107Default action when a path already exists\&.Use this option more then one time to specify another action if a certain option is not available, choices: (s)witch, (i)gnore, (w)ipe, (b)ackup
108.RE
109.PP
110\fB\-\-timeout\fR=\fITIMEOUT\fR
111.RS 4
112Set the timeout for connecting to download sites, in seconds\&. This defaults to 15 seconds if not given\&.
113.RE
114.SH "AUTHORS"
115.sp
116.if n \{\
117.RS 4
118.\}
119.nf
120This manual page was originally written by Jeff Licquia <licquia@debian\&.org>, later rewritten by Carl Chenet <chaica@debian\&.org>\&.
121.fi
122.if n \{\
123.RE
124.\}
125.SH "LICENSE"
126.sp
127.if n \{\
128.RS 4
129.\}
130.nf
131Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, version 3 or any later version published by the Free Software Foundation\&.
132.fi
133.if n \{\
134.RE
135.\}
1360
=== renamed file 'debian/pip-3.2.1' => 'debian/pip3.1'
=== modified file 'debian/python-pip.manpages'
--- debian/python-pip.manpages 2012-06-05 23:03:13 +0000
+++ debian/python-pip.manpages 2013-03-14 13:09:28 +0000
@@ -1,3 +1,2 @@
1debian/pip.11debian/pip.1
2debian/pip-2.6.1
3debian/pip-2.7.12debian/pip-2.7.1
43
=== modified file 'debian/python3-pip.manpages'
--- debian/python3-pip.manpages 2012-05-27 04:14:03 +0000
+++ debian/python3-pip.manpages 2013-03-14 13:09:28 +0000
@@ -1,1 +1,1 @@
1debian/pip-3.2.11debian/pip3.1
22
=== modified file 'debian/rules'
--- debian/rules 2012-11-06 15:38:25 +0000
+++ debian/rules 2013-03-14 13:09:28 +0000
@@ -23,6 +23,9 @@
23 rm -rf build23 rm -rf build
24 rm -rf *.egg-info24 rm -rf *.egg-info
2525
26override_dh_links:26override_dh_link:
27 dh_links27 dh_link
28 dh_links -p python3-pip usr/bin/pip-$(shell py3versions -vd) usr/bin/pip328 dh_link -p python3-pip usr/bin/pip-$(shell py3versions -vd) usr/bin/pip3
29 set -ex; for py in $(PYTHON3) ; do \
30 dh_link -p python3-pip usr/share/man/man1/pip3.1.gz usr/share/man/man1/pip-$$py.1.gz; \
31 done;

Subscribers

People subscribed via source and target branches