diff options
| author | Fabien Tassin <fta@sofaraway.org> | 2008-05-25 23:23:49 +0200 |
|---|---|---|
| committer | Fabien Tassin <fta@sofaraway.org> | 2008-05-25 23:23:49 +0200 |
| commit | 6d92c11e0e96caf2e1151bd8b6199b1976555deb (patch) | |
| tree | c4c0942bad53bb26a814f0a109ba68b0777b3f96 /src | |
| parent | 8a954ef60a67482fc48672f19a45a21960bc7b09 (diff) | |
* [minefield-packager] change the description in the desktop file once more
- udpate src/minefield-packager/debian/pkgname.desktop.in
- update src/minefield-packager.mk.in
Diffstat (limited to 'src')
| -rw-r--r-- | src/minefield-packager.mk.in | 8 | ||||
| -rw-r--r-- | src/minefield-packager/debian/pkgname.desktop.in | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/minefield-packager.mk.in b/src/minefield-packager.mk.in index dba584d..e117f86 100644 --- a/src/minefield-packager.mk.in +++ b/src/minefield-packager.mk.in @@ -76,7 +76,7 @@ make_deb_targets = \ $(NULL) make_deb: BUILDID = $(shell grep ^BuildID $(WORKDIR)/debian/tmp/usr/lib/$(PKGNAME)/platform.ini | cut -d= -f2) -make_deb: VERSION = $(shell echo $(FILE) | sed -e 's/^[^-]*-//' | cut -d. -f1,2 | sed -e 's/pre/~/' -e 's/\([ab]\)/~\1/') +make_deb: VERSION = $(shell echo $(FILE) | sed -e 's/^[^-]*-//' | cut -d. -f1,2 | sed -e 's/pre//' -e 's/\([ab]\)/~\1/') make_deb: PACKDATE := $(shell date -R) make_deb: $(BUILDSTAMP) $(WORKDIR)/shlibs.local $(make_deb_targets) fakeroot dpkg-deb -b $(WORKDIR)/debian/tmp . @@ -93,6 +93,8 @@ $(WORKDIR)/debian/tmp/usr/share/applications/$(PKGNAME).desktop: $(LIBDIR)debian mkdir -p $(WORKDIR)/debian/tmp/usr/share/applications cat $< | sed \ -e 's/@PKGNAME@/$(PKGNAME)/g' \ + -e 's/@VERSION@/$(subst ~, ,$(VERSION))pre/g' \ + -e 's/@BUILDID@/$(BUILDID)/g' \ > $@ ############################# @@ -106,7 +108,7 @@ $(WORKDIR)/debian/tmp/usr/share/pixmaps/$(PKGNAME).png: $(BUILDSTAMP) $(WORKDIR)/debian/tmp/DEBIAN/changelog: $(LIBDIR)debian/changelog.in $(BUILDSTAMP) cat $< | sed \ -e 's/@PKGNAME@/$(PKGNAME)/g' \ - -e 's/@VERSION@/$(VERSION)build$(BUILDID)/g' \ + -e 's/@VERSION@/$(VERSION)~build$(BUILDID)/g' \ -e 's/@DATE@/$(PACKDATE)/g' \ > $@ @@ -118,7 +120,7 @@ $(WORKDIR)/debian/tmp/DEBIAN/control: $(LIBDIR)debian/control.in $(BUILDSTAMP) cat $< | sed \ -e 's/@PKGNAME@/$(PKGNAME)/g' \ -e 's/@ARCH@/$(ARCH)/g' \ - -e 's/@VERSION@/$(VERSION)build$(BUILDID)/g' \ + -e 's/@VERSION@/$(VERSION)~build$(BUILDID)/g' \ -e 's/@DEPENDS@/$(DEPENDS)/g' \ > $@ diff --git a/src/minefield-packager/debian/pkgname.desktop.in b/src/minefield-packager/debian/pkgname.desktop.in index cc0146d..896032a 100644 --- a/src/minefield-packager/debian/pkgname.desktop.in +++ b/src/minefield-packager/debian/pkgname.desktop.in @@ -1,8 +1,8 @@ [Desktop Entry] Version=1.0 Encoding=UTF-8 -Name=Minefield @VERSION@ -Comment=Minefield (mozilla nightly build @VERSION@) +Name=Minefield @VERSION@ Nightly +Comment=Minefield @VERSION@ (Mozilla nightly build @BUILDID@) GenericName=Web Browser Exec=@PKGNAME@ %u Terminal=false |