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

[Torsten Werner]

Author: twerner
Date: 2010-04-19 20:31:21 +0000 (Mon, 19 Apr 2010)
New Revision: 12181

Modified:
   trunk/sun-java6/debian/changelog
   trunk/sun-java6/debian/rules
Log:
* Team upload.
* Create orig tarball from files at
  <https://jdk-distros.dev.java.net/developer.html>. (Closes: #578402)
* Upload for Architecture: amd64. (Closes: #578361, #576481)
* Re-enable the license check in d/rules. (Closes: #578378)

Modified: trunk/sun-java6/debian/changelog
===================================================================
--- trunk/sun-java6/debian/changelog	2010-04-19 19:49:08 UTC (rev 12180)
+++ trunk/sun-java6/debian/changelog	2010-04-19 20:31:21 UTC (rev 12181)
@@ -1,3 +1,13 @@
+sun-java6 (6.20-dlj-1) unstable; urgency=low
+
+  * Team upload.
+  * Create orig tarball from files at
+    <https://jdk-distros.dev.java.net/developer.html>. (Closes: #578402)
+  * Upload for Architecture: amd64. (Closes: #578361, #576481)
+  * Re-enable the license check in d/rules. (Closes: #578378)
+
+ -- Torsten Werner <twerner at debian.org>  Mon, 19 Apr 2010 22:13:23 +0200
+
 sun-java6 (6.20-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/sun-java6/debian/rules
===================================================================
--- trunk/sun-java6/debian/rules	2010-04-19 19:49:08 UTC (rev 12180)
+++ trunk/sun-java6/debian/rules	2010-04-19 20:31:21 UTC (rev 12181)
@@ -394,9 +394,7 @@
 	mv $(unpackdir) $*-jdk
 	@echo $*
 
-# 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/LICENSE $*-jdk/jre/LICENSE
 	diff -u $*-jdk/THIRDPARTYLICENSEREADME.txt \
 	    $*-jdk/jre/THIRDPARTYLICENSEREADME.txt