← Back to branch summary

~ubuntu-branches/ubuntu/maverick/firefox/maverick

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2010-07-15 20:27:51 UTC
  • mfrom: (1.1.19 upstream)
  • Revision ID: james.westby@ubuntu.com-20100715202751-f95nl8qwcsuvco0i
Tags: 3.6.7+build2+nobinonly-0ubuntu1
* New upstream release v3.6.7build2 (FIREFOX_3_6_7_BUILD2)

* Make it possible to disable patches on a per-release basis. This
  makes it easier to share packaging branches across releases, and makes
  it possible to disable the patches which make the Hardy daily builds fail
  - update debian/rules
  - add debian/disable-patches.sh
  - add debian/patches/series-disable-patches.8.04
* Make the debian/usr.bin.firefox.apparmor.in target a dependency of
  pre-build rather than makebuilddir. Whilst this doesn't really change
  much, it is technically slightly more correct (makebuilddir is just for
  creating the build directory, whilst pre-build is for doing all the
  preparation work)
  - update debian/rules
* Merge the debian/firefox.sh target in to the match-all target, this
  just de-clutters things a little
  - update debian/rules
* Remove debian/stamp-autotools-files-moz in the clean target
  - update debian/rules
* Drop the empty firefox-dev and firefox-*-dev transitional packages. We
  didn't install anything in to firefox-dev, and we can reintroduce it in
  the future if anything in the archive depends on the browser specific
  interfaces
  - update debian/control
  - remove debian/firefox-dev.install
  - remove debian/firefox-dev.links
* Fix some Lintian warnings
  - add debian/README.source
  - update debian/control
* Make debian/migrator/ffox-beta-profile-migration-dialog a dependency of
  post-patches rather than pre-build. This avoids the need for having to 
  build the profile migrator when unpacking the source tarball
  - update debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
62
62
 
63
63
DEB_AUTO_UPDATE_AUTOCONF=2.13
64
64
 
 
65
# We need to do this before including patchsys-quilt.mk
 
66
# because we don't want the pre-build target to depend on this, but
 
67
# we want to ensure that appropriate patches are disabled before the
 
68
# apply-patches target is called
 
69
post-patches:: debian/disable-patches-for-release
 
70
 
65
71
include /usr/share/cdbs/1/rules/tarball.mk
66
72
include /usr/share/cdbs/1/rules/debhelper.mk
67
73
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
236
242
        debian/firefox.sh \
237
243
        $(NULL)
238
244
 
239
 
%: %.in
 
245
%:: %.in
240
246
        sed -e 's,@LIBDIR@,/$(DEBIAN_FF3_DIR),g' \
241
 
            -e 's,@APPNAME@,$(DEBIAN_NAME),g' < $< > $@
242
 
 
243
 
makebuilddir:: debian/usr.bin.firefox.apparmor.in
 
247
            -e 's,@APPNAME@,$(DEBIAN_NAME),g' \
 
248
            -e 's,@META_NAME@,$(DEBIAN_META_NAME),g' \
 
249
            -e 's,@APPVER@,$(DEBIAN_APP_NAME_VER),g' < $< > $@
 
250
 
 
251
debian/disable-patches-for-release:
 
252
        if [ -f "$(CURDIR)/debian/patches/series-disable-patches.$(DISTRIB_VERSION_MAJOR).$(DISTRIB_VERSION_MINOR)" ] ; then \
 
253
                /bin/sh $(CURDIR)/debian/disable-patches.sh $(CURDIR)/debian/patches/series-disable-patches.$(DISTRIB_VERSION_MAJOR).$(DISTRIB_VERSION_MINOR) $(CURDIR) ; \
 
254
        fi
 
255
        touch $@
 
256
 
244
257
debian/usr.bin.firefox.apparmor.in:
245
258
        if [ "$(DISTRIB_VERSION_MAJOR)" -ge "10" ]; then \
246
259
                cp $(CURDIR)/debian/usr.bin.firefox.apparmor.10.04 $(CURDIR)/debian/usr.bin.firefox.apparmor.in ; \
248
261
                cp $(CURDIR)/debian/usr.bin.firefox.apparmor.9.10 $(CURDIR)/debian/usr.bin.firefox.apparmor.in ; \
249
262
        fi
250
263
 
251
 
debian/firefox.sh: debian/firefox.sh.in
252
 
        sed -e 's,@LIBDIR@,/$(DEBIAN_FF3_DIR),g' \
253
 
            -e 's,@META_NAME@,$(DEBIAN_META_NAME),g' \
254
 
            -e 's,@APPVER@,$(DEBIAN_APP_NAME_VER),g' < $< > $@
255
 
 
256
264
debian/migrator/ffox-beta-profile-migration-dialog: debian/migrator/main.c
257
265
        $(CC) $(CFLAGS) -o $@ $< $(shell pkg-config --cflags --libs gtk+-2.0)
258
266
 
270
278
        touch $@
271
279
endif
272
280
 
 
281
post-patches:: debian/migrator/ffox-beta-profile-migration-dialog
273
282
 
274
283
common-build-arch::
275
284
        cd build-tree/mozilla/browser/locales/; \
471
480
        $(foreach file,$(GNOME_SUPPORT_FILES),rm -vf debian/$(DEBIAN_NAME)-gnome-support/usr/lib/firefox-*/components/$(file);) true
472
481
endif
473
482
 
474
 
pre-build:: $(subst_files) debian/migrator/ffox-beta-profile-migration-dialog
 
483
pre-build:: debian/usr.bin.firefox.apparmor.in $(subst_files)
475
484
        set -e; for i in $(UUDECODE); do \
476
485
                uudecode -o debian/$$i debian/$$i.uu; \
477
486
                done ; \
493
502
        rm -f debian/migrator/ffox-beta-profile-migration-dialog
494
503
        rm -f debian/migrator/*~
495
504
        rm -rf debian/tmp-*
 
505
        rm -f debian/stamp-autotools-files-moz
496
506
        rm -f debian/usr.bin.firefox.apparmor.in
 
507
        if [ -f "$(CURDIR)/debian/patches/series.orig" ] ; then \
 
508
                mv -f $(CURDIR)/debian/patches/series.orig $(CURDIR)/debian/patches/series ; \
 
509
        fi
 
510
        rm -f debian/disable-patches-for-release