[Reproducible-commits] [dpkg] 20/40: libdpkg: Rename DPKG_VERSION_ARCH to PACKAGE_RELEASE

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit acf1c3f037184ae513fafe4c4adc43b2d57fc95d
Author: Guillem Jover <guillem at debian.org>
Date:   Sat Mar 14 23:57:17 2015 +0100

    libdpkg: Rename DPKG_VERSION_ARCH to PACKAGE_RELEASE
    
    This avoids confusing the project-wide macro with the DPKG_VERSION_
    namespaced ones.
---
 dpkg-deb/main.c   | 2 +-
 dpkg-split/main.c | 2 +-
 dselect/main.cc   | 4 ++--
 lib/dpkg/dpkg.h   | 2 +-
 src/divertcmd.c   | 2 +-
 src/main.c        | 2 +-
 src/querycmd.c    | 2 +-
 src/statcmd.c     | 2 +-
 src/trigcmd.c     | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c
index 60f94c2..7ad10b2 100644
--- a/dpkg-deb/main.c
+++ b/dpkg-deb/main.c
@@ -51,7 +51,7 @@ static void DPKG_ATTR_NORET
 printversion(const struct cmdinfo *cip, const char *value)
 {
   printf(_("Debian '%s' package archive backend version %s.\n"),
-         BACKEND, DPKG_VERSION_ARCH);
+         BACKEND, PACKAGE_RELEASE);
   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/dpkg-split/main.c b/dpkg-split/main.c
index 3309bc8..f740a29 100644
--- a/dpkg-split/main.c
+++ b/dpkg-split/main.c
@@ -45,7 +45,7 @@ static void DPKG_ATTR_NORET
 printversion(const struct cmdinfo *cip, const char *value)
 {
   printf(_("Debian '%s' package split/join tool; version %s.\n"),
-         SPLITTER, DPKG_VERSION_ARCH);
+         SPLITTER, PACKAGE_RELEASE);
 
   printf(_(
 "This is free software; see the GNU General Public License version 2 or\n"
diff --git a/dselect/main.cc b/dselect/main.cc
index d895252..ad2cb9c 100644
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -163,7 +163,7 @@ static const char licensestring[]= N_(
 static void DPKG_ATTR_NORET
 printversion(const struct cmdinfo *ci, const char *value)
 {
-  printf(gettext(programdesc), DSELECT, DPKG_VERSION_ARCH);
+  printf(gettext(programdesc), DSELECT, PACKAGE_RELEASE);
   printf("%s", gettext(licensestring));
 
   m_output(stdout, _("<standard output>"));
@@ -415,7 +415,7 @@ refreshmenu(void)
 
   clear();
   attrset(A_BOLD);
-  sprintf(buf, gettext(programdesc), DSELECT, DPKG_VERSION_ARCH);
+  sprintf(buf, gettext(programdesc), DSELECT, PACKAGE_RELEASE);
   mvaddnstr(0,0,buf,x-1);
 
   attrset(A_NORMAL);
diff --git a/lib/dpkg/dpkg.h b/lib/dpkg/dpkg.h
index c725b63..1868e95 100644
--- a/lib/dpkg/dpkg.h
+++ b/lib/dpkg/dpkg.h
@@ -56,7 +56,7 @@ DPKG_BEGIN_DECLS
 #define REMOVECONFFEXTS    "~", ".bak", "%", \
                            DPKGTEMPEXT, DPKGNEWEXT, DPKGOLDEXT, DPKGDISTEXT
 
-#define DPKG_VERSION_ARCH  PACKAGE_VERSION " (" ARCHITECTURE ")"
+#define PACKAGE_RELEASE    PACKAGE_VERSION " (" ARCHITECTURE ")"
 
 #define NEWCONFFILEFLAG    "newconffile"
 #define NONEXISTENTFLAG    "nonexistent"
diff --git a/src/divertcmd.c b/src/divertcmd.c
index 319e869..05ea5c5 100644
--- a/src/divertcmd.c
+++ b/src/divertcmd.c
@@ -67,7 +67,7 @@ static void
 printversion(const struct cmdinfo *cip, const char *value)
 {
 	printf(_("Debian %s version %s.\n"), dpkg_get_progname(),
-	       DPKG_VERSION_ARCH);
+	       PACKAGE_RELEASE);
 
 	printf(_(
 "This is free software; see the GNU General Public License version 2 or\n"
diff --git a/src/main.c b/src/main.c
index 631dcc4..99f0e11 100644
--- a/src/main.c
+++ b/src/main.c
@@ -59,7 +59,7 @@ static void DPKG_ATTR_NORET
 printversion(const struct cmdinfo *ci, const char *value)
 {
   printf(_("Debian '%s' package management program version %s.\n"),
-         DPKG, DPKG_VERSION_ARCH);
+         DPKG, PACKAGE_RELEASE);
   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/querycmd.c b/src/querycmd.c
index 71edf60..ad21cd5 100644
--- a/src/querycmd.c
+++ b/src/querycmd.c
@@ -769,7 +769,7 @@ static void DPKG_ATTR_NORET
 printversion(const struct cmdinfo *ci, const char *value)
 {
   printf(_("Debian %s package management program query tool version %s.\n"),
-         DPKGQUERY, DPKG_VERSION_ARCH);
+         DPKGQUERY, PACKAGE_RELEASE);
   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/statcmd.c b/src/statcmd.c
index 011bc49..7cd2d30 100644
--- a/src/statcmd.c
+++ b/src/statcmd.c
@@ -55,7 +55,7 @@ static void DPKG_ATTR_NORET
 printversion(const struct cmdinfo *cip, const char *value)
 {
 	printf(_("Debian %s version %s.\n"), dpkg_get_progname(),
-	       DPKG_VERSION_ARCH);
+	       PACKAGE_RELEASE);
 
 	printf(_(
 "This is free software; see the GNU General Public License version 2 or\n"
diff --git a/src/trigcmd.c b/src/trigcmd.c
index 4309cb9..a05997f 100644
--- a/src/trigcmd.c
+++ b/src/trigcmd.c
@@ -48,7 +48,7 @@ static void DPKG_ATTR_NORET
 printversion(const struct cmdinfo *ci, const char *value)
 {
 	printf(_("Debian %s package trigger utility version %s.\n"),
-	       dpkg_get_progname(), DPKG_VERSION_ARCH);
+	       dpkg_get_progname(), PACKAGE_RELEASE);
 
 	printf(_(
 "This is free software; see the GNU General Public License version 2 or\n"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git