diff options
author | Benjamin Drung <bdrung@ubuntu.com> | 2009-09-07 22:45:38 +0200 |
---|---|---|
committer | Benjamin Drung <bdrung@ubuntu.com> | 2009-09-07 22:45:38 +0200 |
commit | 15e925f58b6262bf83c9fbeff33a1ceb7e93a643 (patch) | |
tree | 8370a1c734dc66d067976e20c5d551ccc0eb05e3 | |
parent | 085aed18edb036df879c584375214b974cc8bc7c (diff) |
- simplify xpi-depends-stamp rule
- update src/xpi.mk
-rw-r--r-- | debian/changelog | 4 | ||||
-rw-r--r-- | src/xpi.mk | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 439acb7..7e3cb1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,10 @@ mozilla-devscripts (0.16) UNRELEASED; urgency=low - Guess common license file names if MOZ_XPI_DOCUMENTED_LICENSE_FILES is not set. - update src/xpi.mk + - simplify xpi-depends-stamp rule + - update src/xpi.mk - -- Benjamin Drung <bdrung@ubuntu.com> Sun, 23 Aug 2009 00:24:04 +0200 + -- Benjamin Drung <bdrung@ubuntu.com> Mon, 07 Sep 2009 22:39:31 +0200 mozilla-devscripts (0.15) unstable; urgency=low @@ -208,9 +208,8 @@ install-%-stamp: unzip-%-stamp touch $@ xpi-depends-stamp: unzip-$(XPI_BASE_FILE)-stamp - if test -f debian/$(MOZ_EXTENSION_PKG).substvars; then grep -v ^xpi:Depends= debian/$(MOZ_EXTENSION_PKG).substvars > debian/$(MOZ_EXTENSION_PKG).substvars~; fi - echo "xpi:Depends=$(XPI_DEPENDS)" | sed "s/ / | /g" >> debian/$(MOZ_EXTENSION_PKG).substvars~ - mv debian/$(MOZ_EXTENSION_PKG).substvars~ debian/$(MOZ_EXTENSION_PKG).substvars + if test -f debian/$(MOZ_EXTENSION_PKG).substvars; then sed -i '/^xpi:Depends=/d' debian/$(MOZ_EXTENSION_PKG).substvars; fi + echo "xpi:Depends=$(XPI_DEPENDS)" | sed "s/ / | /g" >> debian/$(MOZ_EXTENSION_PKG).substvars touch $@ xpi-install: install-$(XPI_BASE_FILE)-stamp autolinks-stamp xpi-depends-stamp |