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

[Sylvestre Ledru]

Author: sylvestre
Date: 2011-05-07 22:42:13 +0000 (Sat, 07 May 2011)
New Revision: 13665

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-fonts can be installed without installing the jre
    (Closes: #625617)



Modified: trunk/sun-java6/debian/changelog
===================================================================
--- trunk/sun-java6/debian/changelog	2011-05-07 22:10:33 UTC (rev 13664)
+++ trunk/sun-java6/debian/changelog	2011-05-07 22:42:13 UTC (rev 13665)
@@ -1,3 +1,10 @@
+sun-java6 (6.25-2) unstable; urgency=low
+
+  * sun-java6-fonts can be installed without installing the jre
+    (Closes: #625617)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 07 May 2011 23:06:10 +0200
+
 sun-java6 (6.25-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/sun-java6/debian/control
===================================================================
--- trunk/sun-java6/debian/control	2011-05-07 22:10:33 UTC (rev 13664)
+++ trunk/sun-java6/debian/control	2011-05-07 22:42:13 UTC (rev 13665)
@@ -101,7 +101,7 @@
 Package: sun-java6-fonts
 Section: non-free/fonts
 Architecture: all
-Depends: sun-java6-jre (>= ${source:Version}), defoma, ${misc:Depends}
+Depends: 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-05-07 22:10:33 UTC (rev 13664)
+++ trunk/sun-java6/debian/control.in	2011-05-07 22:42:13 UTC (rev 13665)
@@ -101,7 +101,7 @@
 Package: @basename at -fonts
 Section: non-free/fonts
 Architecture: all
-Depends: @JRE@ (>= @pkg_version@), defoma, ${misc:Depends}
+Depends: 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-05-07 22:10:33 UTC (rev 13664)
+++ trunk/sun-java6/debian/rules	2011-05-07 22:42:13 UTC (rev 13665)
@@ -805,7 +805,10 @@
 	done >> $(CURDIR)/$(d_fonts).links
 
 	dh_installdefoma
-	ln -s $(p_jre) $(d_fonts)/usr/share/doc/$(p_fonts)
+# 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)/
 #	cat debian/dlj.templates >> $(d_fonts).templates