Merge lp:~cyphermox/network-manager/nm-pptp-0ubuntu3 into lp:~network-manager/network-manager/pptp-ubuntu.head

Proposed by Mathieu Trudel-Lapierre
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 50
Merged at revision: not available
Proposed branch: lp:~cyphermox/network-manager/nm-pptp-0ubuntu3
Merge into: lp:~network-manager/network-manager/pptp-ubuntu.head
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~cyphermox/network-manager/nm-pptp-0ubuntu3
Reviewer Review Type Date Requested Status
Network-manager Pending
Review via email: mp+23846@code.launchpad.net
To post a comment you must log in.

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 2010-03-25 13:08:13 +0000
3+++ debian/changelog 2010-04-21 13:39:20 +0000
4@@ -1,3 +1,10 @@
5+network-manager-pptp (0.8-0ubuntu3) lucid; urgency=low
6+
7+ * Recommends network-manager-pptp-kde instead of network-manager-kde
8+ - Closes LP: #562983
9+
10+ -- Anthony Mercatante <tonio@ubuntu.com> Wed, 14 Apr 2010 14:33:23 +0200
11+
12 network-manager-pptp (0.8-0ubuntu2) lucid; urgency=low
13
14 * Add Recommends on network-manager-pptp-gnome or network-manager-kde to
15
16=== modified file 'debian/control'
17--- debian/control 2010-03-25 13:07:12 +0000
18+++ debian/control 2010-04-21 13:39:20 +0000
19@@ -22,7 +22,7 @@
20 Package: network-manager-pptp
21 Architecture: any
22 Depends: pptp-linux, ppp (>= 2.4.5~git), ${shlibs:Depends}, ${misc:Depends}
23-Recommends: network-manager-pptp-gnome | network-manager-kde
24+Recommends: network-manager-pptp-gnome | network-manager-pptp-kde
25 Description: network management framework (PPTP plugin)
26 NetworkManager attempts to keep an active network connection available at
27 all times. It is intended primarily for laptops where it allows easy

Subscribers

People subscribed via source and target branches