← Back to branch summary

~ubuntu-branches/ubuntu/precise/enigmail/precise-security

« back to all changes in this revision

Viewing changes to build/macosx/universal/flight.mk

  • Committer: Bazaar Package Importer
  • Author(s): Micah Gersten
  • Date: 2010-08-20 11:45:10 UTC
  • mfrom: (0.10.5 sid)
  • Revision ID: james.westby@ubuntu.com-20100820114510-h3cfzn2k0k5z01t5
Tags: 2:1.1.2-0ubuntu1
https://launchpad.net/bugs/565014
* New upstream release

* Merge from debian unstable.  Remaining changes:
  - Drop versioned mozilla-devscripts dependency since we don't build on
    mips or mipsel
  - Add back thunderbird-dev build depends
    - update debian/control
  - fixes LP: #565014 - No signature detected in emails signed using pgp/mime

* Update build-depends on thunderbird or icedove to >= 3.1~
  - update debian/control
* Drop frozen_api patch as changes were accepted upstream
  - drop debian/patches/frozen_api.diff
  - update debian/patches/series
* Use system NSPR in Ubuntu as well
  - update debian/rules
* Build with -fshort-wchar for now to make the build succeed
  - update debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
build/macosx/universal/flight.mk
67
67
INSTALLER_DIR = camino/installer
68
68
MOZ_PKG_APPNAME = camino
69
69
APPNAME = Camino.app
70
 
BUILDCONFIG_JAR = Contents/MacOS/chrome/embed.jar
 
70
BUILDCONFIG_JAR = Contents/MacOS/chrome/toolkit.jar
71
71
else # } {
72
72
MOZ_PKG_APPNAME = $(MOZ_APP_NAME)
73
73
APPNAME = $(MOZ_APP_DISPLAYNAME)$(DBGTAG).app
125
125
           cp $(DIST_PPC)/test-package-stage/reftest/automation.py   \
126
126
             $(DIST_X86)/test-package-stage/reftest/;                \
127
127
           $(TOPSRCDIR)/build/macosx/universal/unify                 \
 
128
             --unify-with-sort "all-test-dirs\.list$$"               \
128
129
             $(DIST_PPC)/test-package-stage                          \
129
130
             $(DIST_X86)/test-package-stage                          \
130
 
             $(DIST_UNI)/test-package-stage; fi
 
131
             $(DIST_UNI)/test-package-stage;                         \
 
132
        fi