diff --git a/.gitignore b/.gitignore index b4a24a3..ea08b47 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ .* # but we _wan't_ those dot-files !.gitignore -!.hgignore !.mailmap # ChangeLog is generated during make diff --git a/.hgignore b/.hgignore deleted file mode 100644 index b41a33e..0000000 --- a/.hgignore +++ /dev/null @@ -1,5 +0,0 @@ -(^|/)CVS($|/) -(^|/)\.hg($|/) -(^|/)\.hgtags($|/) -ChangeLog -~$ diff --git a/Makefile b/Makefile index 5c39fef..a06043b 100644 --- a/Makefile +++ b/Makefile @@ -17,9 +17,7 @@ DIST_PREFIX = ${TMP} VERSION = 4.3rc1 DEBVERSION = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/') BASE = xen-tools -VCS = $(shell if git ls-files > /dev/null; then echo git; \ - elif hg st > /dev/null; then echo hg; \ - else echo cannot-determine-used-vcs; fi) +VCS = git # # Installation prefix, useful for the Debian package. @@ -240,7 +238,6 @@ release: tidy fixup-perms update-version update-modules clean changelog rm -f $(DIST_PREFIX)/$(BASE)-$(VERSION).tar.gz cp -R . $(DIST_PREFIX)/$(BASE)-$(VERSION) rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/debian - rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/.hg* rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/.git* cd $(DIST_PREFIX) && tar -cvf $(DIST_PREFIX)/$(BASE)-$(VERSION).tar $(BASE)-$(VERSION)/ gzip $(DIST_PREFIX)/$(BASE)-$(VERSION).tar diff --git a/NEWS b/NEWS index e9c6639..7cf47fb 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,12 @@ Bug Fixes * Fix several testuite failures depending on the build host's installation. +Other Changes +------------- + +* Remove most Mercurial traces + + xen-tools 4.3rc1 (released 08 Jun 2012) ======================================= diff --git a/debian/changelog b/debian/changelog index ddca71e..7b25f83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xen-tools (4.3~rc2~dev-1) UNRELEASED; urgency=low * New upstream release candidate + - Remove most Mercurial traces * Fixes FTBFS due to testsuite failures (Closes: #676681) - Disable tests of not yet used Xen::Tools. Fixes FTBFS in test suite due to not satisifed Moose dependency in Xen::Tools::Log.