← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/firefox/oneiric-security

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2011-08-19 16:54:02 UTC
  • mfrom: (1.1.47 upstream)
  • Revision ID: james.westby@ubuntu.com-20110819165402-cb5jdmg69k5tjkep
Tags: 7.0~b1+build1+nobinonly-0ubuntu1
https://launchpad.net/bugs/561124
* New upstream release from the beta channel (FIREFOX_7_0b1_BUILD1)

* Rewrite the apport hook to be more useful
  - update debian/apport/firefox.py.in
* Update the apport blacklist file now that the binary name has changed
  - update debian/apport/firefox.in
* Dropped patches which are obsolete/fixed upstream
  - remove debian/patches/cairo-lcd-filter.patch
  - remove debian/patches/fix-sdk-bin-install.patch
  - update debian/patches/series
* Refresh patches
  - update debian/patches/firefox-kde.patch
  - update debian/patches/mozilla-kde.patch
  - update debian/patches/reload-new-plugins.patch
* Look in the correct location for the staged langpack xpi's. They moved
  from dist/install to dist/linux-$(DEB_HOST_GNU_CPU)
  - update debian/rules
* Ensure we use DEB_BUILD_* and DEB_HOST_* consistently so that cross-
  compiling works
  - update debian/rules
  - update debian/mozconfig.in
  - update debian/firefox-dev.install.in
* Improve the description for unavailable language packs
  - update debian/control.langpacks.unavail
* Simplify firefox-dev.install a bit by installing everything in
  /usr/include
  - update debian/firefox-dev.install.in
* Use $(MOZ_DISTDIR) rather than $(MOZ_OBJDIR)/dist in debian/rules.
  - update debian/rules
* Handle video/webm mimetypes
  - update debian/firefox.desktop.in
* Fix check-sync-dirs.py test failure - ensure config/system-headers and
  js/src/config/system-headers are kept in sync
  - update debian/patches/unity-globalmenu-build-support-patch
* Fix browserGlue_distribution.js and browserGlue_smartBookmarks.js xpcshell
  test failures. Update DEFAULT_BOOKMARKS_ON_MENU with the correct number of
  default bookmarks
  - update debian/patches/ubuntu-bookmarks.patch
* Fix jsreftest failures by setting the correct timezone and locale
  - update debian/testsuite.mk
* Switch off debian/patches/fix-selection-drag-autoscroll.patch for now. It
  doesn't apply and needs a rethink
  - update debian/patches/series
* Fix "format not a string literal and no format arguments" error
 - add debian/patches/printf-fix.patch
 - update debian/patches/series
* Update for the binary name change
  - update debian/firefox.install.in
  - update debian/firefox.sh.in
* Ensure we install dependentlibs.list so that Firefox knows which libs
  to dlopen before libxul
  - update debian/firefox.install.in
* Get rid of some more hanging IPC xpcshell tests
  - update debian/testsuite.mk
