[SCM] KDE Localization module packaging branch, master, updated. debian/4.4.5-1-18-ge5988be

[Modestas Vainius]

The following commit has been merged in the master branch:
commit e5988be30267fdbd5412261afe5668030f9989c2
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Feb 1 23:57:55 2011 +0200

    Delegate creation of the empty orig.tar.bz2 tarball to dpkg-source.
    
    It appears that dpkg-source supports this (--create-empty-orig option, add to
    debian/source/options). Also remove relevant code from debian/upstream2orig and
    update README.source.
---
 debian/README.source  |    1 -
 debian/changelog      |    3 +++
 debian/source/options |    1 +
 debian/upstream2orig  |   15 ---------------
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 84bdea6..61c1235 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -9,7 +9,6 @@ the ones supplied by upstream. The script will take care of:
 * hard linking the upstream tarballs to appropriate debian original tarballs;
 * extracting the tarballs to appropriate subdirectories in the debian source
   tree;
-* creating an empty  main original tarball (3.0 (quilt) format needs it).
 
 In order to use debian/upstream2orig script, just pass paths to the upstream
 tarballs as arguments and the script will do the rest. For example:
diff --git a/debian/changelog b/debian/changelog
index 1077efd..879ff5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ kde-l10n (4:4.6.0-0r1) UNRELEASED; urgency=low
   [ Modestas Vainius ]
   * Drop all kde-i18n-* transitional packages and related code in debian/rules.
     These were squeeze-only.
+  * Delegate creation of the empty orig.tar.bz2 tarball to dpkg-source (since
+    it supports this). Remove relevant code from debian/upstream2orig and
+    update README.source.
 
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Sun, 12 Sep 2010 01:22:16 +0000
 
diff --git a/debian/source/options b/debian/source/options
index 81a91da..8347d5a 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1 +1,2 @@
 compression=bzip2
+create-empty-orig
diff --git a/debian/upstream2orig b/debian/upstream2orig
index 85e96c4..e4f1d8f 100755
--- a/debian/upstream2orig
+++ b/debian/upstream2orig
@@ -19,16 +19,6 @@ get_orig_name() {
     echo "kde-l10n_${version}.orig-${lang}.tar.bz2 $lang"
 }
 
-create_empty_tarball() {
-    local dummy tarball
-    tarball="${1%.bz2}"
-    dummy=`mktemp dummy.XXXXXX`
-    tar cf "${tarball}" $dummy
-    tar --delete --file "${tarball}" $dummy
-    bzip2 "$tarball"
-    rm -f $dummy
-}
-
 orig=""
 while [ -n "$1" ]; do
     echo "Renaming and extracting tarball $1 ..." >&1
@@ -42,8 +32,3 @@ while [ -n "$1" ]; do
     tar xjf "$orig" --strip=1 -C "$lang"
     shift
 done
-
-orig="${orig%.orig-*.tar.bz2}.orig.tar.bz2"
-echo "Creating empty $orig ..." >&1
-rm -f "$orig"
-create_empty_tarball "$orig"

-- 
KDE Localization module packaging