[SCM] KDE Localization module packaging branch, master, updated. debian/4.6.4-1-10-gf4cb49e

[Modestas Vainius]

The following commit has been merged in the master branch:
commit f4cb49e73ae6246a4ff713783c6a5dd853d47e08
Author: Modestas Vainius <modax at debian.org>
Date:   Mon Jul 18 21:11:08 2011 +0300

    debian/upstream2orig: support pure extraction if given orig tarballs.
---
 debian/changelog     |    1 +
 debian/upstream2orig |   33 ++++++++++++++++++++++++---------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 085e3ee..84ad09b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ kde-l10n (4:4.6.5-0r2) UNRELEASED; urgency=low
     kdepim translations.
   * Use a bit safer method for removal of build stamps.
   * Report progress ([current/total]) when starting to build each language.
+  * debian/upstream2orig: support pure extraction if given orig tarballs.
 
  -- Modestas Vainius <modax at debian.org>  Mon, 04 Jul 2011 11:54:22 +0300
 
diff --git a/debian/upstream2orig b/debian/upstream2orig
index e4f1d8f..e008ebe 100755
--- a/debian/upstream2orig
+++ b/debian/upstream2orig
@@ -16,19 +16,34 @@ get_orig_name() {
     version=${lang#*-}
     lang="${lang%%-*}"
     lang="`echo $lang | tr -d _@ | tr A-Z a-z`"
-    echo "kde-l10n_${version}.orig-${lang}.tar.bz2 $lang"
+    echo "${PREFIX}_${version}.orig-${lang}.tar.bz2 $lang"
 }
 
-orig=""
-while [ -n "$1" ]; do
-    echo "Renaming and extracting tarball $1 ..." >&1
-    orig="../`get_orig_name "$1"`"
-    lang=${orig#* }
-    orig=${orig% *}
-    rm -f "$orig"
-    ln -f "$1" "$orig"
+extract_tarball() {
+    local lang="$1"
+    local orig="$2"
+
     rm -rf "$lang"
     mkdir "$lang"
     tar xjf "$orig" --strip=1 -C "$lang"
+}
+
+orig=""
+while [ -n "$1" ]; do
+    if [ "${1#*.orig*}" != "$1" ]; then
+        # Tarball already has orig in its name. Just extract
+        echo "Extracting tarball $1 ..." >&2
+        lang="${1##*.orig-}"
+        lang="${lang%%.tar.bz2}"
+        extract_tarball "$lang" "$1"
+    else
+        echo "Renaming and extracting tarball $1 ..." >&2
+        orig="../`get_orig_name "$1"`"
+        lang=${orig#* }
+        orig=${orig% *}
+        rm -f "$orig"
+        ln -f "$1" "$orig"
+        extract_tarball "$lang" "$orig"
+    fi
     shift
 done

-- 
KDE Localization module packaging