[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.6.8-7-g821e1f9

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 54baf0e04cda545616f7e959113e595a22040d9a
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Mar 13 19:23:14 2010 +0200

    Move commom shell output functions to the "lib" file.
    
    Make pkgkde-debs2symbols and pkgkde-getbuildlogs include it.
---
 Makefile                          |    6 +++++-
 datalib/sh_output                 |   18 ++++++++++++++++++
 symbolshelper/pkgkde-debs2symbols |   26 ++++++++++----------------
 symbolshelper/pkgkde-getbuildlogs |   28 ++++++++++------------------
 4 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/Makefile b/Makefile
index 4d79187..d6b536e 100644
--- a/Makefile
+++ b/Makefile
@@ -6,16 +6,20 @@ VCS_DIR := vcs
 BINDIR := $(DESTDIR)/usr/bin
 MANDIR := $(DESTDIR)/usr/share/man
 DATADIR := $(DESTDIR)/usr/share/pkg-kde-tools
+DATALIBDIR := $(DATADIR)/lib
 
 build:
 	# Nothing do build
 
 install:
-	install -d $(DATADIR) $(BINDIR) $(MANDIR) $(MANDIR)/man1
+	install -d $(DATADIR) $(DATALIBDIR) $(BINDIR) $(MANDIR) $(MANDIR)/man1
 	
 	pod2man pkgkde-override-sc-dev-latest > $(MANDIR)/man1/pkgkde-override-sc-dev-latest.1
 	install -m 0755 pkgkde-override-sc-dev-latest $(BINDIR)
 	
+	# Install datalib
+	cd datalib && find . -type f -exec install -D -m 0644 {} $(DATALIBDIR)/{} \;
+	
 	# symbolshelper
 	cd $(SYMBOLSHELPER_DIR) && find Debian -type f -name "*.pm" -exec \
 	    install -D -m 0644 {} $(DESTDIR)/$(PERLLIBDIR)/{} \;
diff --git a/datalib/sh_output b/datalib/sh_output
new file mode 100644
index 0000000..22126b5
--- /dev/null
+++ b/datalib/sh_output
@@ -0,0 +1,18 @@
+PROGNAME=`basename "$0"`
+
+info() {
+    echo "* $@" >&2
+}
+
+info2() {
+    echo "  -" "$@" >&2
+}
+
+error() {
+    echo "$PROGNAME: error:" "$@" >&2
+    exit 1
+}
+
+warning() {
+    echo "$PROGNAME: warning:" "$@" >&2
+}
diff --git a/symbolshelper/pkgkde-debs2symbols b/symbolshelper/pkgkde-debs2symbols
index dc02a71..586dbd5 100755
--- a/symbolshelper/pkgkde-debs2symbols
+++ b/symbolshelper/pkgkde-debs2symbols
@@ -2,21 +2,14 @@
 
 set -e
 
-info() {
-    echo "* $@" >&2
-}
-
-info2() {
-    echo "  -" "$@" >&2
-}
-
-error() {
-    echo "$PROGNAME: error:" "$@" >&2
-    exit 1
-}
-
-warning() {
-    echo "$PROGNAME: warning:" "$@" >&2
+include_common() {
+    local _dirname
+    _dirname="`dirname "$0"`"
+    if [ -n "$_dirname" ] && [ -f "$_dirname/../datalib/sh_output" ]; then
+        . "$_dirname/../datalib/sh_output"
+    else
+        . /usr/share/pkg-kde-tools/lib/sh_output
+    fi
 }
 
 usage() {
@@ -76,6 +69,8 @@ dump_symbols() {
     fi
 }
 
+include_common
+
 # Process options
 REFFILE=""
 DEBDIR=""
@@ -96,7 +91,6 @@ VERSION="$2"
 URL="$3"
 
 DEB_WILDCARD="${PACKAGE}_${VERSION}_*.deb"
-PROGNAME=`basename "$0"`
 
 if [ -z "$PACKAGE" ] || [ -z "$VERSION" ]; then
     usage
diff --git a/symbolshelper/pkgkde-getbuildlogs b/symbolshelper/pkgkde-getbuildlogs
index 75bb7c2..522ec28 100755
--- a/symbolshelper/pkgkde-getbuildlogs
+++ b/symbolshelper/pkgkde-getbuildlogs
@@ -2,28 +2,20 @@
 
 set -e
 
-info() {
-    echo "* $@" >&2
-}
-
-info2() {
-    echo "  -" "$@" >&2
-}
-
-error() {
-    echo "$PROGNAME: error:" "$@" >&2
-    exit 1
-}
-
-warning() {
-    echo "$PROGNAME: warning:" "$@" >&2
+include_common() {
+    local _dirname
+    _dirname="`dirname "$0"`"
+    if [ -n "$_dirname" ] && [ -f "$_dirname/../datalib/sh_output" ]; then
+        . "$_dirname/../datalib/sh_output"
+    else
+        . /usr/share/pkg-kde-tools/lib/sh_output
+    fi
 }
 
 usage() {
     echo "$PROGNAME: usage:" "$0" "[ -d destdir ]" "[ -v version ]" "[ package ]" "[ distribution ]" >&2
 }
 
-
 download_logs() {
     local destdir pkg distro ver url
     destdir="$1"
@@ -77,6 +69,8 @@ rename_logs() {
     fi
 }
 
+include_common
+
 # Process options
 VERSION=""
 DESTDIR=""
@@ -93,8 +87,6 @@ shift `expr $OPTIND - 1`
 PACKAGE="$1"
 DISTRO="$2"
 
-PROGNAME=`basename "$0"`
-
 if [ -f debian/changelog ]; then
     _parsechangelog=`dpkg-parsechangelog`
     if [ -z "$PACKAGE" ]; then

-- 
Debian Qt/KDE packaging tools