[Gsrc-commit] /srv/bzr/gsrc/trunk r1505: make PATCHNUM a part of the package name and print it with pkg-info

[Brandon Invergo]

------------------------------------------------------------
revno: 1505
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Tue 2012-12-18 23:40:29 +0100
message:
  make PATCHNUM a part of the package name and print it with pkg-info
modified:
  ChangeLog
  gar.lib.mk
  gar.mk

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-12-16 23:32:21 +0000
+++ b/ChangeLog 2012-12-18 22:40:29 +0000
@@ -1,3 +1,11 @@
+2012-12-18  Brandon Invergo  <address@hidden>
+
+       * gar.lib.mk (PACKAGENAME): Add PATCHNUM to PACKAGENAME so that
+       different patched versions can be installed side-by-side
+       (PACKAGENAME): Improve formatting of GARPROFILE in PACKAGENAME
+
+       * gar.mk (pkg-info): Add PATCHNUM to Version display
+
 2012-12-17  Brandon Invergo  <address@hidden>
 
        * gar.mk (pkg-info): Print both the canonical NAME and the GSRC

=== modified file 'gar.lib.mk'
--- a/gar.lib.mk        2012-12-16 13:27:59 +0000
+++ b/gar.lib.mk        2012-12-18 22:40:29 +0000
@@ -611,7 +611,7 @@
 #################### INSTALL RULES ####################
 
 # The format of stow package names.
-PACKAGENAME ?= $(GARNAME)-$(GARVERSION)$(GARPROFILE)
+PACKAGENAME ?= $(GARNAME)-$(GARVERSION)$(if $(PATCHNUM),-$(PATCHNUM))$(if 
$(GARPROFILE),-$(GARPROFILE))
 
 # The package home directory. This'll be stowed into $(prefix).
 packagedir = $(packagesdir)/$(PACKAGENAME)

=== modified file 'gar.mk'
--- a/gar.mk    2012-12-16 23:32:21 +0000
+++ b/gar.mk    2012-12-18 22:40:29 +0000
@@ -127,7 +127,7 @@
 
 pkg-info:
        @echo -e "$(MSG)Name:        $(NAME) ($(GARNAME))$(OFF)"
-       @echo -e "$(MSG)Version:$(OFF)     $(GARVERSION)"
+       @echo -e "$(MSG)Version:$(OFF)     $(GARVERSION)$(if 
$(PATCHNUM),-$(PATCHNUM))"
        @echo -e "$(MSG)URL:$(OFF)         $(HOME_URL)"
        @echo -e "$(MSG)Description:$(OFF) $(DESCRIPTION)"
        @($(MAKE) install-p >/dev/null 2>/dev/null && \