diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | src/minefield-packager.mk.in | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index cc38443..fbcd9be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mozilla-devscripts (0.11) UNRELEASED; urgency=low + + * [ minefield-packager ] upstream builds are now identified with + a trailling "-mozilla-central", it's no longer "-trunk" + - update src/minefield-packager.mk.in + + -- Fabien Tassin <fta@ubuntu.com> Wed, 17 Sep 2008 15:29:04 +0200 + mozilla-devscripts (0.10) intrepid; urgency=low [ Sasa Bodiroza ] diff --git a/src/minefield-packager.mk.in b/src/minefield-packager.mk.in index e117f86..e07ea50 100644 --- a/src/minefield-packager.mk.in +++ b/src/minefield-packager.mk.in @@ -23,6 +23,7 @@ MACHINE := $(shell uname -m) WORKDIR := temp-$(shell echo $$$$) BUILDSTAMP := $(WORKDIR)/build-stamp PKGNAME := firefox-minefield +TRUNK_SIG := mozilla-central MOZDEVSCRIPT_DIR := minefield-packager LIBDIR := $(MOZDEVSCRIPT_DIR)/ @@ -37,7 +38,7 @@ else SNAPSHOT=$(DEBIAN_DATE) endif -LINE := $(shell wget -qO - $(URLBASE)$(SNAPSHOT)-trunk/ | grep linux-$(MACHINE).tar.bz2) +LINE := $(shell wget -qO - $(URLBASE)$(SNAPSHOT)-$(TRUNK_SIG)/ | grep linux-$(MACHINE).tar.bz2) ifeq (,$(LINE)) $(error Could not find a valid archive for $(MACHINE)) @@ -54,12 +55,12 @@ build: $(BUILDSTAMP) make_deb clean list: @echo Available snapshots are: - @wget -qO - $(URLBASE) | grep -- -trunk/ | cut -d'"' -f8,11 | sed -e 's,\(.*\)-trunk/">\(.*\) .*,\1 \2,' + wget -qO - $(URLBASE) | grep -- -$(TRUNK_SIG)/ | cut -d'"' -f8,11 | sed -e 's,\(.*\)-$(TRUNK_SIG)/">\(.*\) .*,\1 \2,' $(BUILDSTAMP): rm -rf $(WORKDIR) mkdir -p $(WORKDIR)/debian/tmp/DEBIAN $(WORKDIR)/debian/tmp/usr/lib - wget -P $(WORKDIR) $(URLBASE)$(SNAPSHOT)-trunk/$(FILE) + wget -P $(WORKDIR) $(URLBASE)$(SNAPSHOT)-$(TRUNK_SIG)/$(FILE) tar -C $(WORKDIR)/debian/tmp -jxf $(WORKDIR)/$(FILE) mv $(WORKDIR)/debian/tmp/firefox $(WORKDIR)/debian/tmp/usr/lib/$(PKGNAME) touch $(BUILDSTAMP) |