NSS

Merge lp:~mvo/nss/nss.mvo into lp:~mozillateam/nss/nss.head

Proposed by Michael Vogt on 2011-04-20
Status: Merged
Merged at revision: 126
Proposed branch: lp:~mvo/nss/nss.mvo
Merge into: lp:~mozillateam/nss/nss.head
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:~mvo/nss/nss.mvo
Reviewer Review Type Date Requested Status
Chris Coulson 2011-04-20 Approve on 2011-04-20
Review via email: mp+58479@code.launchpad.net

Description of the change

Please merge my latest upload. Its a tiny conflict addition to help the upgader.

To post a comment you must log in.
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 2011-03-24 22:30:44 +0000
3+++ debian/changelog 2011-04-20 11:55:52 +0000
4@@ -1,3 +1,10 @@
5+nss (3.12.9+ckbi-1.82-0ubuntu2) natty; urgency=low
6+
7+ * add explicit conflict to sunbird for systems that have this
8+ package leftover from karmic days (LP: #760713)
9+
10+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 20 Apr 2011 13:45:50 +0200
11+
12 nss (3.12.9+ckbi-1.82-0ubuntu1) natty; urgency=low
13
14 * New upstream release v3.12.9 with updated ckbi module
15
16=== modified file 'debian/control'
17--- debian/control 2011-01-11 22:12:46 +0000
18+++ debian/control 2011-04-20 11:55:52 +0000
19@@ -12,7 +12,7 @@
20 Architecture: any
21 Depends: ${shlibs:Depends}, ${misc:Depends}
22 Replaces: libnss3-1d
23-Conflicts: libnss3-1d (<< 3.12.9~b2)
24+Conflicts: libnss3-1d (<< 3.12.9~b2), sunbird
25 Description: Network Security Service libraries
26 This is a set of libraries designed to support cross-platform development
27 of security-enabled client and server applications. It can support SSLv2

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: