NetworkManager

Merge lp://qastaging/~cody-somerville/network-manager/openvpn-fix-lp395541 into lp://qastaging/~network-manager/network-manager/openvpn-ubuntu.0.7.1

  1. openvpn-fix-lp395541
  2. Merge into openvpn-ubuntu.0.7.1
Proposed by Cody A.W. Somerville
Status: Merged
Approved by: Alexander Sack
Approved revision: 9
Merged at revision: not available
Proposed branch: lp://qastaging/~cody-somerville/network-manager/openvpn-fix-lp395541
Merge into: lp://qastaging/~network-manager/network-manager/openvpn-ubuntu.0.7.1
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~cody-somerville/network-manager/openvpn-fix-lp395541
Reviewer Review Type Date Requested Status
Alexander Sack Approve
Review via email: mp+8289@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Cody A.W. Somerville (cody-somerville) wrote :

This fixes Bug #395541 (network-manager openvpn package has no implementation) and fixes two lintian warnings (missing misc:Depends and old standards version).

Revision history for this message
Cody A.W. Somerville (cody-somerville) wrote :

Please note that I've uploaded this.

Revision history for this message
Alexander Sack (asac) wrote :

thanks for the fix.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'changelog'
--- changelog 2009-07-03 08:13:28 +0000
+++ changelog 2009-07-07 02:49:42 +0000
@@ -1,3 +1,15 @@
1network-manager-openvpn (0.7.1-0ubuntu2) karmic; urgency=low
2
3 * debian/rules:
4 - Update DEB_DESTDIR to $(CURDIR)/debian/network-manager-openvpn instead of
5 $(CURDIR)/debian/tmp/ so that the files we build actually get installed.
6 - Fixes LP: #395541
7 * debian/control:
8 - Add missing dependency on ${misc:Depends} for network-manager-openvpn.
9 - Bump standards version to 3.8.2.
10
11 -- Cody A.W. Somerville <cody-somerville@ubuntu.com> Mon, 06 Jul 2009 23:36:29 -0300
12
1network-manager-openvpn (0.7.1-0ubuntu1) karmic; urgency=low13network-manager-openvpn (0.7.1-0ubuntu1) karmic; urgency=low
214
3 * New upstream release 0.7.1 final 15 * New upstream release 0.7.1 final
416
=== modified file 'control'
--- control 2009-06-25 18:48:15 +0000
+++ control 2009-07-07 02:49:42 +0000
@@ -16,12 +16,12 @@
16 patchutils,16 patchutils,
17 quilt,17 quilt,
18 libglade2-dev18 libglade2-dev
19Standards-Version: 3.7.219Standards-Version: 3.8.2
20Vcs-Bzr: http://code.launchpad.net/~network-manager/network-manager/openvpn-ubuntu.0.7.120Vcs-Bzr: http://code.launchpad.net/~network-manager/network-manager/openvpn-ubuntu.0.7.1
2121
22Package: network-manager-openvpn22Package: network-manager-openvpn
23Architecture: any23Architecture: any
24Depends: ${shlibs:Depends}, openvpn24Depends: ${shlibs:Depends}, ${misc:Depends}, openvpn
25Description: network management framework (OpenVPN plugin)25Description: network management framework (OpenVPN plugin)
26 NetworkManager attempts to keep an active network connection available at26 NetworkManager attempts to keep an active network connection available at
27 all times. It is intended primarily for laptops where it allows easy27 all times. It is intended primarily for laptops where it allows easy
2828
=== modified file 'rules'
--- rules 2009-07-03 08:13:28 +0000
+++ rules 2009-07-07 02:49:42 +0000
@@ -15,7 +15,7 @@
1515
16#DEB_DH_MAKESHLIBS_ARGS_network-manager-openvpn := -n16#DEB_DH_MAKESHLIBS_ARGS_network-manager-openvpn := -n
1717
18DEB_DESTDIR = $(CURDIR)/debian/tmp/18DEB_DESTDIR = $(CURDIR)/debian/network-manager-openvpn/
1919
20get-orig-source::20get-orig-source::
21 set -e; if echo $(DEB_VERSION) | grep -c "git"; \21 set -e; if echo $(DEB_VERSION) | grep -c "git"; \

Subscribers

People subscribed via source and target branches