The following commit has been merged in the master branch:
commit 88aa36dc999ce6397dc9dfa2fc4100a113399d38
Author: Guillem Jover <[email protected]>
Date:   Fri Feb 19 07:20:07 2010 +0100

    Fix dpkg-query and dpkg-trigger to actually print a version on --version

diff --git a/debian/changelog b/debian/changelog
index 6533e8f..f2bb80c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -66,6 +66,7 @@ dpkg (1.15.6) UNRELEASED; urgency=low
   * Rename Dpkg::IPC::fork_and_exec() to Dpkg::IPC::spawn().
   * Change dpkg-dev to Depend on perl instead of perl5 and perl-modules.
   * Fix small memory leaks related to scandir() in dpkg-deb and libdpkg.
+  * Fix dpkg-query and dpkg-trigger to actually print a version on --version.
 
   [ Modestas Vainius ]
   * Implement symbol patterns (Closes: #563752). From now on, it is possible to
diff --git a/src/query.c b/src/query.c
index b19f734..64cd189 100644
--- a/src/query.c
+++ b/src/query.c
@@ -559,7 +559,8 @@ control_path(const char *const *argv)
 static void DPKG_ATTR_NORET
 printversion(const struct cmdinfo *ci, const char *value)
 {
-  printf(_("Debian `%s' package management program query tool\n"), DPKGQUERY);
+  printf(_("Debian %s package management program query tool version %s.\n"),
+         DPKGQUERY, DPKG_VERSION_ARCH);
   printf(_(
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
diff --git a/src/trigcmd.c b/src/trigcmd.c
index 3e72ffe..85d2fec 100644
--- a/src/trigcmd.c
+++ b/src/trigcmd.c
@@ -48,7 +48,8 @@ const char printforhelp[] = N_(
 static void DPKG_ATTR_NORET
 printversion(const struct cmdinfo *ci, const char *value)
 {
-       printf(_("Debian %s package trigger utility.\n"), thisname);
+       printf(_("Debian %s package trigger utility version %s.\n"),
+              thisname, DPKG_VERSION_ARCH);
 
        printf(_(
 "This is free software; see the GNU General Public License version 2 or\n"

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to