Merge lp:~debfx/ubuntu/precise/language-selector/kubuntu into lp:ubuntu/precise/language-selector

[Felix Geyer]

data/pkg_depends: Add support for translated documentation of amarok and calligra.

[Timo Aaltonen (tjaalton)]

there's release 0.71 already in precise.

[Felix Geyer (debfx)]

Has anything substantially changed that makes merging difficult?

=== modified file 'data/pkg_depends'
--- data/pkg_depends	2012-02-08 16:01:09 +0000
+++ data/pkg_depends	2012-02-14 12:50:46 +0000
@@ -21,8 +21,10 @@
 tr::evolution:evolution-documentation-
 tr::chromium-browser:chromium-browser-l10n
 tr::sylpheed:sylpheed-i18n
+tr::amarok:amarok-help-
 # Format: %LCODE% or %LCODE%%CCODE% or %LCODE%-%VARIANT%
 tr::kdelibs5-data:kde-l10n-
+tr::calligra-libs:calligra-l10n-
 
 # Finnish support for voikko
 wa:fi:firefox:xul-ext-mozvoikko

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-09 13:41:49 +0000
+++ debian/changelog	2012-02-14 12:50:46 +0000
@@ -1,3 +1,10 @@
+language-selector (0.70) UNRELEASED; urgency=low
+
+  * data/pkg_depends: Add support for translated documentation of amarok
+    and calligra.
+
+ -- Felix Geyer <[e-mail]>  Tue, 14 Feb 2012 13:31:57 +0100
+
 language-selector (0.69) precise; urgency=low
 
   * LanguageSelector/LocaleInfo.py, getUserDefaultLanguage(): Fix crash if