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

[Michael Vogt]

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

[Chris Coulson (chrisccoulson)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-24 22:30:44 +0000
+++ debian/changelog	2011-04-20 11:55:52 +0000
@@ -1,3 +1,10 @@
+nss (3.12.9+ckbi-1.82-0ubuntu2) natty; urgency=low
+
+  * add explicit conflict to sunbird for systems that have this
+    package leftover from karmic days (LP: #760713)
+
+ -- Michael Vogt <[e-mail]>  Wed, 20 Apr 2011 13:45:50 +0200
+
 nss (3.12.9+ckbi-1.82-0ubuntu1) natty; urgency=low
 
   * New upstream release v3.12.9 with updated ckbi module

=== modified file 'debian/control'
--- debian/control	2011-01-11 22:12:46 +0000
+++ debian/control	2011-04-20 11:55:52 +0000
@@ -12,7 +12,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: libnss3-1d
-Conflicts: libnss3-1d (<< 3.12.9~b2)
+Conflicts: libnss3-1d (<< 3.12.9~b2), sunbird
 Description: Network Security Service libraries
  This is a set of libraries designed to support cross-platform development
  of security-enabled client and server applications. It can support SSLv2