[Gsrc-commit] /srv/bzr/gsrc/trunk r1823: conditionally use BLURB instead of DESCRIPTION in pkg-info

[Brandon Invergo]

------------------------------------------------------------
revno: 1823
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Tue 2013-01-29 10:54:55 +0100
message:
  conditionally use BLURB instead of DESCRIPTION in pkg-info
modified:
  ChangeLog
  gar.mk

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-01-23 22:54:28 +0000
+++ b/ChangeLog 2013-01-29 09:54:55 +0000
@@ -1,3 +1,18 @@
+2013-01-29  Brandon Invergo  <address@hidden>
+
+       * gar.mk (pkg-info): Print a package's long BLURB if it exists,
+       otherwise print its short DESCRIPTION.
+
+2013-01-28  Brandon Invergo  <address@hidden>
+
+       * gar.mk (clean): Print short message for "clean" target
+
+       * gar.lib/wrong_arch.mk (pre-configure): Print wrong-architecture
+       message before  "configure", not before everything
+
+       * gar.lib/broken.mk (pre-configure): Print broken message before
+       "configure", not before everything
+
 2013-01-23  Brandon Invergo  <address@hidden>
 
        * GNUmakefile.am (EXTRA_DIST): Remove old "deps" directory, add

=== modified file 'gar.mk'
--- a/gar.mk    2013-01-28 22:05:47 +0000
+++ b/gar.mk    2013-01-29 09:54:55 +0000
@@ -23,6 +23,10 @@
 # Comment this out to make much verbosity
 #.SILENT:
 
+define newline
+
+
+endef
 
 GARDIR ?= ../..
 GARDIR_ABSOLUTE := $(shell cd $(GARDIR) && pwd)
@@ -129,7 +133,8 @@
        @echo -e "$(MSG)Name:$(OFF)        $(NAME)"
        @echo -e "$(MSG)Version:$(OFF)     $(GARVERSION)$(if 
$(PATCHNUM),-$(PATCHNUM))"
        @echo -e "$(MSG)URL:$(OFF)         $(HOME_URL)"
-       @echo -e "$(MSG)Description:$(OFF) $(DESCRIPTION)"
+       @echo -e "$(MSG)Description:$(OFF)"
+       @echo -e '$(if $(BLURB),$(subst $(newline),\n,$(BLURB)), 
$(DESCRIPTION))'
        @($(MAKE) install-p >/dev/null 2>/dev/null && \
                echo -e "$(MSG)Status$(OFF):      installed (stowed)") || \
                ($(MAKE) reinstall-p >/dev/null 2>/dev/null && \