[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.14.4-8-g5edfa94

[Modestas Vainius]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/pkg-kde-tools.git;a=commitdiff;h=27a188c

The following commit has been merged in the master branch:
commit 27a188c4101425a443596d4727750ad6fa70e71d
Author: Modestas Vainius <modax at debian.org>
Date:   Sun May 27 10:52:01 2012 +0300

    Install pkgkde-git as an alias for pkgkde-vcs.
    
    Executing pkgkde-vcs as pkgkde-git will force VCS type to git.
---
 CMakeLists.txt               |    1 +
 debian/changelog             |    1 +
 debian/pkg-kde-tools.install |    2 ++
 man1/pkgkde-git.1            |    1 +
 man1/pkgkde-vcs.1            |   14 ++++++++++----
 pkgkde-git                   |    1 +
 pkgkde-vcs                   |   28 +++++++++++++++++++++++-----
 7 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08d471e..c903938 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,6 +77,7 @@ install(PROGRAMS
     pkgkde-override-sc-dev-latest
     pkgkde-symbolshelper
     pkgkde-vcs
+    pkgkde-git
     DESTINATION ${BIN_INSTALL_DIR}
     COMPONENT Programs)
 install_pod_manpages(1 pkgkde-override-sc-dev-latest)
diff --git a/debian/changelog b/debian/changelog
index 276fca4..a9fb666 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 pkg-kde-tools (0.14.5~pre1) UNRELEASED; urgency=low
 
   * Bump Standards-Version to 3.9.3: no changes needed.
+  * Install pkgkde-git as an alias for pkgkde-vcs with VCS type forced to git.
 
  -- Modestas Vainius <modax at debian.org>  Mon, 21 May 2012 19:42:46 +0300
 
diff --git a/debian/pkg-kde-tools.install b/debian/pkg-kde-tools.install
index 57a6d61..7764558 100644
--- a/debian/pkg-kde-tools.install
+++ b/debian/pkg-kde-tools.install
@@ -4,12 +4,14 @@ usr/bin/dh_sodeps
 usr/bin/pkgkde-debs2symbols
 usr/bin/pkgkde-gensymbols
 usr/bin/pkgkde-getbuildlogs
+usr/bin/pkgkde-git
 usr/bin/pkgkde-override-sc-dev-latest
 usr/bin/pkgkde-symbolshelper
 usr/bin/pkgkde-vcs
 usr/share/man/man1/dh_movelibkdeinit.1
 usr/share/man/man1/dh_sameversiondep.1
 usr/share/man/man1/dh_sodeps.1
+usr/share/man/man1/pkgkde-git.1
 usr/share/man/man1/pkgkde-override-sc-dev-latest.1
 usr/share/man/man1/pkgkde-vcs.1
 usr/share/perl5/Debian/Debhelper/
diff --git a/man1/pkgkde-git.1 b/man1/pkgkde-git.1
new file mode 120000
index 0000000..9090aec
--- /dev/null
+++ b/man1/pkgkde-git.1
@@ -0,0 +1 @@
+pkgkde-vcs.1
\ No newline at end of file
diff --git a/man1/pkgkde-vcs.1 b/man1/pkgkde-vcs.1
index 6e79c7c..da86c89 100644
--- a/man1/pkgkde-vcs.1
+++ b/man1/pkgkde-vcs.1
@@ -1,10 +1,13 @@
-.TH PKGKDE\-VCS 1 "2009-10-16" "0.1" "Debian KDE packaging VCS helper"
+.TH PKGKDE\-VCS 1 "2012-05-27" "0.15" "Debian KDE packaging VCS helper"
 .SH NAME
 .B pkgkde\-vcs
 \- a helper tool for Debian pkg-kde VCS repositories.
 .SH SYNOPSIS
 .B pkgkde\-vcs
 [B\-vyR] IsubcommandR [ ISUBCOMMAND OPTIONSR ] [ -- IEXTERNAL TOOL OPTIONSR ]
+.P
+.B pkgkde\-git
+[B\-vyR] IsubcommandR [ ISUBCOMMAND OPTIONSR ] [ -- IEXTERNAL TOOL OPTIONSR ]
 .SH DESCRIPTION
 .B pkgkde\-vcs
 is a helper tool which aims to simplify a couple of routine tasks associated
@@ -15,12 +18,15 @@ interface. Please note that this helper enforces the best practises and
 packaging conventions adopted by Debian Qt/KDE maintainer groups and therefore
 it should not be considered as a general purpose packaging helper.
 
-.B pkgkde\-cvs
+.B pkgkde\-vcs
 should be run from the fully checked out packaging repository of the package it
 is supposed to act upon. Firstly, it attempts to detect a VCS in use for
 the particular packaging in the working directory. Please note, that the
-detection might fail if underlying VCS utilities are not installed. If
-detection is successful, Bpkgkde\-vcsR will perform tasks as defined for
+detection might fail if underlying VCS utilities are not installed. If you want
+or have to force a specific VCS type, run the command as Ipkgkde\-$vcsR,
+for example Bpkgkde-gitR.
+
+If detection is successful, Bpkgkde\-vcsR will perform tasks as defined for
 the specified IsubcommandR (e.g. tag). Different set of subcommands might
 be defined for each VCS and each of them might accept a different set of ISUBCOMMAND
 OPTIONSR (see below). All locally unrecognized subcommand options (or the
diff --git a/pkgkde-git b/pkgkde-git
new file mode 120000
index 0000000..573915e
--- /dev/null
+++ b/pkgkde-git
@@ -0,0 +1 @@
+pkgkde-vcs
\ No newline at end of file
diff --git a/pkgkde-vcs b/pkgkde-vcs
index e5bc198..6c4c207 100755
--- a/pkgkde-vcs
+++ b/pkgkde-vcs
@@ -32,11 +32,29 @@ die()
 # Supports Git at the moment
 determine_vcs()
 {
-    if which git > /dev/null && git rev-parse --git-dir >/dev/null 2>/dev/null; then
-        echo git
-        return 0
-    fi
-    return 1
+    # VCS might have been requested via program name
+    local vcs
+    vcs="`basename "$0"`"
+    vcs="${vcs##pkgkde-}"
+    case "$vcs" in
+        vcs)
+            if which git > /dev/null && git rev-parse --git-dir >/dev/null 2>/dev/null; then
+                echo git
+                return 0
+            fi
+            return 1
+            ;;
+        git)
+            if which git > /dev/null; then
+                echo "$vcs"
+                return 0
+            fi
+            return 1
+            ;;
+        *)
+            return 1
+            ;;
+    esac
 }
 
 # Determine LIBDIR. Supports both running in-source and installed

-- 
Debian Qt/KDE packaging tools