[SCM] calligra localization packaging branch, master, updated. debian/2.8.5-1-4-gbcc3a77

Pino Toscano pino at moszumanska.debian.org
Sat Sep 17 13:25:14 UTC 2016


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

The following commit has been merged in the master branch:
commit e27d5d30043cf817a6a5399b4eba8953d6469564
Author: Pino Toscano <pino at debian.org>
Date:   Sat Sep 17 15:18:27 2016 +0200

    make use of version=4 format for watch file
    
    this way it can be used to monitor and download upstream tarballs
    directly:
    - add a new script, createwatch, to generate a watch file from a list
      of languages
    - update debian/README.source
    - add the resulting watch file generated with createwatch
---
 debian/README.source |  78 +++++++++++++-------------------
 debian/changelog     |   8 ++++
 debian/createwatch   |  16 +++++++
 debian/watch         | 124 ++++++++++++++++++++++++++-------------------------
 4 files changed, 118 insertions(+), 108 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 5761799..b6bf8b1 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,58 +1,42 @@
+Downloading the upstream tarballs
+---------------------------------
 
-==================================
-Debian packaging of calligra-l10n
-==================================
+Since version 4 of the watch format, uscan is able to download all the
+tarballs at once, using a watch file. The caveat is that all the upstream
+tarballs must be listed. The debian/createwatch script can be used to ease
+this process:
 
-This file aims to document the packaging of calligra-l10n for Debian. Please feel free to improve it if necessary.
+  $ debian/createwatch ar ast bg [...] ca at valencia [...] en_GB [etc...]
 
-It is mainly a reminder for myself, and an help for the newcomers :)
+Then `uscan --report` can be used to check the status, `uscan --download`
+to download the tarballs, and so on.
 
-Howto get the upstream sources ?
-=================================
+Generating orig tarballs from the upstream tarballs
+---------------------------------------------------
 
-Upstream provide an archive per language for each release, accessible on the FTP_ of KDE:
+You may use the debian/upstream2orig script to get debian orig tarballs from
+the ones supplied by upstream. The script will take care of:
 
+* determining language and version from the tarball filenames;
+* stripping incompatible characters from the language IDs;
+* hard linking the upstream tarballs to appropriate debian original tarballs;
+* extracting the tarballs to appropriate subdirectories in the debian source
+  tree;
 
-.. _FTP: ftp://ftp.kde.org/pub/kde/stable/calligra-latest/calligra-l10n/
+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:
 
-Debian Packaging
-=================
+  $ debian/upstream2orig ../tarballs/calligra-l10n/calligra-l10n-{ar,bg,ca}-2.9.11.tar.bz2
 
-The upstream code is not included in git, but only the debian/ directory.
+produces:
 
-The master branch should be for sid, and each debian release (wheezy, etc.) has its own branch.
+  $ ls -1 ../calligra-l10n*
+  ../calligra-l10n_2.9.11.orig-ar.tar.bz2
+  ../calligra-l10n_2.9.11.orig-bg.tar.bz2
+  ../calligra-l10n_2.9.11.orig-ca.tar.bz2
+  ../calligra-l10n_2.9.11.orig.tar.bz2
+  $ ls -1 -d *
+  ar
+  bg
+  ca
 
