pidgin/pidgin

02ad66f62757
Merge 5b5516d9a5dbbd6e534eba231284bbd1c4c16f57 to fix package_version.h
--- a/Makefile.am Tue Jun 12 03:37:03 2012 +0000
+++ b/Makefile.am Wed Jun 13 19:30:38 2012 -0400
@@ -51,9 +51,9 @@
head po/ChangeLog | grep "^version $(PACKAGE_VERSION)$$" >/dev/null
# Ensure we're working from a tag...
- test x`mtn automate select t:v$(PACKAGE_VERSION)` = x`mtn automate get_base_revision_id`
-# ... and have no changes in the working copy.
- test "x`mtn diff | grep -v '^#'`" = x
+ test x`hg log -r "tag($(PACKAGE_VERSION))" --template "{node}"` = x`hg id -i --debug`
+# ... and have no changes in the working copy. (this isn't really necessary with hg because hg id appends a "+")
+ test "x`hg st -mard`" = x
release: version-check distcheck packages
@@ -93,8 +93,7 @@
# successfully; the rm -f ensures both
package_revision_raw.txt:
$(AM_V_GEN)REAL_BLDDIR=$$PWD/$(top_builddir); \
- (cd $(srcdir) && $$REAL_BLDDIR/mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \
- || (cd $(srcdir) && mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \
+ (hg --cwd $(srcdir) id -i --debug) 2>/dev/null >$@ \
|| rm -f $@
package_revision.h: package_revision_raw.txt
$(AM_V_GEN)if test -f $<; then \
--- a/libpurple/win32/targets.mak Tue Jun 12 03:37:03 2012 +0000
+++ b/libpurple/win32/targets.mak Wed Jun 13 19:30:38 2012 -0400
@@ -18,7 +18,7 @@
/^m4_define..purple_micro_version/ {system("sed -e s/@PURPLE_MICRO_VERSION@/"$$5"/ $@ > $@.tmp && mv $@.tmp $@"); exit}' $(PIDGIN_TREE_TOP)/configure.ac
$(PIDGIN_REVISION_RAW_TXT):
- (cd $(PIDGIN_TREE_TOP) && mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \
+ (hg --cwd $(PIDGIN_TREE_TOP) id -i --debug) 2>/dev/null >$@ \
|| rm -f $@
$(PIDGIN_REVISION_H): $(PIDGIN_REVISION_RAW_TXT)