[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.6.3

[Modestas Vainius]

The following commit has been merged in the master branch:
commit bcd0543d04da68470228fefa7e134a32881cf6b1
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Feb 14 14:58:21 2010 +0200

    pkgkde-debs2symbols: allow to specify deb directory (-d option) and symbol file directory (-s option).
    
    Useful in conjuction with -i.
---
 debian/changelog                  |    2 ++
 symbolshelper/pkgkde-debs2symbols |   12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 421e657..6b04a8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 pkg-kde-tools (0.6.3~pre1) UNRELEASED; urgency=low
 
+  * pkgkde-debs2symbols: allow to specify deb directory (-d option) and
+    symbol file directory (-s option).
 
  -- Modestas Vainius <modax at debian.org>  Sun, 14 Feb 2010 14:56:28 +0200
 
diff --git a/symbolshelper/pkgkde-debs2symbols b/symbolshelper/pkgkde-debs2symbols
index 851e108..26760db 100755
--- a/symbolshelper/pkgkde-debs2symbols
+++ b/symbolshelper/pkgkde-debs2symbols
@@ -20,7 +20,7 @@ warning() {
 }
 
 usage() {
-    echo "$PROGNAME: usage:" "$0" "[ -i symbol_file ]" package version "[ download_url ]" >&2
+    echo "$PROGNAME: usage:" "$0" "[ -i symbol_file ]" "[ -d debdir ]" "[ -s symboldir ]" package version "[ download_url ]" >&2
 }
 
 
@@ -76,9 +76,13 @@ dump_symbols() {
 
 # Process options
 REFFILE=""
-while getopts "i:" name; do
+DEBDIR=""
+SYMBOLDIR=""
+while getopts "i:d:s:" name; do
     case "$name" in
 	i)  REFFILE="$OPTARG" ;;
+	d)  DEBDIR="$OPTARG" ;;
+	s)  SYMBOLDIR="$OPTARG" ;;
 	\?)  usage; exit 2 ;;
     esac
 done
@@ -98,8 +102,8 @@ if [ -z "$PACKAGE" ] || [ -z "$VERSION" ]; then
 fi
 
 # Create directories to store downloaded debs and symbol files
-debdir="${PACKAGE}_${VERSION}_debs"
-symboldir="${PACKAGE}_${VERSION}_symbols"
+debdir="${DEBDIR:-${PACKAGE}_${VERSION}_debs}"
+symboldir="${SYMBOLDIR:-${PACKAGE}_${VERSION}_symbols}"
 if [ ! -d "$symboldir" ]; then
     mkdir "$symboldir"
 fi

-- 
Debian Qt/KDE packaging tools