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

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

Please note that 0.7.1-0ubuntu2 has been uploaded.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'changelog'
2--- changelog 2009-07-03 08:16:01 +0000
3+++ changelog 2009-07-07 11:59:12 +0000
4@@ -1,3 +1,15 @@
5+network-manager-vpnc (0.7.1-0ubuntu2) karmic; urgency=low
6+
7+ * debian/rules:
8+ - Update DEB_DESTDIR to $(CURDIR)/debian/network-manager-vpnc instead of
9+ $(CURDIR)/debian/tmp/ so that the files we build actually get installed.
10+ - Fixes LP: #395541
11+ * debian/control:
12+ - Add missing dependency on ${misc:Depends} for network-manager-vpnc.
13+ - Bump standards version to 3.8.2.
14+
15+ -- Cody A.W. Somerville <cody-somerville@ubuntu.com> Tue, 07 Jul 2009 08:57:30 -0300
16+
17 network-manager-vpnc (0.7.1-0ubuntu1) karmic; urgency=low
18
19 * New upstream release 0.7.1 final
20
21=== modified file 'control'
22--- control 2009-06-25 18:46:44 +0000
23+++ control 2009-07-07 11:59:12 +0000
24@@ -13,12 +13,12 @@
25 libdbus-glib-1-dev,
26 patchutils,
27 libglade2-dev
28-Standards-Version: 3.7.2
29+Standards-Version: 3.8.2
30 Vcs-Bzr: http://code.launchpad.net/~network-manager/network-manager/vpnc-ubuntu.0.7.1
31
32 Package: network-manager-vpnc
33 Architecture: any
34-Depends: ${shlibs:Depends}, vpnc
35+Depends: ${shlibs:Depends}, ${misc:Depends}, vpnc
36 Description: network management framework (VPNC plugin)
37 NetworkManager attempts to keep an active network connection available at
38 all times. It is intended primarily for laptops where it allows easy
39
40=== modified file 'rules'
41--- rules 2009-07-03 08:16:01 +0000
42+++ rules 2009-07-07 11:59:12 +0000
43@@ -12,7 +12,7 @@
44 include /usr/share/cdbs/1/rules/simple-patchsys.mk
45 include /usr/share/cdbs/1/class/autotools.mk
46
47-DEB_DESTDIR = $(CURDIR)/debian/tmp/
48+DEB_DESTDIR = $(CURDIR)/debian/network-manager-vpnc/
49
50 get-orig-source::
51 set -e; if echo $(DEB_VERSION) | grep -c "git"; \

Subscribers

People subscribed via source and target branches