NetworkManager

Merge lp://qastaging/~cyphermox/network-manager/pptp.lucid into lp://qastaging/~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://qastaging/~cyphermox/network-manager/pptp.lucid
Merge into: lp://qastaging/~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://qastaging/~cyphermox/network-manager/pptp.lucid
Reviewer Review Type Date Requested Status
Network-manager Pending
Review via email: mp+16497@code.qastaging.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
=== modified file 'debian/changelog'
--- debian/changelog 2009-10-23 12:41:24 +0000
+++ debian/changelog 2009-12-22 19:29:11 +0000
@@ -1,10 +1,14 @@
1network-manager-pptp (0.8~a~git.20091021t224529.418b3c8-0ubuntu1) UNRELEASED; urgency=low1network-manager-pptp (0.8~rc1-0ubuntu1) lucid; urgency=low
22
3 * upstream snapshot 2009-10-21 22:45:29 (GMT)3 * upstream release tagged 0.7.997 (NM 0.8~rc1)
4 + 418b3c8f953e516df049c4c764e3467c0a19512a4 + 0.7.997
5 - core: resolve pptp gateway hostname
5 - properties: fix MPPE EAP method combinations (LP: #438834)6 - properties: fix MPPE EAP method combinations (LP: #438834)
7 * Add logic to map ~rc1 to 0.7.997 tag, as per the main NM branch.
8 * Bump build-deps to require NM 0.8~rc1.
9 * Update Standards-Version to 3.8.3.
610
7 -- Mathieu Trudel <mathieu.tl@gmail.com> Fri, 23 Oct 2009 08:39:11 -040011 -- Mathieu Trudel <mathieu-tl@ubuntu.com> Tue, 22 Dec 2009 14:16:41 -0500
812
9network-manager-pptp (0.8~a~git.20091013t190309.0c39c37-0ubuntu1) karmic; urgency=low13network-manager-pptp (0.8~a~git.20091013t190309.0c39c37-0ubuntu1) karmic; urgency=low
1014
1115
=== modified file 'debian/control'
--- debian/control 2009-10-02 11:47:35 +0000
+++ debian/control 2009-12-22 19:29:11 +0000
@@ -6,9 +6,9 @@
6Build-Depends: debhelper (>= 5.0.0),6Build-Depends: debhelper (>= 5.0.0),
7 cdbs,7 cdbs,
8 autotools-dev,8 autotools-dev,
9 network-manager-dev (>= 0.8~a~git.20090930t162132),9 network-manager-dev (>= 0.8~rc1),
10 libnm-util-dev (>= 0.8~a~git.20090930t162132),10 libnm-util-dev (>= 0.8~rc1),
11 libnm-glib-dev (>= 0.8~a~git.20090930t162132),11 libnm-glib-dev (>= 0.8~rc1),
12 ppp-dev (>= 2.4.5~git),12 ppp-dev (>= 2.4.5~git),
13 automake1.9,13 automake1.9,
14 gnome-common,14 gnome-common,
@@ -16,7 +16,7 @@
16 libgnomeui-dev,16 libgnomeui-dev,
17 libdbus-glib-1-dev,17 libdbus-glib-1-dev,
18 libglade2-dev18 libglade2-dev
19Standards-Version: 3.8.219Standards-Version: 3.8.3
20Vcs-Bzr: http://code.launchpad.net/~network-manager/network-manager/pptp-ubuntu.0.7.120Vcs-Bzr: http://code.launchpad.net/~network-manager/network-manager/pptp-ubuntu.0.7.1
2121
22Package: network-manager-pptp22Package: network-manager-pptp
2323
=== modified file 'debian/rules'
--- debian/rules 2009-09-07 16:32:03 +0000
+++ debian/rules 2009-12-22 19:29:11 +0000
@@ -60,6 +60,9 @@
60 set -e; if echo $(DEB_VERSION) | grep -q -c "git"; \60 set -e; if echo $(DEB_VERSION) | grep -q -c "git"; \
61 then \61 then \
62 git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9t]*\)\.\(.*\)-.*$$/\2/g'`; \62 git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9t]*\)\.\(.*\)-.*$$/\2/g'`; \
63 elif echo $(DEB_VERSION) | grep -q -c "rc1"; \
64 then \
65 git_version="0.7.997"; \
63 else \66 else \
64 git_version=$(DEB_UPSTREAM_VERSION); \67 git_version=$(DEB_UPSTREAM_VERSION); \
65 fi; \68 fi; \

Subscribers

People subscribed via source and target branches