Merge lp://staging/~cody-somerville/network-manager/vpnc-fix-lp395541 into lp://staging/~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://staging/~cody-somerville/network-manager/vpnc-fix-lp395541
Merge into: lp://staging/~network-manager/network-manager/vpnc-ubuntu.0.7.1
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~cody-somerville/network-manager/vpnc-fix-lp395541
Reviewer Review Type Date Requested Status
Network-manager Pending
Review via email: mp+8308@code.staging.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
=== modified file 'changelog'
--- changelog 2009-07-03 08:16:01 +0000
+++ changelog 2009-07-07 11:59:12 +0000
@@ -1,3 +1,15 @@
1network-manager-vpnc (0.7.1-0ubuntu2) karmic; urgency=low
2
3 * debian/rules:
4 - Update DEB_DESTDIR to $(CURDIR)/debian/network-manager-vpnc 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-vpnc.
9 - Bump standards version to 3.8.2.
10
11 -- Cody A.W. Somerville <cody-somerville@ubuntu.com> Tue, 07 Jul 2009 08:57:30 -0300
12
1network-manager-vpnc (0.7.1-0ubuntu1) karmic; urgency=low13network-manager-vpnc (0.7.1-0ubuntu1) karmic; urgency=low
214
3 * New upstream release 0.7.1 final15 * New upstream release 0.7.1 final
416
=== modified file 'control'
--- control 2009-06-25 18:46:44 +0000
+++ control 2009-07-07 11:59:12 +0000
@@ -13,12 +13,12 @@
13 libdbus-glib-1-dev,13 libdbus-glib-1-dev,
14 patchutils,14 patchutils,
15 libglade2-dev15 libglade2-dev
16Standards-Version: 3.7.216Standards-Version: 3.8.2
17Vcs-Bzr: http://code.launchpad.net/~network-manager/network-manager/vpnc-ubuntu.0.7.117Vcs-Bzr: http://code.launchpad.net/~network-manager/network-manager/vpnc-ubuntu.0.7.1
1818
19Package: network-manager-vpnc19Package: network-manager-vpnc
20Architecture: any20Architecture: any
21Depends: ${shlibs:Depends}, vpnc21Depends: ${shlibs:Depends}, ${misc:Depends}, vpnc
22Description: network management framework (VPNC plugin)22Description: network management framework (VPNC plugin)
23 NetworkManager attempts to keep an active network connection available at23 NetworkManager attempts to keep an active network connection available at
24 all times. It is intended primarily for laptops where it allows easy24 all times. It is intended primarily for laptops where it allows easy
2525
=== modified file 'rules'
--- rules 2009-07-03 08:16:01 +0000
+++ rules 2009-07-07 11:59:12 +0000
@@ -12,7 +12,7 @@
12include /usr/share/cdbs/1/rules/simple-patchsys.mk12include /usr/share/cdbs/1/rules/simple-patchsys.mk
13include /usr/share/cdbs/1/class/autotools.mk13include /usr/share/cdbs/1/class/autotools.mk
1414
15DEB_DESTDIR = $(CURDIR)/debian/tmp/15DEB_DESTDIR = $(CURDIR)/debian/network-manager-vpnc/
1616
17get-orig-source::17get-orig-source::
18 set -e; if echo $(DEB_VERSION) | grep -c "git"; \18 set -e; if echo $(DEB_VERSION) | grep -c "git"; \

Subscribers

People subscribed via source and target branches