* Now Firefox lazy loads libxul, drop the LD_LIBRARY_PATH hack from the
  shell wrapper (LP: #561124)
  - update debian/firefox.sh.in
* Refresh shipped locales for beta
  - refresh debian/locales.shipped
  - refresh debian/locales.unavailable
  - refresh debian/control
* Ship a file in /etc/apport/native-origins.d to enable bug reporting
  on PPA branches
  - add debian/apport/native-origins.in
  - rename debian/apport/firefox.in => debian/apport/blacklist.in
  - update debian/rules
  - update debian/firefox.install.in
  - update debian/firefox.dirs.in

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
26
26
# from having to guess our platform (since we know it already)
27
27
DEB_HOST_GNU_TYPE               ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
28
28
DEB_BUILD_GNU_TYPE              ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
29
 
DEB_BUILD_ARCH                  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
29
DEB_HOST_ARCH                   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
30
30
DEB_HOST_GNU_CPU                ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
31
31
# Other things which should be defined before including the CDBS rules
32
32
DEB_TAR_SRCDIR                  := mozilla
47
47
include /usr/share/cdbs/1/class/makefile.mk
48
48
include $(CURDIR)/debian/mozclient/$(MOZ_APP_BASENAME).mk
49
49
 
50
 
MOZ_OBJDIR              := $(DEB_BUILDDIR)$(MOZ_MOZDIR)/objdir-$(DEB_BUILD_GNU_TYPE)
51
 
MOZ_DISTDIR             := $(MOZ_OBJDIR)$(MOZ_MOZDIR)/dist
 
50
MOZ_OBJDIR              := $(DEB_BUILDDIR)/$(MOZ_MOZDIR)/obj-$(DEB_HOST_GNU_TYPE)
 
51
MOZ_DISTDIR             := $(MOZ_OBJDIR)/$(MOZ_MOZDIR)/dist
52
52
 
53
53
ifeq (1,$(MOZ_VALGRIND))
54
54
        MOZ_BUILD_UNOFFICIAL = 1
100
100
MOZ_SDKDIR                      = $(MOZ_PREFIX)/lib/$(MOZ_APP_NAME)-devel-$(MOZ_VERSION)
101
101
MOZ_SERIES                      = $(shell echo $(MOZ_VERSION) | sed -e 's/pre//; s/[ab].*//' | cut -d '.' -f 1,2)
102
102
 
103
 
NSPR_DEPENDS    := $(NULL)
104
 
NSS_DEPENDS     := $(NULL)
105
 
CAIRO_DEPENDS   := $(NULL)
 
103
NSPR_DEPENDS            := $(NULL)
 
104
NSS_DEPENDS             := $(NULL)
 
105
CAIRO_DEPENDS           := $(NULL)
106
106
DEB_DH_GENCONTROL_ARGS  = -- -Vnspr:Depends=$(NSPR_DEPENDS) -Vnss:Depends=$(NSS_DEPENDS) -Vcairo:Depends=$(CAIRO_DEPENDS)
107
107
DEB_AUTO_UPDATE_DEBIAN_CONTROL  = no
108
108
 
120
120
endif
121
121
 
122
122
# enable the crash reporter only on i386, amd64 and armel
123
 
ifeq (,$(filter i386 amd64 armel,$(DEB_BUILD_ARCH)))
 
123
ifeq (,$(filter i386 amd64 armel,$(DEB_HOST_ARCH)))
124
124
        MOZ_ENABLE_BREAKPAD = 0
125
125
endif
126
126
 
194
194
 
195
195
# Defines used for the Mozilla text preprocessor
196
196
DEB_DEFINES =   -DMOZ_LIBDIR="$(MOZ_LIBDIR)" -DMOZ_APP_NAME="$(MOZ_APP_NAME)" -DMOZ_SERIES="$(MOZ_SERIES)" -DMOZ_APP_BASENAME="$(MOZ_APP_BASENAME)"\
197
 
                -DMOZ_INCDIR="$(MOZ_INCDIR)" -DMOZ_IDLDIR="$(MOZ_IDLDIR)" -DMOZ_VERSION="$(MOZ_VERSION)" -DDEB_BUILD_ARCH="$(DEB_BUILD_ARCH)" \
 
197
                -DMOZ_INCDIR="$(MOZ_INCDIR)" -DMOZ_IDLDIR="$(MOZ_IDLDIR)" -DMOZ_VERSION="$(MOZ_VERSION)" -DDEB_HOST_ARCH="$(DEB_HOST_ARCH)" \
198
198
                -DMOZ_DISPLAY_NAME="$(MOZ_DISPLAY_NAME)" -DMOZ_SYSTEM_DICTDIR="$(MOZ_SYSTEM_DICTDIR)" \
199
 
                -DMOZ_BRANDING_OPTION="$(MOZ_BRANDING_OPTION)" -DTOPSRCDIR="$(CURDIR)" -DDEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
 
199
                -DMOZ_BRANDING_OPTION="$(MOZ_BRANDING_OPTION)" -DTOPSRCDIR="$(CURDIR)" -DDEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
200
200
                -DMOZ_PREFIX="$(MOZ_PREFIX)" -DMOZ_SDKDIR="$(MOZ_SDKDIR)" -DMOZ_DISTDIR="$(MOZ_DISTDIR)" \
201
201
                -DMOZ_OBJDIR="$(MOZ_OBJDIR)" -DDEB_BUILDDIR="$(DEB_BUILDDIR)" -DMOZ_PYTHON="$(MOZ_PYTHON)" -DMOZ_PROFILE_PREFIX=".mozilla/"
202
202
ifeq (1, $(MOZ_MIN_SYSDEPS))
233
233
        DEB_DEFINES += -DMOZ_WANT_UNIT_TESTS
234
234
endif
235
235
ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
236
 
        DEB_DEFINES += -DDEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)"
 
