← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/icedtea-java7/gutsy

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2007-10-07 23:43:28 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20071007234328-uy4k67jor6a3eftl
Tags: 7~b21-1.4+20071007-0ubuntu1
* Update icedtea to vcs 20071007.
* Update java-access-bridge to 1.20.0.
* Add build-dependency on libxinerama-dev.
* Add Xb-Npp-xxx tags for the -plugin package.
* Name the plugin "GCJ Web Browser Plugin (using IcedTea)", GCJ now
  "Great Cool Java" (according to Michael Koch).
* Compress binary-indep packages using bzip2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
47
47
GCJ_SUFFIX = -4.2
48
48
 
49
49
DISTRIBUTION_PATCHES = \
50
 
        debian/patches/gcc-suffix.diff \
51
 
        debian/patches/gcc-no-werror.diff
 
50
        debian/patches/gcc-no-werror.diff \
 
51
 
 
52
#       debian/patches/icedtea-memory-limits.patch \
 
53
 
52
54
export DISTRIBUTION_PATCHES
53
55
 
54
56
ifeq ($(STAGE1_JAVA),gcj)
124
126
bd_openjdk = \
125
127
        libxtst-dev, libxi-dev, libxt-dev, libxp-dev, libxaw7-dev, \
126
128
        libcupsys2-dev, lesstif2-dev, libasound2-dev, libfreetype6-dev, \
127
 
        libxalan2-java, liblcms1-dev,
 
129
        libxalan2-java, liblcms1-dev, libxinerama-dev,
128
130
bd_accessbridge = \
129
131
        gawk, pkg-config, libbonobo2-dev, libatspi-dev, at-spi, \
130
132
        $(if $(filter $(distribution),Debian),xbase-clients,xprop),
158
160
d_doc   = debian/$(p_doc)
159
161
d_plug  = debian/$(p_plug)
160
162
 
 
163
bd_options = -- -Zbzip2
161
164
control_vars = \
162
 
        '-Vbase:Version=7~b19' \
 
165
        '-Vbase:Version=7~b21' \
163
166
        '-Vdlopen:Depends=$(dlopen_depends)' \
164
167
        '-Vdlopen:Recommends=$(dlopen_recommends)' \
165
168
 
237
240
        $(MAKE) $(build_target)
238
241
        touch $@
239
242
 
240
 
bridge_dir = java-access-bridge-1.19.2
 
243
bridge_dir = java-access-bridge-1.20.0
241
244
 
242
245
stamps/build-bridge: stamps/build stamps/configure-bridge
243
 
#       JAVA_HOME=/usr/lib/jvm/java-7-icedtea \
244
 
 
245
246
        JAVA_HOME=$(CURDIR)/$(sdkimg) \
246
247
        PATH=$(CURDIR)/$(sdkimg)/bin:$$PATH \
247
248
            $(MAKE) -C $(bridge_dir)
249
250
 
250
251
stamps/configure-bridge:
251
252
        rm -rf $(bridge_dir)
252
 
        tar xf $(bridge_dir).tar.gz
253
 
#       cd $(bridge_dir) && \
254
 
#           JAVA_HOME=/usr/lib/jvm/java-7-icedtea \
255
 
#           PATH=$(CURDIR)/$(sdkimg)/bin:$$PATH \
256
 
#               $(CURDIR)/$(bridge_dir)/configure 
 
253
        tar xf $(bridge_dir).tar.bz2
257
254
        cd $(bridge_dir) && \
258
255
            JAVA_HOME=$(CURDIR)/$(sdkimg) \
259
256
            PATH=$(CURDIR)/$(sdkimg)/bin:$$PATH \
589
586
        dh_installdeb -i
590
587
        dh_gencontrol -i -- $(control_vars)
591
588
        dh_md5sums -i
592
 
        dh_builddeb -i
 
589
        dh_builddeb -i $(bd_options)
593
590
 
594
591
# Build architecture dependant packages
595
592
binary-arch: build install
610
607
        dh_installdeb -s
611
608
        dh_gencontrol -s -- $(control_vars)
612
609
        dh_md5sums -s
613
 
        dh_builddeb -s
 
610
        dh_builddeb -s #$(bd_options)
614
611
 
615
612
binary: binary-arch binary-indep
616
613
.PHONY: build clean binary-indep binary-arch binary install