NetworkManager

Merge lp://staging/~cyphermox/network-manager/pptp.lucid into lp://staging/~network-manager/network-manager/pptp-ubuntu.head

  1. pptp.lucid
  2. Merge into pptp-ubuntu.head
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~cyphermox/network-manager/pptp.lucid
Merge into: lp://staging/~network-manager/network-manager/pptp-ubuntu.head
Diff against target: 62 lines (+15/-8)
3 files modified
debian/changelog (+8/-4)
debian/control (+4/-4)
debian/rules (+3/-0)
To merge this branch: bzr merge lp://staging/~cyphermox/network-manager/pptp.lucid
Reviewer Review Type Date Requested Status
Network-manager Pending
Review via email: mp+16497@code.staging.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 2009-10-23 12:41:24 +0000
3+++ debian/changelog 2009-12-22 19:29:11 +0000
4@@ -1,10 +1,14 @@
5-network-manager-pptp (0.8~a~git.20091021t224529.418b3c8-0ubuntu1) UNRELEASED; urgency=low
6+network-manager-pptp (0.8~rc1-0ubuntu1) lucid; urgency=low
7
8- * upstream snapshot 2009-10-21 22:45:29 (GMT)
9- + 418b3c8f953e516df049c4c764e3467c0a19512a
10+ * upstream release tagged 0.7.997 (NM 0.8~rc1)
11+ + 0.7.997
12+ - core: resolve pptp gateway hostname
13 - properties: fix MPPE EAP method combinations (LP: #438834)
14+ * Add logic to map ~rc1 to 0.7.997 tag, as per the main NM branch.
15+ * Bump build-deps to require NM 0.8~rc1.
16+ * Update Standards-Version to 3.8.3.
17
18- -- Mathieu Trudel <mathieu.tl@gmail.com> Fri, 23 Oct 2009 08:39:11 -0400
19+ -- Mathieu Trudel <mathieu-tl@ubuntu.com> Tue, 22 Dec 2009 14:16:41 -0500
20
21 network-manager-pptp (0.8~a~git.20091013t190309.0c39c37-0ubuntu1) karmic; urgency=low
22
23
24=== modified file 'debian/control'
25--- debian/control 2009-10-02 11:47:35 +0000
26+++ debian/control 2009-12-22 19:29:11 +0000
27@@ -6,9 +6,9 @@
28 Build-Depends: debhelper (>= 5.0.0),
29 cdbs,
30 autotools-dev,
31- network-manager-dev (>= 0.8~a~git.20090930t162132),
32- libnm-util-dev (>= 0.8~a~git.20090930t162132),
33- libnm-glib-dev (>= 0.8~a~git.20090930t162132),
34+ network-manager-dev (>= 0.8~rc1),
35+ libnm-util-dev (>= 0.8~rc1),
36+ libnm-glib-dev (>= 0.8~rc1),
37 ppp-dev (>= 2.4.5~git),
38 automake1.9,
39 gnome-common,
40@@ -16,7 +16,7 @@
41 libgnomeui-dev,
42 libdbus-glib-1-dev,
43 libglade2-dev
44-Standards-Version: 3.8.2
45+Standards-Version: 3.8.3
46 Vcs-Bzr: http://code.launchpad.net/~network-manager/network-manager/pptp-ubuntu.0.7.1
47
48 Package: network-manager-pptp
49
50=== modified file 'debian/rules'
51--- debian/rules 2009-09-07 16:32:03 +0000
52+++ debian/rules 2009-12-22 19:29:11 +0000
53@@ -60,6 +60,9 @@
54 set -e; if echo $(DEB_VERSION) | grep -q -c "git"; \
55 then \
56 git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9t]*\)\.\(.*\)-.*$$/\2/g'`; \
57+ elif echo $(DEB_VERSION) | grep -q -c "rc1"; \
58+ then \
59+ git_version="0.7.997"; \
60 else \
61 git_version=$(DEB_UPSTREAM_VERSION); \
62 fi; \

Subscribers

People subscribed via source and target branches