[pkg-java] r12169 - trunk/sun-java6/trunk/debian

[Sylvestre Ledru]

Author: sylvestre
Date: 2010-04-16 16:11:26 +0000 (Fri, 16 Apr 2010)
New Revision: 12169

Modified:
   trunk/sun-java6/trunk/debian/
   trunk/sun-java6/trunk/debian/changelog
   trunk/sun-java6/trunk/debian/rules
Log:
  * New upstream release
  * SECURITY UPDATE: multiple upstream vulnerabilities. Upstream fixes:
    - (CVE-2010-0886): Vulnerability in desktop Java
    - (CVE-2010-0887): Vulnerability in desktop Java



Property changes on: trunk/sun-java6/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: trunk/sun-java6/trunk/debian/changelog
===================================================================
--- trunk/sun-java6/trunk/debian/changelog	2010-04-15 16:18:23 UTC (rev 12168)
+++ trunk/sun-java6/trunk/debian/changelog	2010-04-16 16:11:26 UTC (rev 12169)
@@ -1,3 +1,12 @@
+sun-java6 (6.20-1) unstable; urgency=low
+
+  * New upstream release
+  * SECURITY UPDATE: multiple upstream vulnerabilities. Upstream fixes:
+    - (CVE-2010-0886): Vulnerability in desktop Java
+    - (CVE-2010-0887): Vulnerability in desktop Java
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 16 Apr 2010 16:54:12 +0200
+
 sun-java6 (6.19-1) unstable; urgency=low
 
   * Sync from Ubuntu. Thanks to Matthias Klose.

Modified: trunk/sun-java6/trunk/debian/rules
===================================================================
--- trunk/sun-java6/trunk/debian/rules	2010-04-15 16:18:23 UTC (rev 12168)
+++ trunk/sun-java6/trunk/debian/rules	2010-04-16 16:11:26 UTC (rev 12169)
@@ -44,7 +44,7 @@
 jdiralias	:= $(ia32_prefix)java-$(version)-$(VENDOR)
 srcdir		:= $(arch)-jdk
 bin_pattern	= jdk-$(subst .,_,$(version))-dlj-linux-%.bin
-bin_pattern	= jdk-6u19-dlj-linux-%.bin
+bin_pattern	= jdk-6u20-dlj-linux-%.bin
 all_archs	= $(filter $(subst =, , $(arch_map)), \
 			   $(subst -, , $(patsubst %.bin, %, $(wildcard *.bin))))
 priority	:= 63
@@ -317,8 +317,8 @@
 	  exit 1; \
 	fi
 
-diff_ignore = -I 'Tuesday, March 9' \
-	-I 'Tue Mar 09' -I '^ *// java GenerateCharacter'
+diff_ignore = -I 'Monday, April 12' \
+	-I 'Mon Apr 12' -I '^ *// java GenerateCharacter'
 
 with_check = yes
 
@@ -394,7 +394,9 @@
 	mv $(unpackdir) $*-jdk
 	@echo $*
 
-	diff -u $*-jdk/LICENSE $*-jdk/jre/LICENSE
+# Commented for now because the license differs in the official distribution
+# (seems to be mainly cosmetic)
+#	diff -u $*-jdk/LICENSE $*-jdk/jre/LICENSE
 	diff -u $*-jdk/THIRDPARTYLICENSEREADME.txt \
 	    $*-jdk/jre/THIRDPARTYLICENSEREADME.txt