236
        DEB_DEFINES += -DDEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)"
237
237
endif
238
238
ifeq (1,$(MOZ_BUILD_PGO))
239
239
        DEB_DEFINES += -DMOZ_BUILD_PGO
248
248
ifeq (1,$(MOZ_DEBUG))
249
249
        DEB_DEFINES += -DMOZ_DEBUG
250
250
endif
251
 
ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
 
251
ifneq (,$(findstring armel,$(DEB_HOST_ARCH)))
252
252
        DEB_DEFINES += -DDEB_ENABLE_THUMB2
253
253
endif
254
254
ifeq (1,$(MOZ_ENABLE_GLOBALMENU))
261
261
        DEB_DEFINES += -DMOZ_APP_RENAME
262
262
endif
263
263
 
264
 
DEBIAN_EXECUTABLES = \
265
 
        $(MOZ_APP_NAME)$(MOZ_LIBDIR)/firefox.sh \
266
 
        $(NULL)
 
264
DEBIAN_EXECUTABLES = $(MOZ_APP_NAME)$(MOZ_LIBDIR)/firefox.sh \
 
265
                     $(NULL)
267
266
 
268
267
subst_files = \
269
268
        debian/usr.bin.$(MOZ_APP_NAME) \
270
269
        debian/README.Debian \
271
270
        debian/firefox.sh \
272
 
        debian/apport/$(MOZ_APP_NAME) \
 
271
        debian/apport/blacklist \
 
272
        debian/apport/native-origins \
273
273
        debian/apport/$(MOZ_APP_NAME).py \
274
274
        debian/$(MOZ_APP_NAME).desktop \
275
275
        debian/$(MOZ_APP_NAME).xml \
352
352
        BRANCH = -$(MOZ_APP_NAME_SUFFIX)
353
353
endif
354
354
$(subst_files): $(foreach file, $(subst_files), $(subst $(BRANCH),,$(file).in))
355
 
        $(MOZ_PYTHON) $(DEB_BUILDDIR)/config/Preprocessor.py -Fsubstitution --marker="%%" $(DEB_DEFINES) $(CURDIR)/$(subst $(BRANCH),,$@.in) > $(CURDIR)/$@
 
355
        $(MOZ_PYTHON) $(DEB_BUILDDIR)/$(MOZ_MOZDIR)/config/Preprocessor.py -Fsubstitution --marker="%%" $(DEB_DEFINES) $(CURDIR)/$(subst $(BRANCH),,$@.in) > $(CURDIR)/$@
 
356
 
 
357
%.pc: WCHAR_CFLAGS = $(shell cat $(MOZ_OBJDIR)/config/autoconf.mk | grep WCHAR_CFLAGS | sed 's/^[^=]*=[[:space:]]*\(.*\)$$/\1/')
 
358
%.pc: %.pc.in debian/stamp-makefile-build
 
359
        $(MOZ_PYTHON) $(DEB_BUILDDIR)/$(MOZ_MOZDIR)/config/Preprocessor.py -Fsubstitution --marker="%%" $(DEB_DEFINES) -DWCHAR_CFLAGS="$(WCHAR_CFLAGS)" $(CURDIR)/$< > $(CURDIR)/$@
