[PATCH] UBUNTU: Use 'git foo' rather than 'git-foo'

[Colin Watson]

The git-core package in Jaunty (as of 1:1.6.0-1) no longer provides
git-foo commands in the default $PATH. Quoting
/usr/share/doc/git-core/NEWS.Debian.gz:

git-core (1:1.6.0-1) experimental; urgency=low

  Most of the programs are now installed outside the default $PATH,
  except for "git", "gitk" and some server side programs that need
  to be accessible for technical reasons.  Invoking a git subcommand
  as "git-xyzzy" from the command line has been deprecated since
  early 2006 (and officially announced in the 1.5.4 release notes);
  using the "git-xyzzy" form in scripts after adding the output from
  "git --exec-path" to the $PATH is still supported in this release,
  but users are again strongly encouraged to adjust their scripts to
  use the "git xyzzy" form, as this support might be dropped in later
  releases.

 -- Gerrit Pape <pape at smarden.org>  Sun, 24 Aug 2008 22:31:44 +0000

This modifies a few stray scripts that still used the old git-foo form.

Signed-off-by: Colin Watson <cjwatson at canonical.com>
---
 debian/rules.d/1-maintainer.mk |    4 ++--
 debian/scripts/misc/retag      |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
index 49bdfc4..0c1bf38 100644
--- a/debian/rules.d/1-maintainer.mk
+++ b/debian/rules.d/1-maintainer.mk
@@ -67,14 +67,14 @@ endif
 	@echo "CONCURRENCY_LEVEL = $(CONCURRENCY_LEVEL)"
 
 printchanges:
-	@git-log Ubuntu-$(release)-$(prev_revision)..HEAD | \
+	@git log Ubuntu-$(release)-$(prev_revision)..HEAD | \
 		perl -w -f debian/scripts/misc/git-ubuntu-log $(ubuntu_log_opts)
 
 insertchanges:
 	@perl -w -f debian/scripts/misc/insert-changes.pl
 
 diffupstream:
-	@git-diff-tree -p refs/remotes/linux-2.6/master..HEAD $(shell ls | grep -vE '^(ubuntu|debian|\.git.*)')
+	@git diff-tree -p refs/remotes/linux-2.6/master..HEAD $(shell ls | grep -vE '^(ubuntu|debian|\.git.*)')
 
 startnewrelease:
 	dh_testdir
diff --git a/debian/scripts/misc/retag b/debian/scripts/misc/retag
index 16054d8..94cf169 100755
--- a/debian/scripts/misc/retag
+++ b/debian/scripts/misc/retag
@@ -1,10 +1,10 @@
 #!/usr/bin/perl -w
 
-open(TAGS, "git-tag -l |") or die "Could not get list of tags";
+open(TAGS, "git tag -l |") or die "Could not get list of tags";
 @tags = <TAGS>;
 close(TAGS);
 
-open(LOGS, "git-log --pretty=short |") or die "ERROR: Calling git-log";
+open(LOGS, "git log --pretty=short |") or die "ERROR: Calling git log";
 my $commit = "";
 
 while (<LOGS>) {
@@ -23,12 +23,12 @@ while (<LOGS>) {
 
 	if (!defined($origtag)) {
 		print "I: Adding original tag for $tag\n";
-		system("git-tag -m $tag $tag.orig $tag");
+		system("git tag -m $tag $tag.orig $tag");
 	}
 
 	print "I: Tagging $tag => $commit\n";
 
-	system("git-tag -f -m $tag $tag $commit");
+	system("git tag -f -m $tag $tag $commit");
 }
 
 close(LOGS);
-- 
1.6.0.4