# HG changeset patch
# User Robert Brand <mozrob@googlemail.com>
# Date 1327232927 -3600
# Node ID d5640e2a80b4c0c3619b799213c2aa8227c4f2e3
# Parent  52c0e2bab03bf1cbfe5aded1b0c524e09160816d
Port | Bug 694353. (Bv1-CC) Stop explicitly packaging NSS .chk files which are now created in the staging directory directly, Reorder PSM files. | to package-manifest.in

diff -r 52c0e2bab03b -r d5640e2a80b4 calendar/installer/package-manifest.in
--- a/calendar/installer/package-manifest.in	Sun Jan 22 12:41:18 2012 +0100
+++ b/calendar/installer/package-manifest.in	Sun Jan 22 12:48:47 2012 +0100
@@ -1,5 +1,10 @@
 ; Package file for Win32 static Sunbird build.
 ;
+; Packaging manifest is used to copy files from dist/bin
+; to the staging directory.
+; Some other files are built in the staging directory directly,
+; so they will be implicitly packaged too.
+;
 ; File format:
 ;
 ; [] designates a toplevel component. Example: [xpcom]
@@ -498,22 +503,22 @@
 
 ; [Personal Security Manager]
 ;
+; NSS libraries are signed in the staging directory,
+; meaning their .chk files are created there directly.
+;
+@BINPATH@/freebl3@DLL_SUFFIX@
+@BINPATH@/nss3@DLL_SUFFIX@
 @BINPATH@/nssckbi@DLL_SUFFIX@
-@BINPATH@/nssdbm3.chk
 @BINPATH@/nssdbm3@DLL_SUFFIX@
+@BINPATH@/nssutil3@DLL_SUFFIX@
+@BINPATH@/smime3@DLL_SUFFIX@
+@BINPATH@/softokn3@DLL_SUFFIX@
+@BINPATH@/ssl3@DLL_SUFFIX@
+@BINPATH@/chrome/pippki.jar
+@BINPATH@/chrome/pippki.manifest
 @BINPATH@/components/pipboot.xpt
 @BINPATH@/components/pipnss.xpt
 @BINPATH@/components/pippki.xpt
-@BINPATH@/nss3@DLL_SUFFIX@
-@BINPATH@/nssutil3@DLL_SUFFIX@
-@BINPATH@/smime3@DLL_SUFFIX@
-@BINPATH@/softokn3.chk
-@BINPATH@/softokn3@DLL_SUFFIX@
-@BINPATH@/freebl3.chk
-@BINPATH@/freebl3@DLL_SUFFIX@
-@BINPATH@/ssl3@DLL_SUFFIX@
-@BINPATH@/chrome/pippki.jar
-@BINPATH@/chrome/pippki.manifest
 
 ; [Updater]
 ;