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
=== modified file 'debian/changelog'
--- debian/changelog 2011-08-10 14:51:38 +0000
+++ debian/changelog 2011-08-11 18:57:50 +0000
@@ -1,3 +1,10 @@
1liboauth (0.9.4-2ubuntu1) UNRELEASED; urgency=low
2
3 * debian/control: liboauth-dev really needs libcurl4-nss-dev, not
4 libcurl4-gnutls-dev (nss is required in the .pc file)
5
6 -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Thu, 11 Aug 2011 14:34:17 -0400
7
1liboauth (0.9.4-2) unstable; urgency=low8liboauth (0.9.4-2) unstable; urgency=low
29
3 * Make package multiarch-aware.10 * Make package multiarch-aware.
411
=== modified file 'debian/control'
--- debian/control 2011-08-10 14:51:38 +0000
+++ debian/control 2011-08-11 18:57:50 +0000
@@ -16,7 +16,7 @@
16Package: liboauth-dev16Package: liboauth-dev
17Section: libdevel17Section: libdevel
18Architecture: any18Architecture: any
19Depends: liboauth0 (= ${binary:Version}), libcurl4-gnutls-dev, ${misc:Depends}19Depends: liboauth0 (= ${binary:Version}), libcurl4-nss-dev, ${misc:Depends}
20Description: C library for implementing OAuth 1.0 (development files)20Description: C library for implementing OAuth 1.0 (development files)
21 liboauth is a collection of C functions implementing the21 liboauth is a collection of C functions implementing the
22 OAuth Core 1.0 standard API. liboauth provides basic functions to escape22 OAuth Core 1.0 standard API. liboauth provides basic functions to escape

Subscribers

People subscribed via source and target branches