From fbd49dfb3336c3ff36ea5a01dcf2b547f00cdaf3e0e1822d96393a0ba3cd5340 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 19 Oct 2015 09:48:46 +0000 Subject: [PATCH] Accepting request 339383 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/339383 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=297 --- gnome-control-center-3.18.0.tar.xz | 3 -- gnome-control-center-3.18.1.tar.xz | 3 ++ ...ontrol-center-fix-desktop-file-trans.patch | 42 +++++++++++++++++++ gnome-control-center.changes | 13 ++++++ gnome-control-center.spec | 5 ++- 5 files changed, 62 insertions(+), 4 deletions(-) delete mode 100644 gnome-control-center-3.18.0.tar.xz create mode 100644 gnome-control-center-3.18.1.tar.xz create mode 100644 gnome-control-center-fix-desktop-file-trans.patch diff --git a/gnome-control-center-3.18.0.tar.xz b/gnome-control-center-3.18.0.tar.xz deleted file mode 100644 index df4ce71..0000000 --- a/gnome-control-center-3.18.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42648eda11fc1df0f717d7d3b385cb7c519fdd084ed4e3fad2e55fd11712fb52 -size 7088380 diff --git a/gnome-control-center-3.18.1.tar.xz b/gnome-control-center-3.18.1.tar.xz new file mode 100644 index 0000000..cb28665 --- /dev/null +++ b/gnome-control-center-3.18.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a59ec1fe03d873a75a669d933f6e37d8243252ff41850da2a9009e99b578b41 +size 7106816 diff --git a/gnome-control-center-fix-desktop-file-trans.patch b/gnome-control-center-fix-desktop-file-trans.patch new file mode 100644 index 0000000..14de336 --- /dev/null +++ b/gnome-control-center-fix-desktop-file-trans.patch @@ -0,0 +1,42 @@ +From 781e4b14a23fd070000fe322ec3b1791d62bc5c4 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Mon, 12 Oct 2015 15:13:26 +0200 +Subject: Fix syntax errors in gnome-sharing-panel.desktop translations + +Remove erroneous linefeeds from gnome-sharing-panel.desktop translations +that break desktop file syntax. +--- + po/sr.po | 2 +- + po/sr@latin.po | 3 --- + 2 files changed, 1 insertion(+), 4 deletions(-) + +diff --git a/po/sr.po b/po/sr.po +index 6efaf6d..4120c56 100644 +--- a/po/sr.po ++++ b/po/sr.po +@@ -5128,7 +5128,7 @@ msgid "" + "server;renderer;" + msgstr "" + "дели;дељење;ссх;безбедна шкољка;домаћин;назив;удаљено;радна површ;блутут;обекс;" +-"медија;звук;аудио;снимак;видео;слике;фотографије;филмови;сервер;исцртавач;\n" ++"медија;звук;аудио;снимак;видео;слике;фотографије;филмови;сервер;исцртавач;" + "deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;obeks;" + "medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;iscrtavač;" + +diff --git a/po/sr@latin.po b/po/sr@latin.po +index 0947ba4..52e423c 100644 +--- a/po/sr@latin.po ++++ b/po/sr@latin.po +@@ -5198,9 +5198,6 @@ msgid "" + msgstr "" + "deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;" + "obeks;medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;" +-"iscrtavač;\n" +-"deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;" +-"obeks;medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;" + "iscrtavač;" + + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 +-- +cgit v0.11.2 + diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 666104b..3db749c 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Oct 12 13:13:25 UTC 2015 - zaitor@opensuse.org + +- Update to version 3.18.1: + + Fix a crash when disabling Sharing. + + Make section headings accessible in Universal Access, and + Region & Language. + + Fix a warning about an unparented dialogue in the Printers + panel. + + Updated translations. +- Add gnome-control-center-fix-desktop-file-trans.patch: Fix syntax + errors in gnome-sharing-panel.desktop translations. + ------------------------------------------------------------------- Mon Sep 21 15:33:31 UTC 2015 - dimstar@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 3538d00..a8b74fe 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -29,7 +29,7 @@ %define with_cacert_patch 1 Name: gnome-control-center -Version: 3.18.0 +Version: 3.18.1 Release: 0 # FIXME: in 12.3 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833) Summary: The GNOME Control Center @@ -52,6 +52,8 @@ Patch16: gnome-control-center-probe-radius-server-cert.patch Patch17: gnome-control-center-follow-polkit-permissions-for-tz.patch # PATCH-FIX-UPSTREAM gnome-control-center-fix-nb-tans.patch bgo#753005 zaitor@opensuse.org -- Fix translation of Keyboard brightness in Norwegian bokmål. Patch18: gnome-control-center-fix-nb-tans.patch +# PATCH-FIX-UPSTREAM gnome-control-center-fix-desktop-file-trans.patch zaitor@opensuse.org -- Fix syntax errors in gnome-sharing-panel.desktop translations +Patch19: gnome-control-center-fix-desktop-file-trans.patch BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -197,6 +199,7 @@ translation-update-upstream #NEEDS-REBASE #patch14 -p1 %patch18 -p1 +%patch19 -p1 %build ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh