Merge lp:~cyphermox/ubuntu/oneiric/liboauth/nss-dev into lp:ubuntu/oneiric/liboauth

Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merged at revision: 10
Proposed branch: lp:~cyphermox/ubuntu/oneiric/liboauth/nss-dev
Merge into: lp:ubuntu/oneiric/liboauth
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~cyphermox/ubuntu/oneiric/liboauth/nss-dev
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
Review via email: mp+71256@code.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
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-08-10 14:51:38 +0000
3+++ debian/changelog 2011-08-11 18:57:50 +0000
4@@ -1,3 +1,10 @@
5+liboauth (0.9.4-2ubuntu1) UNRELEASED; urgency=low
6+
7+ * debian/control: liboauth-dev really needs libcurl4-nss-dev, not
8+ libcurl4-gnutls-dev (nss is required in the .pc file)
9+
10+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Thu, 11 Aug 2011 14:34:17 -0400
11+
12 liboauth (0.9.4-2) unstable; urgency=low
13
14 * Make package multiarch-aware.
15
16=== modified file 'debian/control'
17--- debian/control 2011-08-10 14:51:38 +0000
18+++ debian/control 2011-08-11 18:57:50 +0000
19@@ -16,7 +16,7 @@
20 Package: liboauth-dev
21 Section: libdevel
22 Architecture: any
23-Depends: liboauth0 (= ${binary:Version}), libcurl4-gnutls-dev, ${misc:Depends}
24+Depends: liboauth0 (= ${binary:Version}), libcurl4-nss-dev, ${misc:Depends}
25 Description: C library for implementing OAuth 1.0 (development files)
26 liboauth is a collection of C functions implementing the
27 OAuth Core 1.0 standard API. liboauth provides basic functions to escape

Subscribers

People subscribed via source and target branches