← Back to branch summary

~mozillateam/thunderbird/thunderbird-beta.maverick

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Chris Coulson
  • Date: 2012-02-01 18:33:42 UTC
  • Revision ID: chris.coulson@canonical.com-20120201183342-ru0nkga3tqbk9fhy
https://launchpad.net/bugs/898883
* New upstream release from the beta channel (THUNDERBIRD_11_0b1_BUILD1)
* Drop patches fixed upstream:
  - remove debian/patches/fix-build-failure-without-yarr-jit.patch
  - remove debian/patches/fix-cursor-handling.patch
  - update debian/patches/series
* Ensure we include locales in the tarball if they are in shipped-locales
  but not in all-locales
  - update debian/build/create-tarball.py
* Always set the update channel - not setting it at build-time on release
  builds breaks the extensions.checkCompatibility pref. The only things
  using it at runtime are nsBlocklistService, Test Pilot (beta + aurora)
  and the about dialog (where the channel is hidden anyway)
  - update debian/rules
  - update debian/thunderbird.install.in
* Fix LP: #898883 - IPC xpcshell tests hang the buildd's. Give all
  xpcshell tests an X display, as plugin-container won't work without one
  - update debian/build/testsuite.mk
* Turn on all IPC xpcshell tests again (only applicable when the testsuite
  is enabled in the future)
  - update debian/build/testsute.mk
* Drop the default-apps xml file
  - remove debian/thunderbird.xml.in
  - update debian/thunderbird-gnome-support.install.in
  - update debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
105
105
NSPR_DEPENDS            := $(NULL)
106
106
NSS_DEPENDS             := $(NULL)
107
107
CAIRO_DEPENDS           := $(NULL)
108
 
DEB_DH_GENCONTROL_ARGS_$(MOZ_APP_NAME)-dev = -- -Vnspr:Depends=$(NSPR_DEPENDS) -Vnss:Depends=$(NSS_DEPENDS) -Vcairo:Depends=$(CAIRO_DEPENDS)
109
108
DEB_AUTO_UPDATE_DEBIAN_CONTROL  = no
110
109
 
111
110
MOZ_PYTHON              := $(shell which python)
207
206
$(foreach locale_package, $(LOCALE_PACKAGES), $(eval DEB_DH_GENCONTROL_ARGS_$(locale_package) = -- -v1:$(DEB_VERSION)))
208
207
endif
209
208
 
210
 
DEB_DH_GENCONTROL_ARGS_$(MOZ_APP_NAME)-gnome-support = -- -Vunity:Depends="$(UNITY_DEPENDS)"
 
209
DEB_DH_GENCONTROL_ARGS_$(MOZ_APP_NAME)-dev := -- -Vnspr:Depends=$(NSPR_DEPENDS) -Vnss:Depends=$(NSS_DEPENDS) -Vcairo:Depends=$(CAIRO_DEPENDS)
211
210
 
212
211
# Defines used for the Mozilla text preprocessor
213
212
DEB_DEFINES =   -DMOZ_LIBDIR="$(MOZ_LIBDIR)" -DMOZ_APP_NAME="$(MOZ_APP_NAME)" -DMOZ_APP_BASENAME="$(MOZ_APP_BASENAME)"\
214
213
                -DMOZ_INCDIR="$(MOZ_INCDIR)" -DMOZ_IDLDIR="$(MOZ_IDLDIR)" -DMOZ_VERSION="$(MOZ_VERSION)" -DDEB_HOST_ARCH="$(DEB_HOST_ARCH)" \
215
214
                -DMOZ_DISPLAY_NAME="$(MOZ_DISPLAY_NAME)" -DMOZ_SYSTEM_DICTDIR="$(MOZ_SYSTEM_DICTDIR)" -DMOZ_OVERRIDE_SHLIBS="$(MOZ_OVERRIDE_SHLIBS)" \
216
215
                -DMOZ_BRANDING_OPTION="$(MOZ_BRANDING_OPTION)" -DTOPSRCDIR="$(CURDIR)" -DDEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
217
 
                -DMOZ_PREFIX="$(MOZ_PREFIX)" -DMOZ_SDKDIR="$(MOZ_SDKDIR)" -DMOZ_DISTDIR="$(MOZ_DISTDIR)" \
 
216
                -DMOZ_PREFIX="$(MOZ_PREFIX)" -DMOZ_SDKDIR="$(MOZ_SDKDIR)" -DMOZ_DISTDIR="$(MOZ_DISTDIR)" -DMOZ_UPDATE_CHANNEL="$(CHANNEL)" \
218
217
                -DMOZ_OBJDIR="$(MOZ_OBJDIR)" -DDEB_BUILDDIR="$(DEB_BUILDDIR)" -DMOZ_PYTHON="$(MOZ_PYTHON)" -DMOZ_PROFILE_PREFIX="."
219
218
 
220
219
SHLIB_OVERRIDE = $(if $(shell test "system" = "$(MOZ_OVERRIDE_SHLIBS)" && echo "1"), $(eval MOZ_USE_$(1) = system), \
245
244
ifeq (1,$(MOZ_BUILD_PGO))
246
245
        DEB_DEFINES += -DMOZ_BUILD_PGO
247
246
endif
248
 
ifneq (,$(filter aurora beta, $(CHANNEL)))
249
 
        DEB_DEFINES += -DMOZ_UPDATE_CHANNEL="$(CHANNEL)"
250
 
endif
251
247
ifeq (1,$(MOZ_DEBUG))
252
248
        DEB_DEFINES += -DMOZ_DEBUG
253
249
endif
254
 
ifneq (,$(findstring armel,$(DEB_HOST_ARCH)))
255
 
        DEB_DEFINES += -DDEB_ENABLE_THUMB2
256
 
endif
257
250
ifeq (official, $(BRANDING))
258
251
        DEB_DEFINES += -DMOZ_OFFICIAL_BRANDING
259
252
endif
279
272
        debian/$(MOZ_APP_NAME).links \
280
273
        debian/$(MOZ_APP_NAME).manpages \
281
274
        debian/thunderbird.sh \
282
 
        debian/$(MOZ_APP_NAME).xml \
283
275
        debian/$(MOZ_APP_NAME).desktop \
284
276
        debian/$(MOZ_APP_NAME)-dev.install \
285
277
        debian/$(MOZ_APP_NAME)-dev.links \