Mercurial > hg > release > icedtea6-1.9

changeset 2027:86669f47e779

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move NSS patch to main patch block. 2010-04-12 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Make NSS patch to main block as it's now applied unconditionally.
author Andrew John Hughes <ahughes@redhat.com>
date Mon, 12 Apr 2010 13:29:35 +0100
parents bda25ffc4b05
children 221817e944c5
files ChangeLog Makefile.am
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Apr 12 13:27:45 2010 +0100
+++ b/ChangeLog	Mon Apr 12 13:29:35 2010 +0100
@@ -1,3 +1,9 @@
+2010-04-12  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	Make NSS patch to main block as it's
+	now applied unconditionally.
+
 2010-04-12  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Mon Apr 12 13:27:45 2010 +0100
+++ b/Makefile.am	Mon Apr 12 13:29:35 2010 +0100
@@ -335,7 +335,8 @@
 	patches/security/20100330/6910590.patch \
 	patches/security/20100330/6914823.patch \
 	patches/security/20100330/6914866.patch \
-	patches/security/20100330/6932480.patch
+	patches/security/20100330/6932480.patch \
+	patches/icedtea-nss-6763530.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
@@ -386,7 +387,6 @@
 ICEDTEA_PATCHES += patches/icedtea-systemtap.patch
 endif
 
-ICEDTEA_PATCHES += patches/icedtea-nss-6763530.patch
 if ENABLE_NSS
 ICEDTEA_PATCHES += patches/icedtea-nss-config.patch
 else