-To prepare a release into Debian, don't forget:
-
-- to update the copyright file
-- write every debian changes on the changelog.
-- correct all the lintian warnings
-- be sure about if files has been added or removed
-- dch -r to prepare the changelog for an upload
-- tag the release in git when we get the accepted mail
-
-How to create the debian package?
-==================================
-
-uscan --destdir ../upstream --no-symlink
-
-Download the localization archives in a folder “upstream”, and run upstream2orig ::
-
-  ./debian/upstream2orig ../upstream/*
-
-I am using sbuild_ to ensure everything will be OK. ::
-
-    sbuild-update -udg unstable
-    sbuild -A -d unstable
-
-
-.. _sbuild: http://wiki.debian.org/sbuild
-
-Usefull links
-==============
-
-http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-std/calligra-l10n.git;a=summary
-http://packages.qa.debian.org/c/calligra-l10n.html
-
-
-.. vim:set filetype=rst:
diff --git a/debian/changelog b/debian/changelog
index 286a134..4541edf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,14 @@ calligra-l10n (1:2.9.11-0r1) UNRELEASED; urgency=medium
   [ Pino Toscano ]
   * New upstream release.
 
+  [ Pino Toscano ]
+  * Make use of version=4 format for the watch file, so it can be used to
+    monitor and download upstream tarballs directly:
+    - add a new script, createwatch, to generate a watch file from a list of
+      languages
+    - update debian/README.source
+    - add the resulting watch file generated with createwatch
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 17 Sep 2016 15:16:25 +0200
 
 calligra-l10n (1:2.8.5-1) unstable; urgency=medium
diff --git a/debian/createwatch b/debian/createwatch
new file mode 100755
index 0000000..dbbbc27
--- /dev/null
+++ b/debian/createwatch
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+cat > debian/watch <<EOF
+version=4
+
+# !!! WARNING !!!
+# !!! Autogenerated using debian/createwatch.
+# !!! Please see debian/README.source for more details.
+EOF
+
+for lang; do
+  component=$(echo "$lang" | sed -e 's,[_@],,g' | tr '[:upper:]' '[:lower:]')
+  echo >> debian/watch
+  echo "opts=\"component=$component\" \" >> debian/watch
+  echo "  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-$lang-([\d.]+)\.tar\.xz" >> debian/watch
+done
diff --git a/debian/watch b/debian/watch
index f9087c0..a1d29f3 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,90 +1,92 @@
-version=3
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-bs-([\d\.]*).tar.xz
+version=4
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-ca-([\d\.]*).tar.xz
+# !!! WARNING !!!
+# !!! Autogenerated using debian/createwatch.
+# !!! Please see debian/README.source for more details.
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-ca at valencia-([\d\.]*).tar.xz
+opts="component=bs" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-bs-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-cs-([\d\.]*).tar.xz
+opts="component=ca" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-ca-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-da-([\d\.]*).tar.xz
+opts="component=cavalencia" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-ca at valencia-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-de-([\d\.]*).tar.xz
+opts="component=cs" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-cs-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-el-([\d\.]*).tar.xz
+opts="component=da" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-da-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-en_GB-([\d\.]*).tar.xz
+opts="component=de" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-de-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-es-([\d\.]*).tar.xz
+opts="component=el" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-el-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-et-([\d\.]*).tar.xz
+opts="component=engb" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-en_GB-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-eu-([\d\.]*).tar.xz
+opts="component=es" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-es-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-fi-([\d\.]*).tar.xz
+opts="component=et" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-et-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-fr-([\d\.]*).tar.xz
+opts="component=fi" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-fi-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-gl-([\d\.]*).tar.xz
+opts="component=fr" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-fr-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-hu-([\d\.]*).tar.xz
+opts="component=gl" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-gl-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-it-([\d\.]*).tar.xz
+opts="component=hu" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-hu-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-ja-([\d\.]*).tar.xz
+opts="component=it" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-it-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-kk-([\d\.]*).tar.xz
+opts="component=ja" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-ja-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-nb-([\d\.]*).tar.xz
+opts="component=kk" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-kk-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-nds-([\d\.]*).tar.xz
+opts="component=nb" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-nb-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-nl-([\d\.]*).tar.xz
+opts="component=nl" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-nl-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-pl-([\d\.]*).tar.xz
+opts="component=pl" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-pl-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-pt-([\d\.]*).tar.xz
+opts="component=pt" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-pt-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-pt_BR-([\d\.]*).tar.xz
+opts="component=ptbr" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-pt_BR-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-ru-([\d\.]*).tar.xz
+opts="component=ru" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-ru-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-sk-([\d\.]*).tar.xz
+opts="component=sk" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-sk-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-sv-([\d\.]*).tar.xz
+opts="component=sv" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-sv-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-uk-([\d\.]*).tar.xz
+opts="component=tr" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-tr-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-zh_CN-([\d\.]*).tar.xz
+opts="component=uk" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-uk-([\d.]+)\.tar\.xz
 
-opts="filenamemangle=s/calligra-l10n-([a-z]+)[_@]?(\w*)-([\d.]+)\.tar\.xz/\Lcalligra-l10n_$3.orig-$1$2.tar.xz\E/" \
-    ftp://ftp.kde.org/pub/kde/stable/calligra-([\d\.]*)/calligra-l10n/calligra-l10n-zh_TW-([\d\.]*).tar.xz
+opts="component=zhcn" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-zh_CN-([\d.]+)\.tar\.xz
+
+opts="component=zhtw" \
+  http://download.kde.org/stable/calligra-([\d.]+)/calligra-l10n/calligra-l10n-zh_TW-([\d.]+)\.tar\.xz

-- 
calligra localization packaging



More information about the pkg-kde-commits mailing list