356
360
 
357
361
%.pc: WCHAR_CFLAGS = $(shell cat $(MOZ_OBJDIR)/config/autoconf.mk | grep WCHAR_CFLAGS | sed 's/^[^=]*=[[:space:]]*\(.*\)$$/\1/')
358
362
%.pc: %.pc.in debian/stamp-makefile-build
415
419
                then \
416
420
                        language=`echo $$line | sed 's/\([^:]*\):*\([^:]*\):*\([^:]*\)/\1/'` ; \
417
421
                        pkgname=`echo $$line | sed 's/\([^:]*\):*\([^:]*\):*\([^:]*\)/\2/'` ; \
418
 
                        id=`python $(CURDIR)/debian/get-xpi-id.py $(CURDIR)/$(MOZ_OBJDIR)/dist/install/$(MOZ_APP_NAME)-$(MOZ_VERSION).$${language}.langpack.xpi` ; \
 
422
                        id=`python $(CURDIR)/debian/get-xpi-id.py $(CURDIR)/$(MOZ_DISTDIR)/linux-$(DEB_HOST_GNU_CPU)/xpi/$(MOZ_APP_NAME)-$(MOZ_VERSION).$${language}.langpack.xpi` ; \
419
423
                        dh_installdirs -p$(MOZ_APP_NAME)-locale-$${pkgname} usr/lib/$(MOZ_APP_NAME)-addons/extensions ; \
420
 
                        cp $(CURDIR)/$(MOZ_OBJDIR)/dist/install/$(MOZ_APP_NAME)-$(MOZ_VERSION).$${language}.langpack.xpi \
 
424
                        cp $(CURDIR)/$(MOZ_DISTDIR)/linux-$(DEB_HOST_GNU_CPU)/xpi/$(MOZ_APP_NAME)-$(MOZ_VERSION).$${language}.langpack.xpi \
421
425
                          $(CURDIR)/debian/$(MOZ_APP_NAME)-locale-$${pkgname}/usr/lib/$(MOZ_APP_NAME)-addons/extensions/$${id}.xpi ; \
422
426
                        dh_installdirs -p$(MOZ_APP_NAME)-locale-$${pkgname} usr/lib/$(MOZ_APP_NAME)-addons/searchplugins/$${language} ; \
423
 
                        cp -r $(CURDIR)/$(MOZ_OBJDIR)/dist/xpi-stage/locale-$${language}/searchplugins/*.xml \
 
427
                        cp -r $(CURDIR)/$(MOZ_DISTDIR)/xpi-stage/locale-$${language}/searchplugins/*.xml \
424
428
                          $(CURDIR)/debian/$(MOZ_APP_NAME)-locale-$${pkgname}/usr/lib/$(MOZ_APP_NAME)-addons/searchplugins/$${language}/. ; \
425
429
                fi \
426
430
        done < $(CURDIR)/debian/locales.shipped
427
431
 
428
432
binary-install/$(MOZ_APP_NAME)::
429
433
        convert -resize 32x32 debian/$(MOZ_APP_NAME)/usr/share/pixmaps/$(MOZ_APP_NAME).png debian/$(MOZ_APP_NAME)/usr/share/pixmaps/$(MOZ_APP_NAME).xpm
 
434
ifeq (1,$(MOZ_ENABLE_BREAKPAD))
 
435
        install -m 0644 $(CURDIR)/debian/apport/blacklist $(CURDIR)/debian/$(MOZ_APP_NAME)/etc/apport/blacklist.d/$(MOZ_APP_NAME)
 
436
endif
 
437
        install -m 0644 $(CURDIR)/debian/apport/native-origins $(CURDIR)/debian/$(MOZ_APP_NAME)/etc/apport/native-origins.d/$(MOZ_APP_NAME)
430
438
 
431
439
ifeq (1, $(MOZ_ENABLE_GLOBALMENU))
432
440
binary-install/$(MOZ_APP_NAME)-globalmenu::