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

[Matthias Klose]

Author: doko
Date: 2010-04-23 11:40:48 +0000 (Fri, 23 Apr 2010)
New Revision: 12194

Modified:
   trunk/sun-java6/debian/rules
Log:
- correctly replace java_launcher in java desktop file


Modified: trunk/sun-java6/debian/rules
===================================================================
--- trunk/sun-java6/debian/rules	2010-04-21 22:01:16 UTC (rev 12193)
+++ trunk/sun-java6/debian/rules	2010-04-23 11:40:48 UTC (rev 12194)
@@ -235,7 +235,6 @@
 	      -e 's/@RELEASE@/$(relstring)/g' \
 	      -e 's/@archdir@/$(archdir)/g' \
 	      -e 's/@browsers@/$(browsers)/g' \
-	      -e 's, at java_launcher@,$(java_launcher),g' \
 	      -e 's/@cjk_fonts@/$(cjk_fonts)/g' \
 	      -e 's, at pkg_version@,$(if $(filter $(distrelease),etch dapper edgy feisty gutsy),$${Source-Version},$${source:Version}),g' \
 	    debian/control.in > debian/control
@@ -281,6 +280,7 @@
 	      -e 's, at jdk_packs@,$(jdk_packs),g' \
 	      -e 's, at j2se_lib@,$(j2se_lib),g' \
 	      -e 's, at browser_dirs@,$(browser_plugin_dirs),g' \
+	      -e 's, at java_launcher@,$(java_launcher),g' \
 	    $$f > $$f2; \
 	done
 ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 lpia))