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

[Sylvestre Ledru]

Author: sylvestre
Date: 2011-06-09 08:20:00 +0000 (Thu, 09 Jun 2011)
New Revision: 13777

Modified:
   trunk/sun-java6/debian/changelog
   trunk/sun-java6/debian/control
   trunk/sun-java6/debian/control.in
   trunk/sun-java6/debian/rules
Log:
+sun-java6 (6.25-3) unstable; urgency=low
+
+  * For now, revert changes of upload 6.25-2 due to license reasons. 
+    In touch with upstream about this issue.


Modified: trunk/sun-java6/debian/changelog
===================================================================
--- trunk/sun-java6/debian/changelog	2011-06-09 05:14:01 UTC (rev 13776)
+++ trunk/sun-java6/debian/changelog	2011-06-09 08:20:00 UTC (rev 13777)
@@ -1,3 +1,10 @@
+sun-java6 (6.25-3) unstable; urgency=low
+
+  * For now, revert changes of upload 6.25-2 due to license reasons. 
+    In touch with upstream about this issue.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 19 May 2011 16:50:11 +0200
+
 sun-java6 (6.25-2) unstable; urgency=low
 
   * sun-java6-fonts can be installed without installing the jre

Modified: trunk/sun-java6/debian/control
===================================================================
--- trunk/sun-java6/debian/control	2011-06-09 05:14:01 UTC (rev 13776)
+++ trunk/sun-java6/debian/control	2011-06-09 08:20:00 UTC (rev 13777)
@@ -101,7 +101,7 @@
 Package: sun-java6-fonts
 Section: non-free/fonts
 Architecture: all
-Depends: defoma, ${misc:Depends}
+Depends: sun-java6-jre (>= ${source:Version}), defoma, ${misc:Depends}
 Provides: ttf-lucida
 Conflicts: ttf-lucida
 Description: Lucida TrueType fonts (from the Sun JRE)

Modified: trunk/sun-java6/debian/control.in
===================================================================
--- trunk/sun-java6/debian/control.in	2011-06-09 05:14:01 UTC (rev 13776)
+++ trunk/sun-java6/debian/control.in	2011-06-09 08:20:00 UTC (rev 13777)
@@ -101,7 +101,7 @@
 Package: @basename at -fonts
 Section: non-free/fonts
 Architecture: all
-Depends: defoma, ${misc:Depends}
+Depends: @JRE@ (>= @pkg_version@), defoma, ${misc:Depends}
 Provides: ttf-lucida
 Conflicts: ttf-lucida
 Description: Lucida TrueType fonts (from the @vendor@ JRE)

Modified: trunk/sun-java6/debian/rules
===================================================================
--- trunk/sun-java6/debian/rules	2011-06-09 05:14:01 UTC (rev 13776)
+++ trunk/sun-java6/debian/rules	2011-06-09 08:20:00 UTC (rev 13777)
@@ -805,10 +805,7 @@
 	done >> $(CURDIR)/$(d_fonts).links
 
 	dh_installdefoma
-# Commented because of bug #625617
-#	ln -s $(p_jre)/ $(d_fonts)/usr/share/doc/$(p_fonts)
-	mkdir -p $(d_fonts)/usr/share/doc/$(p_fonts)/
-	cp $(d_jre)/usr/share/doc/$(p_jre)/* $(d_fonts)/usr/share/doc/$(p_fonts)/
+	ln -s $(p_jre) $(d_fonts)/usr/share/doc/$(p_fonts)
 #	cat debian/dlj.templates >> $(d_fonts).templates