Merge lp:~ebourg/openjdk/icedtea-web into lp:~openjdk/openjdk/icedtea-web
- icedtea-web
- Merge into icedtea-web
Proposed by
Emmanuel Bourg
Status: | Needs review |
---|---|
Proposed branch: | lp:~ebourg/openjdk/icedtea-web |
Merge into: | lp:~openjdk/openjdk/icedtea-web |
Diff against target: |
456 lines (+212/-8) 8 files modified
PLUGIN8.overrides.in (+2/-0) PLUGIN8.postinst.in (+54/-0) PLUGIN8.prerm.in (+18/-0) changelog (+6/-0) control (+15/-0) control.8 (+15/-0) icedtea-netx.postinst.in (+31/-0) rules (+71/-8) |
To merge this branch: | bzr merge lp:~ebourg/openjdk/icedtea-web |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Matthias Klose | Pending | ||
Review via email: mp+225908@code.launchpad.net |
Commit message
Description of the change
Added icedtea-8-plugin for OpenJDK 8 (Closes: #751173)
To post a comment you must log in.
Unmerged revisions
- 33. By Emmanuel Bourg
-
Added icedtea-8-plugin for OpenJDK 8 (Closes: #751173)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file 'PLUGIN8.overrides.in' |
2 | --- PLUGIN8.overrides.in 1970-01-01 00:00:00 +0000 |
3 | +++ PLUGIN8.overrides.in 2014-07-07 23:02:04 +0000 |
4 | @@ -0,0 +1,2 @@ |
5 | +# empty directories for plugin alternatives |
6 | +@pkg_plugin8@ binary: package-contains-empty-directory |
7 | |
8 | === added file 'PLUGIN8.postinst.in' |
9 | --- PLUGIN8.postinst.in 1970-01-01 00:00:00 +0000 |
10 | +++ PLUGIN8.postinst.in 2014-07-07 23:02:04 +0000 |
11 | @@ -0,0 +1,54 @@ |
12 | +#!/bin/sh -e |
13 | + |
14 | +PATH=/sbin:/bin:/usr/sbin:/usr/bin |
15 | + |
16 | +multiarch=@multiarch@ |
17 | +priority=@priority8@ |
18 | +browser_dirs="@browser_dirs@" |
19 | +PLUGIN=@plugin_name@ |
20 | +basedir=/@base8dir@ |
21 | +old_basedir=/usr/lib/jvm/java-8/openjdk |
22 | +PLUGINPTH=$basedir/jre/lib/@archdir@/$PLUGIN |
23 | +OLD_PLUGINPTH=$old_basedir/jre/lib/@archdir@/$PLUGIN |
24 | + |
25 | +case "$1" in |
26 | + configure) |
27 | + for browser_dir in $browser_dirs; do |
28 | + if [ $browser_dir = xulrunner-addons ]; then |
29 | + browser=xulrunner-1.9 |
30 | + else |
31 | + browser=$browser_dir |
32 | + fi |
33 | + |
34 | + if [ -n "$multiarch" ] && [ "$DPKG_MAINTSCRIPT_ARCH" != $(dpkg --print-architecture) ]; then |
35 | + priority=$(expr $priority - 1) |
36 | + fi |
37 | + |
38 | + if [ -n "$multiarch" ] && [ -n "$2" ]; then |
39 | + if [ -n "$(update-alternatives --list $browser-javaplugin.so 2>/dev/null | grep ^$old_basedir/)" ]; then |
40 | + update-alternatives --remove $browser-javaplugin.so $OLD_PLUGINPTH || true |
41 | + fi |
42 | + fi |
43 | + |
44 | + if [ -z "$(update-alternatives --list $browser-javaplugin.so 2>/dev/null | grep ^$basedir/)" ]; then |
45 | + update-alternatives --quiet --install \ |
46 | + /usr/lib/$browser_dir/plugins/libjavaplugin.so \ |
47 | + $browser-javaplugin.so \ |
48 | + $PLUGINPTH \ |
49 | + $priority |
50 | + elif [ $priority -gt 1070 ]; then |
51 | + oldp=$(update-alternatives --query $browser-javaplugin.so | awk -v b=$basedir '/^Alternative:/ && $2~b {p=1} /^Priority:/ && p {print $2; exit}') |
52 | + if [ -n "$oldp" ] && [ "$oldp" -le 1070 ]; then |
53 | + update-alternatives --quiet --install \ |
54 | + /usr/lib/$browser_dir/plugins/libjavaplugin.so \ |
55 | + $browser-javaplugin.so \ |
56 | + $PLUGINPTH \ |
57 | + $priority |
58 | + fi |
59 | + fi |
60 | + done |
61 | +esac |
62 | + |
63 | +#DEBHELPER# |
64 | + |
65 | +exit 0 |
66 | |
67 | === added file 'PLUGIN8.prerm.in' |
68 | --- PLUGIN8.prerm.in 1970-01-01 00:00:00 +0000 |
69 | +++ PLUGIN8.prerm.in 2014-07-07 23:02:04 +0000 |
70 | @@ -0,0 +1,18 @@ |
71 | +#!/bin/sh -e |
72 | + |
73 | +browser_dirs="@browser_dirs@" |
74 | +PLUGIN=@plugin_name@ |
75 | +PLUGINPTH=/@base8dir@/jre/lib/@archdir@/$PLUGIN |
76 | + |
77 | +for browser_dir in $browser_dirs; do |
78 | + if [ $browser_dir = xulrunner-addons ]; then |
79 | + browser=xulrunner-1.9 |
80 | + else |
81 | + browser=$browser_dir |
82 | + fi |
83 | + update-alternatives --quiet --remove \ |
84 | + $browser-javaplugin.so \ |
85 | + $PLUGINPTH |
86 | +done |
87 | + |
88 | +#DEBHELPER# |
89 | |
90 | === modified file 'changelog' |
91 | --- changelog 2014-06-30 13:26:14 +0000 |
92 | +++ changelog 2014-07-07 23:02:04 +0000 |
93 | @@ -1,3 +1,9 @@ |
94 | +icedtea-web (1.5-3) UNRELEASED; urgency=medium |
95 | + |
96 | + * Added icedtea-8-plugin for OpenJDK 8 (Closes: #751173) |
97 | + |
98 | + -- Emmanuel Bourg <ebourg@apache.org> Mon, 07 Jul 2014 22:09:27 +0200 |
99 | + |
100 | icedtea-web (1.5-2) unstable; urgency=medium |
101 | |
102 | * Build-depend on iceweasel-dev. Closes: #752838. |
103 | |
104 | === modified file 'control' |
105 | --- control 2014-06-30 13:26:14 +0000 |
106 | +++ control 2014-07-07 23:02:04 +0000 |
107 | @@ -63,3 +63,18 @@ |
108 | IcedTeaPlugin is a web browser plugin to execute Java applets, supporting |
109 | LiveConnect/JavaScript. It is targeted for xulrunner-1.9 and compatible |
110 | browsers that support the NPAPI. |
111 | + |
112 | +Package: icedtea-8-plugin |
113 | +Section: web |
114 | +Architecture: amd64 armel armhf arm64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc |
115 | +Multi-Arch: same |
116 | +Depends: openjdk-8-jre, icedtea-netx (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} |
117 | +Conflicts: icedtea-gcjwebplugin (<< 1.0-1ubuntu4), icedtea6-plugin (<< 6b21.2~pre1-1~), icedtea-plugin (<< 1.2~pre1-1~) |
118 | +Xb-Npp-Description: IcedTea Java Web Browser Plugin for OpenJDK 8 (execution of applets on web pages) |
119 | +Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a, aa5ca914-c309-495d-91cf-3141bbb04115 |
120 | +Xb-Npp-Name: The IcedTea Web Browser Plugin |
121 | +Xb-Npp-MimeType: application/x-java-vm, application/x-java-applet, application/x-java-applet;version=1.1, application/x-java-applet;version=1.1.1, application/x-java-applet;version=1.1.2, application/x-java-applet;version=1.1.3, application/x-java-applet;version=1.2, application/x-java-applet;version=1.2.1, application/x-java-applet;version=1.2.2, application/x-java-applet;version=1.3, application/x-java-applet;version=1.3.1, application/x-java-applet;version=1.4, application/x-java-applet;version=1.4.1, application/x-java-applet;version=1.4.2, application/x-java-applet;version=1.5, application/x-java-applet;version=1.6, application/x-java-applet;version=1.8, application/x-java-applet;jpi-version=1.8.0_00, application/x-java-bean, application/x-java-bean;version=1.1, application/x-java-bean;version=1.1.1, application/x-java-bean;version=1.1.2, application/x-java-bean;version=1.1.3, application/x-java-bean;version=1.2, application/x-java-bean;version=1.2.1, application/x-java-bean;version=1.2.2, application/x-java-bean;version=1.3, application/x-java-bean;version=1.3.1, application/x-java-bean;version=1.4, application/x-java-bean;version=1.4.1, application/x-java-bean;version=1.4.2, application/x-java-bean;version=1.5, application/x-java-bean;version=1.6, application/x-java-bean;version=1.8, application/x-java-bean;jpi-version=1.8.0_00 |
122 | +Description: web browser plugin based on OpenJDK and IcedTea to execute Java applets |
123 | + IcedTeaPlugin is a web browser plugin to execute Java applets, supporting |
124 | + LiveConnect/JavaScript. It is targeted for xulrunner-1.9 and compatible |
125 | + browsers that support the NPAPI. |
126 | |
127 | === added file 'control.8' |
128 | --- control.8 1970-01-01 00:00:00 +0000 |
129 | +++ control.8 2014-07-07 23:02:04 +0000 |
130 | @@ -0,0 +1,15 @@ |
131 | + |
132 | +Package: icedtea-8-plugin |
133 | +Section: web |
134 | +Architecture: amd64 armel armhf arm64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc |
135 | +Multi-Arch: same |
136 | +Depends: openjdk-8-jre, icedtea-netx (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} |
137 | +Conflicts: icedtea-gcjwebplugin (<< 1.0-1ubuntu4), icedtea6-plugin (<< 6b21.2~pre1-1~), icedtea-plugin (<< 1.2~pre1-1~) |
138 | +Xb-Npp-Description: IcedTea Java Web Browser Plugin for OpenJDK 8 (execution of applets on web pages) |
139 | +Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a, aa5ca914-c309-495d-91cf-3141bbb04115 |
140 | +Xb-Npp-Name: The IcedTea Web Browser Plugin |
141 | +Xb-Npp-MimeType: application/x-java-vm, application/x-java-applet, application/x-java-applet;version=1.1, application/x-java-applet;version=1.1.1, application/x-java-applet;version=1.1.2, application/x-java-applet;version=1.1.3, application/x-java-applet;version=1.2, application/x-java-applet;version=1.2.1, application/x-java-applet;version=1.2.2, application/x-java-applet;version=1.3, application/x-java-applet;version=1.3.1, application/x-java-applet;version=1.4, application/x-java-applet;version=1.4.1, application/x-java-applet;version=1.4.2, application/x-java-applet;version=1.5, application/x-java-applet;version=1.6, application/x-java-applet;version=1.8, application/x-java-applet;jpi-version=1.8.0_00, application/x-java-bean, application/x-java-bean;version=1.1, application/x-java-bean;version=1.1.1, application/x-java-bean;version=1.1.2, application/x-java-bean;version=1.1.3, application/x-java-bean;version=1.2, application/x-java-bean;version=1.2.1, application/x-java-bean;version=1.2.2, application/x-java-bean;version=1.3, application/x-java-bean;version=1.3.1, application/x-java-bean;version=1.4, application/x-java-bean;version=1.4.1, application/x-java-bean;version=1.4.2, application/x-java-bean;version=1.5, application/x-java-bean;version=1.6, application/x-java-bean;version=1.8, application/x-java-bean;jpi-version=1.8.0_00 |
142 | +Description: web browser plugin based on OpenJDK and IcedTea to execute Java applets |
143 | + IcedTeaPlugin is a web browser plugin to execute Java applets, supporting |
144 | + LiveConnect/JavaScript. It is targeted for xulrunner-1.9 and compatible |
145 | + browsers that support the NPAPI. |
146 | |
147 | === modified file 'icedtea-netx.postinst.in' |
148 | --- icedtea-netx.postinst.in 2012-09-06 14:00:47 +0000 |
149 | +++ icedtea-netx.postinst.in 2014-07-07 23:02:04 +0000 |
150 | @@ -9,6 +9,9 @@ |
151 | priority7=@priority7@ |
152 | base7dir=/@base7dir@ |
153 | man7dir=$base7dir/jre/man |
154 | +priority8=@priority8@ |
155 | +base8dir=/@base8dir@ |
156 | +man8dir=$base8dir/jre/man |
157 | tools='javaws itweb-settings' |
158 | srcext=1.gz |
159 | dstext=1.gz |
160 | @@ -40,6 +43,7 @@ |
161 | if [ -n "$multiarch" ] && [ "$DPKG_MAINTSCRIPT_ARCH" != $(dpkg --print-architecture) ]; then |
162 | priority=$(expr $priority - 1) |
163 | priority7=$(expr $priority7 - 1) |
164 | + priority8=$(expr $priority8 - 1) |
165 | fi |
166 | |
167 | for i in $tools; do |
168 | @@ -85,6 +89,33 @@ |
169 | update-alternatives --set $i $basedir/jre/bin/$i |
170 | fi |
171 | done |
172 | + |
173 | + for i in $tools; do |
174 | + unset slave1 || true |
175 | + if [ -e $man8dir/man1/$i.$srcext ]; then |
176 | + slave1="--slave \ |
177 | + /usr/share/man/man1/$i.$dstext \ |
178 | + $i.$dstext \ |
179 | + $man8dir/man1/$i.$srcext" |
180 | + fi |
181 | + update-alternatives \ |
182 | + --install \ |
183 | + /usr/bin/$i \ |
184 | + $i \ |
185 | + $base8dir/jre/bin/$i \ |
186 | + $priority8 \ |
187 | + $slave1 |
188 | + |
189 | + # 7's priority is higher, but 7 is not installed, set it to 8 |
190 | + if [ $priority7 -gt $priority8 ] && [ ! -f $base8dir/jre/bin/$i ]; then |
191 | + update-alternatives --set $i $base8dir/jre/bin/$i |
192 | + fi |
193 | + |
194 | + # 8's priority is higher, but 8 is not installed, set it to 7 |
195 | + if [ $priority8 -gt $priority7 ] && [ ! -f $base7dir/jre/bin/$i ]; then |
196 | + update-alternatives --set $i $base7dir/jre/bin/$i |
197 | + fi |
198 | + done |
199 | fi |
200 | esac |
201 | |
202 | |
203 | === modified file 'rules' |
204 | --- rules 2014-06-30 13:26:14 +0000 |
205 | +++ rules 2014-07-07 23:02:04 +0000 |
206 | @@ -32,7 +32,7 @@ |
207 | # for simplicity build the plugin for 7 for multiarch setup only, |
208 | # anything else requires backports. |
209 | ifneq (,$(DEB_HOST_MULTIARCH)) |
210 | - jre_versions += 7 |
211 | + jre_versions += 7 8 |
212 | endif |
213 | |
214 | ifneq (,$(wildcard /usr/bin/dpkg-buildflags)) |
215 | @@ -62,6 +62,7 @@ |
216 | default_plugin_version = 7 |
217 | endif |
218 | endif |
219 | +is8_default = no |
220 | |
221 | # dependency package for older releases |
222 | ifeq (,$(filter $(distrel),hardy intrepid jaunty karmic lucid maverick natty oneiric precise quantal raring lenny etch squeeze wheezy)) |
223 | @@ -75,18 +76,21 @@ |
224 | ifneq (,$(DEB_HOST_MULTIARCH)) |
225 | jdk_home = $(TOP)/java-6-openjdk-$(DEB_HOST_ARCH) |
226 | jdk7_home = $(TOP)/java-7-openjdk-$(DEB_HOST_ARCH) |
227 | + jdk8_home = $(TOP)/java-8-openjdk-$(DEB_HOST_ARCH) |
228 | else |
229 | jdk_home = $(TOP)/java-6-openjdk |
230 | jdk7_home = $(TOP)/java-7-openjdk |
231 | endif |
232 | basedir = $(jdk_home) |
233 | base7dir = $(jdk7_home) |
234 | +base8dir = $(jdk8_home) |
235 | vendor = IcedTea |
236 | shortver = 6 |
237 | last_npp_version = 6b18~pre2-2 |
238 | priority = 1061 |
239 | # not yet higher than for 6 |
240 | priority7 = $(if $(filter yes, $(is7_default)),1071,1060) |
241 | +priority8 = $(if $(filter yes, $(is8_default)),1081,1070) |
242 | plugin_name = IcedTeaPlugin.so |
243 | |
244 | ifneq (,$(filter $(DEB_HOST_ARCH), alpha hppa sparc64)$(filter $(distrel), dapper)) |
245 | @@ -125,7 +129,10 @@ |
246 | endif |
247 | |
248 | |
249 | -ifeq ($(is7_default),yes) |
250 | +ifeq ($(is8_default),yes) |
251 | + bd_openjdk = openjdk-8-jdk, |
252 | + jdk_default_home = $(jdk8_home) |
253 | +else ifeq ($(is7_default),yes) |
254 | bd_openjdk = openjdk-7-jdk, |
255 | jdk_default_home = $(jdk7_home) |
256 | else |
257 | @@ -133,10 +140,12 @@ |
258 | jdk_default_home = $(jdk_home) |
259 | endif |
260 | |
261 | -ifeq ($(default_plugin_version),7) |
262 | - netx_depends = openjdk-7-jre | openjdk-6-jre (>= 6b23~pre10~) |
263 | +ifeq ($(default_plugin_version),8) |
264 | + netx_depends = openjdk-8-jre | openjdk-7-jre | openjdk-6-jre (>= 6b23~pre10~) |
265 | +else ifeq ($(default_plugin_version),7) |
266 | + netx_depends = openjdk-7-jre | openjdk-8-jre | openjdk-6-jre (>= 6b23~pre10~) |
267 | else |
268 | - netx_depends = openjdk-6-jre (>= 6b23~pre10~) | openjdk-7-jre |
269 | + netx_depends = openjdk-6-jre (>= 6b23~pre10~) | openjdk-7-jre | openjdk-8-jre |
270 | endif |
271 | |
272 | ifneq (,$(DEB_HOST_MULTIARCH)) |
273 | @@ -156,6 +165,7 @@ |
274 | |
275 | java_launcher = /$(basedir)/bin/java |
276 | java7_launcher = /$(base7dir)/bin/java |
277 | +java8_launcher = /$(base8dir)/bin/java |
278 | ifeq ($(distribution),Ubuntu) |
279 | ifeq (,$(filter $(distrel),karmic jaunty intrepid hardy gutsy feisty edgy dapper)) |
280 | java_launcher = cautious-launcher %f /$(basedir)/bin/java |
281 | @@ -181,10 +191,12 @@ |
282 | p_comm = icedtea-netx-common |
283 | p_plug = icedtea-6-plugin |
284 | p_plug7 = icedtea-7-plugin |
285 | +p_plug8 = icedtea-8-plugin |
286 | d_netx = debian/$(p_netx) |
287 | d_comm = debian/$(p_comm) |
288 | d_plug = debian/$(p_plug) |
289 | d_plug7 = debian/$(p_plug7) |
290 | +d_plug8 = debian/$(p_plug8) |
291 | |
292 | debian/control: debian/control.in debian/rules |
293 | @cp -p debian/control debian/control.old |
294 | @@ -197,6 +209,7 @@ |
295 | $(if $(DEB_HOST_MULTIARCH),debian/control.common) \ |
296 | $(if $(filter 6, $(jre_versions)),debian/control.6) \ |
297 | $(if $(filter 7, $(jre_versions)),debian/control.7) \ |
298 | + $(if $(filter 8, $(jre_versions)),debian/control.8) \ |
299 | $(if $(nopkgs),,debian/control.compat) \ |
300 | $(if $(DEB_HOST_MULTIARCH),,| grep -v '^Multi-Arch:') \ |
301 | > debian/control |
302 | @@ -215,6 +228,7 @@ |
303 | case "$$f" in \ |
304 | debian/PLUGIN.*.in) f2=$$(echo $$f | sed 's/PLUGIN/$(p_plug)/;s/\.in$$//');; \ |
305 | debian/PLUGIN7.*.in) f2=$$(echo $$f | sed 's/PLUGIN7/$(p_plug7)/;s/\.in$$//');; \ |
306 | + debian/PLUGIN8.*.in) f2=$$(echo $$f | sed 's/PLUGIN8/$(p_plug8)/;s/\.in$$//');; \ |
307 | *) f2=$$(echo $$f | sed 's/JB/$(basename)/;s/\.in$$//'); \ |
308 | esac; \ |
309 | sed \ |
310 | @@ -224,6 +238,7 @@ |
311 | -e 's,@TOP@,$(TOP),g' \ |
312 | -e 's,@basedir@,$(basedir),g' \ |
313 | -e 's,@base7dir@,$(base7dir),g' \ |
314 | + -e 's,@base8dir@,$(base8dir),g' \ |
315 | -e 's,@jdirname@,$(jdirname),g' \ |
316 | -e 's/@srcname@/$(srcname)/g' \ |
317 | -e 's/@jvmarch@/$(jvmarch)/g' \ |
318 | @@ -231,14 +246,17 @@ |
319 | -e 's/@tag@/$(tag)/g' \ |
320 | -e 's/@priority@/$(priority)/g' \ |
321 | -e 's/@priority7@/$(priority7)/g' \ |
322 | + -e 's/@priority8@/$(priority8)/g' \ |
323 | -e 's/@mantag@/$(mantag)/g' \ |
324 | -e 's/@multiarch@/$(DEB_HOST_MULTIARCH)/g' \ |
325 | -e 's,@plugin_name@,$(plugin_name),g' \ |
326 | -e 's/@pkg_plugin7@/$(p_plug7)/g' \ |
327 | + -e 's/@pkg_plugin8@/$(p_plug8)/g' \ |
328 | -e 's,@browser_dirs@,$(browser_plugin_dirs),g' \ |
329 | -e 's,@last_npp_version@,$(last_npp_version),g' \ |
330 | -e 's,@java_launcher@,$(java_launcher),g' \ |
331 | -e 's,@java7_launcher@,$(java7_launcher),g' \ |
332 | + -e 's,@java8_launcher@,$(java8_launcher),g' \ |
333 | $$f > $$f2; \ |
334 | done |
335 | |
336 | @@ -262,10 +280,17 @@ |
337 | cd build7 \ |
338 | && $(buildflags) ../configure $(CONFIGURE_ARGS) --with-jdk-home=/$(jdk_default_home) |
339 | touch $@ |
340 | +configure8-stamp: |
341 | + dh_testdir |
342 | + rm -rf build8 |
343 | + mkdir -p build8 |
344 | + cd build8 \ |
345 | + && $(buildflags) ../configure $(CONFIGURE_ARGS) --with-jdk-home=/$(jdk_default_home) |
346 | + touch $@ |
347 | |
348 | build-arch: build-stamp |
349 | build-indep: build-stamp |
350 | -build: build-stamp $(if $(filter 7,$(jre_versions)),build7-stamp) |
351 | +build: build-stamp $(if $(filter 7,$(jre_versions)),build7-stamp) $(if $(filter 8,$(jre_versions)),build8-stamp) |
352 | build-stamp: configure-stamp |
353 | dh_testdir |
354 | $(MAKE) -C build VERSION_DEFS='-DICEDTEA_WEB_JRE="\"/$(jdk_home)\""' |
355 | @@ -274,22 +299,27 @@ |
356 | dh_testdir |
357 | $(MAKE) -C build7 VERSION_DEFS='-DHAVE_JAVA7 -DICEDTEA_WEB_JRE="\"/$(jdk7_home)\""' |
358 | touch $@ |
359 | +build8-stamp: configure8-stamp |
360 | + dh_testdir |
361 | + $(MAKE) -C build8 VERSION_DEFS='-DHAVE_JAVA8 -DICEDTEA_WEB_JRE="\"/$(jdk8_home)\""' |
362 | + touch $@ |
363 | |
364 | clean: |
365 | dh_testdir |
366 | dh_testroot |
367 | rm -f *-stamp |
368 | - rm -rf build build7 |
369 | + rm -rf build build7 build8 |
370 | for f in debian/*.in; do \ |
371 | case "$$f" in \ |
372 | debian/PLUGIN.*.in) f2=$$(echo $$f | sed 's/PLUGIN/$(p_plug)/;s/\.in$$//');; \ |
373 | debian/PLUGIN7.*.in) f2=$$(echo $$f | sed 's/PLUGIN7/$(p_plug7)/;s/\.in$$//');; \ |
374 | + debian/PLUGIN8.*.in) f2=$$(echo $$f | sed 's/PLUGIN8/$(p_plug8)/;s/\.in$$//');; \ |
375 | *) f2=$$(echo $$f | sed 's/JB/$(basename)/;s/\.in$$//'); \ |
376 | esac; \ |
377 | case "$$f2" in debian/control) continue; esac; \ |
378 | rm -f $$f2; \ |
379 | done |
380 | - rm -rf debian/tmp7 |
381 | + rm -rf debian/tmp7 debian/tmp8 |
382 | dh_autoreconf_clean |
383 | dh_clean |
384 | |
385 | @@ -309,6 +339,13 @@ |
386 | $(jdk7_home)/jre/bin \ |
387 | $(jdk7_home)/jre/man/man1 |
388 | endif |
389 | +ifneq (,$(filter 8, $(jre_versions))) |
390 | + dh_installdirs -p$(p_netx) \ |
391 | + $(jdk8_home)/bin \ |
392 | + $(jdk8_home)/man/man1 \ |
393 | + $(jdk8_home)/jre/bin \ |
394 | + $(jdk8_home)/jre/man/man1 |
395 | +endif |
396 | ifneq (,$(DEB_HOST_MULTIARCH)) |
397 | dh_installdirs -p$(p_comm) \ |
398 | usr/share/applications \ |
399 | @@ -328,6 +365,7 @@ |
400 | $(foreach d, $(browser_plugin_dirs), usr/lib/$(d)/plugins) |
401 | $(MAKE) -C build install DESTDIR=$(CURDIR)/$(d_netx) |
402 | sed -i 's/java-7-openjdk/java-6-openjdk/g' $(d_netx)/usr/bin/* |
403 | + sed -i 's/java-8-openjdk/java-6-openjdk/g' $(d_netx)/usr/bin/* |
404 | |
405 | ifneq (,$(filter 7, $(jre_versions))) |
406 | dh_installdirs -p$(p_plug7) \ |
407 | @@ -337,10 +375,20 @@ |
408 | $(MAKE) -C build7 install DESTDIR=$(CURDIR)/debian/tmp7 |
409 | sed -i 's/java-6-openjdk/java-7-openjdk/g' debian/tmp7/usr/bin/* |
410 | endif |
411 | +ifneq (,$(filter 8, $(jre_versions))) |
412 | + dh_installdirs -p$(p_plug8) \ |
413 | + $(jdk8_home)/jre/lib/$(archdir) \ |
414 | + usr/share/icedtea-web \ |
415 | + $(foreach d, $(browser_plugin_dirs), usr/lib/$(d)/plugins) |
416 | + $(MAKE) -C build8 install DESTDIR=$(CURDIR)/debian/tmp8 |
417 | + sed -i 's/java-6-openjdk/java-8-openjdk/g' debian/tmp8/usr/bin/* |
418 | + sed -i 's/java-7-openjdk/java-8-openjdk/g' debian/tmp8/usr/bin/* |
419 | +endif |
420 | |
421 | # FIXME: split out an icedtea-netx-doc package? |
422 | rm -rf $(d_netx)/usr/share/doc/icedtea-web |
423 | rm -rf debian/tmp7/usr/share/doc/icedtea-web |
424 | + rm -rf debian/tmp8/usr/share/doc/icedtea-web |
425 | |
426 | mv $(d_netx)/usr/bin/javaws $(d_netx)/$(jdk_home)/jre/bin/ |
427 | mv $(d_netx)/usr/share/man/man1/javaws.1 $(d_netx)/$(jdk_home)/jre/man/man1/ |
428 | @@ -357,6 +405,14 @@ |
429 | mv debian/tmp7/usr/lib/IcedTeaPlugin.so \ |
430 | $(d_plug7)/$(jdk7_home)/jre/lib/$(archdir)/ |
431 | endif |
432 | +ifneq (,$(filter 8, $(jre_versions))) |
433 | + mv debian/tmp8/usr/bin/javaws $(d_netx)/$(jdk8_home)/jre/bin/ |
434 | + mv debian/tmp8/usr/share/man/man1/javaws.1 $(d_netx)/$(jdk8_home)/jre/man/man1/ |
435 | + mv debian/tmp8/usr/bin/itweb-settings $(d_netx)/$(jdk8_home)/jre/bin/ |
436 | + cp debian/itweb-settings.1 $(d_netx)/$(jdk8_home)/jre/man/man1/ |
437 | + mv debian/tmp8/usr/lib/IcedTeaPlugin.so \ |
438 | + $(d_plug8)/$(jdk8_home)/jre/lib/$(archdir)/ |
439 | +endif |
440 | |
441 | # compress manpages |
442 | find $(d_netx)/$(jdk_home)/jre/man/man1/ -type f ! -type l | xargs gzip -9v -n |
443 | @@ -373,6 +429,13 @@ |
444 | /$(jdk7_home)/jre/man/man1/javaws.1.gz /$(jdk7_home)/man/man1/javaws.1.gz \ |
445 | /$(jdk7_home)/jre/man/man1/itweb-settings.1.gz /$(jdk7_home)/man/man1/itweb-settings.gz |
446 | endif |
447 | +ifneq (,$(filter 8, $(jre_versions))) |
448 | + find $(d_netx)/$(jdk8_home)/jre/man/man1/ -type f ! -type l | xargs gzip -9v -n |
449 | + dh_link -p$(p_netx) \ |
450 | + /$(jdk8_home)/jre/bin/javaws /$(jdk8_home)/bin/javaws \ |
451 | + /$(jdk8_home)/jre/man/man1/javaws.1.gz /$(jdk8_home)/man/man1/javaws.1.gz \ |
452 | + /$(jdk8_home)/jre/man/man1/itweb-settings.1.gz /$(jdk8_home)/man/man1/itweb-settings.gz |
453 | +endif |
454 | |
455 | ifneq (,$(DEB_HOST_MULTIARCH)) |
456 | mv $(d_netx)/usr/share/icedtea-web $(d_comm)/usr/share/ |