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

@@ -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"));

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"

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);

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"

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"

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"));

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"));

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"

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"