Ubuntu

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
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

1=== modified file 'debian/changelog'
2--- debian/changelog 2012-11-06 22:48:27 +0000
3+++ debian/changelog 2013-03-14 13:09:28 +0000
4@@ -1,3 +1,10 @@
5+python-pip (1.1-3ubuntu4) raring; urgency=low
6+
7+ * Really install the pip3 symlink (by fixing name of dh_link command).
8+ * Install manpages for all scripts, and drop manpage for 2.6.
9+
10+ -- Dmitry Shachnev <mitya57@ubuntu.com> Thu, 14 Mar 2013 16:53:35 +0400
11+
12 python-pip (1.1-3ubuntu3) raring; urgency=low
13
14 * Drop python3.2.
15
16=== removed file 'debian/pip-2.6.1'
17--- debian/pip-2.6.1 2012-06-05 23:03:13 +0000
18+++ debian/pip-2.6.1 1970-01-01 00:00:00 +0000
19@@ -1,135 +0,0 @@
20-'\" t
21-.\" Title: pip-2.6
22-.\" Author: [see the "AUTHORS" section]
23-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
24-.\" Date: 05/27/2012
25-.\" Manual: \ \&
26-.\" Source: \ \&
27-.\" Language: English
28-.\"
29-.TH "PIP-2.6" "1" "05/27/2012" "\ \&" "\ \&"
30-.\" -----------------------------------------------------------------
31-.\" * Define some portability stuff
32-.\" -----------------------------------------------------------------
33-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
34-.\" http://bugs.debian.org/507673
35-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
36-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
37-.ie \n(.g .ds Aq \(aq
38-.el .ds Aq '
39-.\" -----------------------------------------------------------------
40-.\" * set default formatting
41-.\" -----------------------------------------------------------------
42-.\" disable hyphenation
43-.nh
44-.\" disable justification (adjust text to left margin only)
45-.ad l
46-.\" -----------------------------------------------------------------
47-.\" * MAIN CONTENT STARTS HERE *
48-.\" -----------------------------------------------------------------
49-.SH "NAME"
50-pip-2.6 \- install Python packages
51-.SH "SYNOPSIS"
52-.sp
53-\fBpip-2.6\fR [\fIcommand\fR] [\fIoptions\fR]
54-.SH "DESCRIPTION"
55-.sp
56-pip 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\&.
57-.sp
58-It 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\&.
59-.SH "COMMANDS"
60-.sp
61-The command comes before any options\&. The following commands are recognized:
62-.PP
63-\fBhelp\fR
64-.RS 4
65-Show the help text\&.
66-.RE
67-.PP
68-\fBbundle\fR
69-.RS 4
70-Create "bundles" which can be used by pip to install the group of Python packages in multiple places\&.
71-.RE
72-.PP
73-\fBfreeze\fR
74-.RS 4
75-Write the current list of installed packages to a requirements file, which can be used by pip to reinstall the same set of packages\&.
76-.RE
77-.PP
78-\fBinstall\fR
79-.RS 4
80-Install packages\&.
81-.RE
82-.PP
83-\fBunzip\fR
84-.RS 4
85-Unzip an individual package\&.
86-.RE
87-.PP
88-\fBzip\fR
89-.RS 4
90-Zip an individual package\&.
91-.RE
92-.SH "OPTIONS"
93-.PP
94-\fB\-h, \-\-help\fR
95-.RS 4
96-Show summary of options\&.
97-.RE
98-.PP
99-\fB\-\-version\fR
100-.RS 4
101-Show the version of the program\&.
102-.RE
103-.PP
104-\fB\-v, \-\-verbose\fR
105-.RS 4
106-Be more verbose\&.
107-.RE
108-.PP
109-\fB\-q, \-\-quiet\fR
110-.RS 4
111-Be less verbose; suppress unimportant output\&.
112-.RE
113-.PP
114-\fB\-\-log\fR=\fIFILENAME\fR
115-.RS 4
116-Log file where a complete (maximum verbosity) record will be kept\&.
117-.RE
118-.PP
119-\fB\-\-proxy\fR=\fIPROXY\fR
120-.RS 4
121-Have 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\&.
122-.RE
123-.PP
124-\fB\-\-exists\-action\fR=\fIEXISTS_ACTION\fR
125-.RS 4
126-Default 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
127-.RE
128-.PP
129-\fB\-\-timeout\fR=\fITIMEOUT\fR
130-.RS 4
131-Set the timeout for connecting to download sites, in seconds\&. This defaults to 15 seconds if not given\&.
132-.RE
133-.SH "AUTHORS"
134-.sp
135-.if n \{\
136-.RS 4
137-.\}
138-.nf
139-This manual page was originally written by Jeff Licquia <licquia@debian\&.org>, later rewritten by Carl Chenet <chaica@debian\&.org>\&.
140-.fi
141-.if n \{\
142-.RE
143-.\}
144-.SH "LICENSE"
145-.sp
146-.if n \{\
147-.RS 4
148-.\}
149-.nf
150-Permission 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\&.
151-.fi
152-.if n \{\
153-.RE
154-.\}
155
156=== renamed file 'debian/pip-3.2.1' => 'debian/pip3.1'
157=== modified file 'debian/python-pip.manpages'
158--- debian/python-pip.manpages 2012-06-05 23:03:13 +0000
159+++ debian/python-pip.manpages 2013-03-14 13:09:28 +0000
160@@ -1,3 +1,2 @@
161 debian/pip.1
162-debian/pip-2.6.1
163 debian/pip-2.7.1
164
165=== modified file 'debian/python3-pip.manpages'
166--- debian/python3-pip.manpages 2012-05-27 04:14:03 +0000
167+++ debian/python3-pip.manpages 2013-03-14 13:09:28 +0000
168@@ -1,1 +1,1 @@
169-debian/pip-3.2.1
170+debian/pip3.1
171
172=== modified file 'debian/rules'
173--- debian/rules 2012-11-06 15:38:25 +0000
174+++ debian/rules 2013-03-14 13:09:28 +0000
175@@ -23,6 +23,9 @@
176 rm -rf build
177 rm -rf *.egg-info
178
179-override_dh_links:
180- dh_links
181- dh_links -p python3-pip usr/bin/pip-$(shell py3versions -vd) usr/bin/pip3
182+override_dh_link:
183+ dh_link
184+ dh_link -p python3-pip usr/bin/pip-$(shell py3versions -vd) usr/bin/pip3
185+ set -ex; for py in $(PYTHON3) ; do \
186+ dh_link -p python3-pip usr/share/man/man1/pip3.1.gz usr/share/man/man1/pip-$$py.1.gz; \
187+ done;

Subscribers

People subscribed via source and target branches