NetworkManager

Merge lp:~mariusko/network-manager/ubuntu into lp:~network-manager/network-manager/ubuntu

  1. ubuntu
  2. Merge into ubuntu
Proposed by Marius B. Kotsbak
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 631
Merged at revision: 636
Proposed branch: lp:~mariusko/network-manager/ubuntu
Merge into: lp:~network-manager/network-manager/ubuntu
Diff against target: 28 lines (+9/-1)
2 files modified
debian/changelog (+7/-0)
debian/rules (+2/-1)
To merge this branch: bzr merge lp:~mariusko/network-manager/ubuntu
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Review via email: mp+145277@code.launchpad.net

Description of the change

Fixed connection tracker.

To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Ack.

review: Approve

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 2013-01-07 16:25:27 +0000
3+++ debian/changelog 2013-01-28 23:28:29 +0000
4@@ -1,3 +1,10 @@
5+network-manager (0.9.6.0+git201301021750.e78c3e8-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * debian/rules: enable connectivity check again, which is now optional,
8+ with configure option "--enable-concheck".
9+
10+ -- Marius Kotsbak <marius@kotsbak.com> Mon, 28 Jan 2013 23:28:43 +0100
11+
12 network-manager (0.9.6.0+git201301021750.e78c3e8-0ubuntu1) raring; urgency=low
13
14 [ Mathieu Trudel-Lapierre ]
15
16=== modified file 'debian/rules'
17--- debian/rules 2013-01-03 14:54:05 +0000
18+++ debian/rules 2013-01-28 23:28:29 +0000
19@@ -35,7 +35,8 @@
20 --enable-introspection \
21 --enable-vala \
22 --with-tests \
23- --with-docs
24+ --with-docs \
25+ --enable-concheck
26
27 override_dh_install:
28 # Get rid of .la files.

Subscribers

People subscribed via source and target branches