java8-openjdk:rebuild conflict
This commit is contained in:
@@ -89,7 +89,7 @@ def install():
|
||||
|
||||
for size in [16, 24, 32, 48]:
|
||||
fullsize = "%dx%d" % ((size, ) * 2)
|
||||
pisitools.insinto("/usr/share/icons/hicolor/%s/apps/" % fullsize, "../openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon%d.png" % size, "java.png")
|
||||
pisitools.insinto("/usr/share/icons/hicolor/%s/apps/" % fullsize, "../openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon%d.png" % size, "java8.png")
|
||||
|
||||
#---- install jre8-openjdk-headless
|
||||
pisitools.insinto("%s/jre/" % jvmdir , "images/j2sdk-image/jre/lib")
|
||||
|
||||
@@ -174,8 +174,8 @@
|
||||
<Path fileType="doc">/usr/share/doc/openjdk</Path>
|
||||
<Path fileType="executable">/usr/bin/policytool_8</Path>
|
||||
<Path fileType="data">/usr/share/icons/hicolor/</Path>
|
||||
<Path fileType="man">/usr/share/man/man1/policytool.1</Path>
|
||||
<Path fileType="man">/usr/share/man/ja/man1/policytool.1</Path>
|
||||
<Path fileType="man">/usr/share/man/man1/policytool.1_8</Path>
|
||||
<Path fileType="man">/usr/share/man/ja/man1/policytool.1_8</Path>
|
||||
<Path fileType="data">/usr/share/applications/policytool-jdk8.desktop</Path>
|
||||
<Path fileType="executable">/usr/lib/jvm/java-8-openjdk/jre/bin/policytool</Path>
|
||||
<Path fileType="library">/usr/lib/jvm/java-8-openjdk/jre/lib/*/libjsoundalsa.so</Path>
|
||||
|
||||
Reference in New Issue
Block a user