Ubuntu
software-properties package

Merge lp:~jibel/ubuntu/saucy/software-properties/lp1229092 into lp:ubuntu/saucy/software-properties

  1. Saucy (13.10)
  2. lp1229092
  3. Merge into saucy
Proposed by Jean-Baptiste Lallement
Status: Merged
Merge reported by: Brian Murray
Merged at revision: not available
Proposed branch: lp:~jibel/ubuntu/saucy/software-properties/lp1229092
Merge into: lp:ubuntu/saucy/software-properties
Diff against target: 38 lines (+13/-0)
2 files modified
debian/changelog (+7/-0)
debian/manpages/add-apt-repository.1 (+6/-0)
To merge this branch: bzr merge lp:~jibel/ubuntu/saucy/software-properties/lp1229092
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Review via email: mp+186985@code.launchpad.net

Commit message

* debian/manpages/add-apt-repository.1:
   - Documented options -m and -s of add-apt-repository (LP: #1229092)

Description of the change

debian/manpages/add-apt-repository.1: Documented options -m and -s of add-apt-repository (LP: #1229092)

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Looks good

review: Approve
Revision history for this message
Brian Murray (brian-murray) wrote :

I manually merged this with the upstream version of software-properties. Thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-09-18 13:17:35 +0000
3+++ debian/changelog 2013-09-23 09:19:25 +0000
4@@ -1,3 +1,10 @@
5+software-properties (0.92.26ubuntu1) UNRELEASED; urgency=low
6+
7+ * debian/manpages/add-apt-repository.1: Documented options -m and -s of
8+ add-apt-repository (LP: #1229092)
9+
10+ -- Jean-Baptiste Lallement <jean-baptiste.lallement@canonical.com> Mon, 23 Sep 2013 11:09:37 +0200
11+
12 software-properties (0.92.26) saucy; urgency=low
13
14 * SECURITY UPDATE: possible privilege escalation via policykit UID lookup
15
16=== modified file 'debian/manpages/add-apt-repository.1'
17--- debian/manpages/add-apt-repository.1 2012-08-27 09:56:47 +0000
18+++ debian/manpages/add-apt-repository.1 2013-09-23 09:19:25 +0000
19@@ -16,6 +16,9 @@
20 .B -h, --help
21 Show help message and exit
22
23+.B -m, --massive-debug
24+Print a lot of debug information to the command line
25+
26 .B -r, --remove
27 Remove the specified repository
28
29@@ -25,6 +28,9 @@
30 .B -k, --keyserver
31 Use a custom keyserver URL instead of the default
32
33+.B -s, --enable-source
34+Allow downloading of the source packages from the repository
35+
36
37 .SH REPOSITORY STRING
38 \fIREPOSITORY\fR can be either a line that can be added directly to

Subscribers

People subscribed via source and target branches