------------------------------------------------------------
revno: 590
committer: Matthias Klose <d...@debian.org>
branch nick: openjdk7
timestamp: Thu 2015-08-13 14:19:20 +0200
message:
    * Fix installing the openjdk.desktop file when cautious-launch is available.
      LP: #1448548.
modified:
  changelog
  rules


--
lp:~openjdk/openjdk/openjdk7
https://code.launchpad.net/~openjdk/openjdk/openjdk7

Your team Debian Java Maintainers is subscribed to branch 
lp:~openjdk/openjdk/openjdk7.
To unsubscribe from this branch go to 
https://code.launchpad.net/~openjdk/openjdk/openjdk7/+edit-subscription
=== modified file 'changelog'
--- changelog	2015-08-13 12:09:44 +0000
+++ changelog	2015-08-13 12:19:20 +0000
@@ -1,3 +1,10 @@
+openjdk-7 (7u79-2.5.6-2) unstable; urgency=medium
+
+  * Fix installing the openjdk.desktop file when cautious-launch is available.
+    LP: #1448548.
+
+ -- Matthias Klose <d...@ubuntu.com>  Thu, 13 Aug 2015 14:09:54 +0200
+
 openjdk-7 (7u79-2.5.6-1) unstable; urgency=medium
 
   * IcedTea7 2.5.6 release (based on OpenJDK 7u79).

=== modified file 'rules'
--- rules	2015-07-06 14:05:47 +0000
+++ rules	2015-08-13 12:19:20 +0000
@@ -1875,7 +1875,7 @@
 	: # add GNOME stuff
 	cp -p debian/$(basename)-policytool.desktop \
 	      $(d_jre)/usr/share/applications/
-ifeq ($(java_launcher),cautious-launcher)
+ifneq (,$(findstring cautious-launcher, $(java_launcher)))
 	cp -p debian/$(basename)-java.desktop \
 	      $(d_jre)/usr/share/applications/
 endif

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Reply via email to