summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Tassin <fta@sofaraway.org>2008-05-19 18:33:36 +0200
committerFabien Tassin <fta@sofaraway.org>2008-05-19 18:33:36 +0200
commite05c8dc44e5a8c75ac7f1e36fbe3738d050442bf (patch)
tree12301be152b61699648ae83fa9b7f00635da943d
parent8d94253e2cccbcb4f5217e3a4f82fd691f4c824d (diff)
* Make mozclient-version a bit more silent and clean-up after it
- update src/mozclient.mk.in
-rw-r--r--debian/changelog7
-rw-r--r--src/mozclient.mk.in5
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 2a2133a..f2f37ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,13 @@ mozilla-devscripts (0.08) UNRELEASED; urgency=low
*/CVS or .hg
- update src/mozclient.mk.in
- update README
+ + Add a mozclient-version target producing a VERSION=foo string on stdout
+ - update src/mozclient.mk.in
+ + Fix nspr and nss conf files to fetch xulrunner versdion file using
+ MOZCLIENT_FILE instead of MOZCLIENT_MODULES
+ - update src/nspr.mk.in
+ - update src/nss.mk.in
+
* [ minefield-packager ]
+ drop dpkg-shlibdeps's stderr messages, add a banner with a license
- udpate src/minefield-packager.mk.in
diff --git a/src/mozclient.mk.in b/src/mozclient.mk.in
index f2b826d..b8686f1 100644
--- a/src/mozclient.mk.in
+++ b/src/mozclient.mk.in
@@ -163,8 +163,9 @@ endif
# Get version, and just that
mozclient-version: mozclient-deps mozclient-dir
- cd $(MOZCLIENT_TMP) && cvs -d $(MOZCLIENT_CVS_LOC) co $(MOZCLIENT_FILE)
- cd $(MOZCLIENT_TMP) && echo -n VERSION= && $(MOZCLIENT_GETVERSION)
+ @cd $(MOZCLIENT_TMP) && cvs -d $(MOZCLIENT_CVS_LOC) co $(MOZCLIENT_FILE)
+ @cd $(MOZCLIENT_TMP) && echo -n VERSION= && $(MOZCLIENT_GETVERSION)
+ @rm -rf $(MOZCLIENT_TMP)
# Patch
# - don't patch when a branch name is specified