[SCM] muon packaging branch, gsoc-floris-2014, updated. c7eb0b43e8c1e7685dc4a0cae07592037f2b4540
Floris-Andrei Stoica-Marcu
smfloris-guest at moszumanska.debian.org
Thu Jul 31 16:09:46 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/muon.git;a=commitdiff;h=c7eb0b4
The following commit has been merged in the gsoc-floris-2014 branch:
commit c7eb0b43e8c1e7685dc4a0cae07592037f2b4540
Author: Floris-Andrei Stoica-Marcu <floris.sm at gmail.com>
Date: Thu Jul 31 19:08:31 2014 +0300
Put the scripts in an install file.
Added accountsservice to deps
Changed libqapt-runtime to libqapt2-runtime in the control file.
---
debian/check-language-support.install | 4 ++
debian/control | 19 ++++++---
debian/rules | 1 -
debian/scripts/langtools/language-options | 65 -------------------------------
debian/scripts/langtools/main-countries | 27 -------------
debian/scripts/language_support_pkgs.py | 2 +-
6 files changed, 18 insertions(+), 100 deletions(-)
diff --git a/debian/check-language-support.install b/debian/check-language-support.install
new file mode 100644
index 0000000..29ae81b
--- /dev/null
+++ b/debian/check-language-support.install
@@ -0,0 +1,4 @@
+debian/scripts/check-language-support /usr/share/kde4/apps/muon/scripts/
+debian/scripts/language_support_pkgs.py /usr/share/kde4/apps/muon/scripts/
+debian/scripts/data/check-language-support.1 /usr/share/kde4/apps/muon/scripts/data/
+debian/scripts/data/pkg_depends /usr/share/kde4/apps/muon/scripts/data/
diff --git a/debian/control b/debian/control
index 83e0cfe..b89ec44 100644
--- a/debian/control
+++ b/debian/control
@@ -4,15 +4,15 @@ Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Sune Vuorela <sune at debian.org>, Floris-Andrei Stoica-Marcu <floris.sm at gmail.com>
Build-Depends: debhelper (>= 9.0.0~), pkg-kde-tools (>= 0.5.0), cmake,
- pkg-config, kdelibs5-dev, libqapt-dev (>= 2.2.0), libdebconf-kde-dev,
- libqjson-dev, libqoauth-dev, libqzeitgeist-dev, python3
+ pkg-config, kdelibs5-dev, libqapt-dev (>= 2.2.0), libdebconf-kde-dev,
+ libqjson-dev, libqoauth-dev, libqzeitgeist-dev, python3, accountsservice (>= 0.6.37-3)
Standards-Version: 3.9.2
X-Python3-Version: >= 3.2
Homepage: https://projects.kde.org/projects/extragear/sysadmin/muon/
Package: muon
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt-runtime,
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt2-runtime,
apt-xapian-index
Recommends: muon-updater
Description: package manager for KDE
@@ -36,7 +36,7 @@ Description: package manager for KDE
Package: muon-discover
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt-runtime,
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt2-runtime,
app-install-data, apt-xapian-index
Recommends: app-install-data-partner, ubuntu-sso-client
Description: Utility for browsing, installing, and removing applications
@@ -48,7 +48,7 @@ Description: Utility for browsing, installing, and removing applications
Package: muon-installer
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt-runtime,
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt2-runtime,
app-install-data
Recommends: app-install-data-partner, zeitgeist-core
Description: Utility for browsing, installing, and removing applications
@@ -63,7 +63,7 @@ Description: Utility for browsing, installing, and removing applications
Package: muon-updater
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt-runtime
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt2-runtime
#Recommends: muon-notifier
Description: update manager for KDE
Muon Updater is a graphical update manager for KDE. It is part of the Muon
@@ -104,3 +104,10 @@ Description: Muon debugging symbols
experienced a Muon crash without this package
installed, please install it, try to reproduce the problem and fill a bug
report with a new backtrace attached.
+
+Package: check-language-support
+Architecture: all
+Section: utils
+Depends: ${misc:Depends}, ${python3:Depends}
+Description: Check-language-support script
+ Return a list of missing locale packages.
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index c58162c..d317eb4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,6 @@ override_dh_makeshlibs:
override_dh_install:
dh_install --fail-missing
- cp debian/scripts debian/muon/usr/share/kde4/apps/muon/ -r
override_dh_auto_test:
./debian/testScript.sh && exit $?
diff --git a/debian/scripts/langtools/language-options b/debian/scripts/langtools/language-options
deleted file mode 100755
index a213944..0000000
--- a/debian/scripts/langtools/language-options
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/perl
-use strict;
-use warnings;
-
-my $langtoolsdir = './';
-
-# get the locales available on the system
-my @avail_locales = map { chomp; s/\.utf8//; $_ } qx( locale -a | grep -F .utf8 );
-
-# add items without country code to facilitate lookups
-my %extended_localelist;
-for my $loc (@avail_locales) {
- ( my $lang = $loc ) =~ s/_[A-Z]+//;
- @extended_localelist{$loc, $lang} = (1, 1);
-}
-
-# get the union of /usr/share/locale-langpack and /usr/share/locale
-my %translation_dirs;
-for my $dir ('/usr/share/locale') {
- if ( opendir my ($dh), $dir ) {
- $translation_dirs{$_} = 1 for readdir $dh;
- }
-}
-
-# get the intersection of available translation_dirs and the extended locale list
-my %intersection;
-for ( keys %extended_localelist ) {
- $intersection{$_} = 1 if $translation_dirs{$_};
-}
-
-# adjustments
-if ( open my $fh, '<', "$langtoolsdir/main-countries" ) {
- # If country code items in a language exist:
- # - Remove the item without country code, since gettext won't find a
- # translation under e.g. 'de_DE' if the first item in LANGUAGE is 'de'
- # (see https://launchpad.net/bugs/700213). 'en' is kept, though, since
- # it's always the last item in LANGUAGE per design.
- # - Make sure that the main dialect of the language is represented among
- # the country code items (see https://launchpad.net/bugs/710148).
- my %main;
- while ( <$fh> ) {
- next if /^\s*(?:#|$)/;
- my ($k, $v) = split;
- $main{$k} = $v;
- }
- my %count;
- for ( keys %intersection ) {
- next if /^en[^a-z]/;
- ( my $not_country = $_ ) =~ s/_[A-Z]+//;
- $count{$not_country} ++;
- }
- for my $langcode ( keys %count ) {
- if ( $count{$langcode} > 1 ) {
- delete $intersection{$langcode};
- $intersection{ $main{$langcode} } = 1 if $main{$langcode};
- }
- }
-} else {
- # not access to the language-to-main-dialect map
- # => stick with a minimum of list manipulation
- delete $intersection{'zh'};
-}
-
-# print the resulting list of language options
-print join("
", sort keys %intersection) || 'en';
diff --git a/debian/scripts/langtools/main-countries b/debian/scripts/langtools/main-countries
deleted file mode 100644
index a17d052..0000000
--- a/debian/scripts/langtools/main-countries
+++ /dev/null
@@ -1,27 +0,0 @@
-# If multiple country codes are present among the available locales for
-# a language, we may want to map the language code to the language's
-# main or origin country. The list below aims to serve that purpose.
-#
-aa aa_ET
-ar ar_EG
-bn bn_BD
-ca ca_ES
-de de_DE
-el el_GR
-en en_US
-es es_ES
-eu eu_ES
-fr fr_FR
-fy fy_NL
-it it_IT
-li li_NL
-nl nl_NL
-om om_ET
-pa pa_PK
-pt pt_PT
-ru ru_RU
-so so_SO
-sr sr_RS
-sv sv_SE
-ti ti_ER
-tr tr_TR
diff --git a/debian/scripts/language_support_pkgs.py b/debian/scripts/language_support_pkgs.py
index e3b8df2..a8f8325 100755
--- a/debian/scripts/language_support_pkgs.py
+++ b/debian/scripts/language_support_pkgs.py
@@ -138,7 +138,7 @@ class LanguageSupport:
languages = set()
lang_string = subprocess.check_output(
- ['/usr/share/kde4/apps/muon/scripts/langtools/language-options'],
+ ['/usr/share/language-tools/language-options'],
universal_newlines=True)
for lang in lang_string.split():
--
muon packaging
More information about the pkg-kde-commits
mailing list