[SCM] calligra localization packaging branch, master, updated. debian/2.4.3-1-9-g0a7b220

Adrien Grellier adrien-guest at alioth.debian.org
Fri Aug 2 20:34:12 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra-l10n.git;a=commitdiff;h=0a7b220

The following commit has been merged in the master branch:
commit 0a7b22068626ae76ccc9d1bbb54a3bc9a738c1ee
Author: Adrien Grellier <perso at adrieng.fr>
Date:   Fri Aug 2 22:08:58 2013 +0200

    upstream use xz compression
---
 debian/changelog      |    3 ++-
 debian/source/options |    2 +-
 debian/upstream2orig  |    8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f252977..c437915 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-calligra-l10n (1:2.7.1-0r1.3) UNRELEASED; urgency=low
+calligra-l10n (1:2.7.1-0r1) UNRELEASED; urgency=low
 
   [ Adrien Grellier ]
   * New upstream release:
@@ -11,6 +11,7 @@ calligra-l10n (1:2.7.1-0r1.3) UNRELEASED; urgency=low
   * lintian: debian-rules-missing-recommended-target
     add build-arch and build-indep targets 
   * update to Debian policy 3.9.4 (nothing to do) 
+  * upstream use now xz compression
 
  -- Adrien Grellier <perso at adrieng.fr>  Fri, 02 Aug 2013 18:19:04 +0200
 
diff --git a/debian/source/options b/debian/source/options
index 8347d5a..dd40203 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
-compression=bzip2
+compression=xz
 create-empty-orig
diff --git a/debian/upstream2orig b/debian/upstream2orig
index a359bf8..9dfe8fc 100755
--- a/debian/upstream2orig
+++ b/debian/upstream2orig
@@ -16,12 +16,12 @@ get_orig_name() {
     tarball="$1"
     upstream=`basename "$tarball"`
     lang=${upstream#${PREFIX}-}
-    lang="${lang%.tar.bz2}"
+    lang="${lang%.tar.xz}"
 
     version=${lang#*-}
     lang="${lang%%-*}"
     lang="`echo $lang | tr -d _@ | tr A-Z a-z`"
-    echo "${PREFIX}_${version}.orig-${lang}.tar.bz2 $lang"
+    echo "${PREFIX}_${version}.orig-${lang}.tar.xz $lang"
 }
 
 extract_tarball() {
@@ -30,7 +30,7 @@ extract_tarball() {
 
     rm -rf "$lang"
     mkdir "$lang"
-    tar xjf "$orig" --strip=1 -C "$lang"
+    tar xJf "$orig" --strip=1 -C "$lang"
 }
 
 orig=""
@@ -39,7 +39,7 @@ while [ -n "$1" ]; do
         # Tarball already has orig in its name. Just extract
         echo "Extracting tarball $1 ..." >&2
         lang="${1##*.orig-}"
-        lang="${lang%%.tar.bz2}"
+        lang="${lang%%.tar.xz}"
         extract_tarball "$lang" "$1"
     else
         echo "Renaming and extracting tarball $1 ..." >&2

-- 
calligra localization packaging



More information about the pkg-kde-commits mailing list