Hello community,
here is the log from the commit of package gnome-power-manager for openSUSE:Factory checked in at 2015-05-02 17:42:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-power-manager (Old)
and /work/SRC/openSUSE:Factory/.gnome-power-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-power-manager"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-power-manager/gnome-power-manager.changes 2015-03-30 19:16:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gnome-power-manager.new/gnome-power-manager.changes 2015-05-02 17:42:57.000000000 +0200
@@ -1,0 +2,13 @@
+Tue Apr 28 00:11:43 UTC 2015 - zaitor@opensuse.org
+
+- Update to version 3.16.1:
+ + Add a symbolic variant of the application icon.
+- Do not call %icon_theme_cache_post(un) macros in %post/%postun
+ for the HighContrast icons, as they are removed.
+- Stop passing --disable-scrollkeeper to configure, no longer
+ needed nor recognized.
+- Stop passing V=1 to make, clutters up the buildlog, and debugging
+ is done locally anyway.
+- Remove conditional for obsolete versions of openSUSE.
+
+-------------------------------------------------------------------
Old:
----
gnome-power-manager-3.16.0.tar.xz
New:
----
gnome-power-manager-3.16.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-power-manager.spec ++++++
--- /var/tmp/diff_new_pack.zXL2ho/_old 2015-05-02 17:42:58.000000000 +0200
+++ /var/tmp/diff_new_pack.zXL2ho/_new 2015-05-02 17:42:58.000000000 +0200
@@ -17,7 +17,7 @@
Name: gnome-power-manager
-Version: 3.16.0
+Version: 3.16.1
Release: 0
Summary: Power Management for GNOME
License: GPL-2.0+
@@ -54,15 +54,11 @@
translation-update-upstream
%build
-%configure \
- --disable-scrollkeeper
-%{__make} %{?jobs:-j %jobs} V=1
+%configure
+%{__make} %{?jobs:-j %jobs}
%install
%makeinstall
-%if 0%{?suse_version} <= 1120
-%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
-%endif
%suse_update_desktop_file gnome-power-statistics
%find_lang %{name} %{?no_lang_C}
%fdupes %{buildroot}
@@ -74,13 +70,11 @@
%glib2_gsettings_schema_post
%desktop_database_post
%icon_theme_cache_post
-%icon_theme_cache_post HighContrast
%postun
%glib2_gsettings_schema_postun
%desktop_database_postun
%icon_theme_cache_postun
-%icon_theme_cache_postun HighContrast
%files
%defattr (-, root, root)
@@ -89,7 +83,6 @@
%{_datadir}/applications/gnome-power-statistics.desktop
%{_datadir}/glib-2.0/schemas/org.gnome.power-manager.gschema.xml
%{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/icons/HighContrast/
%doc %{_mandir}/man1/gnome-power-statistics.*
%dir %{_datadir}/appdata/
%{_datadir}/appdata/gnome-power-statistics.appdata.xml
++++++ gnome-power-manager-3.16.0.tar.xz -> gnome-power-manager-3.16.1.tar.xz ++++++
++++ 3699 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-power-manager-3.16.0/ChangeLog new/gnome-power-manager-3.16.1/ChangeLog
--- old/gnome-power-manager-3.16.0/ChangeLog 2015-03-23 10:50:26.000000000 +0100
+++ new/gnome-power-manager-3.16.1/ChangeLog 2015-04-27 19:30:33.000000000 +0200
@@ -1,6 +1,73 @@
+commit 5bf3f7d34964bdbe2bdee41f952d064b19f78007
+Author: Richard Hughes
+Date: 2015-04-27
+
+ GNOME Power Manager 3.16.1
+
+M data/appdata/gnome-power-statistics.appdata.xml.in
+
+commit 8a28b6e840c3cd4d37f279017ad4cdda747c2522
+Author: Richard Hughes
+Date: 2015-04-27
+
+ trivial: Fix up the removal of HighContrast
+
+M configure.ac
+
+commit 5b5ec93e7a35ae17ec5b0ed1f1875f023effdbf3
+Author: Jakub Steiner
+Date: 2015-03-25
+
+ icon: provide a symbolic variant of the app icon
+
+ Since 3.16 the high contrast accessible theme is
+ covered by the recolorable symbolic variant of the app icon.
+
+ The symbolic size has been introduced to hicolor to cope with
+ the nominal size of 16x16 rather than the backward compatible
+ 128x128.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=746748
+
+D data/icons/HighContrast/16x16/gnome-power-statistics.png
+D data/icons/HighContrast/22x22/gnome-power-statistics.png
+D data/icons/HighContrast/24x24/gnome-power-statistics.png
+D data/icons/HighContrast/256x256/gnome-power-statistics.png
+D data/icons/HighContrast/32x32/gnome-power-statistics.png
+D data/icons/HighContrast/48x48/gnome-power-statistics.png
+D data/icons/HighContrast/Makefile.am
+M data/icons/Makefile.am
+M data/icons/hicolor/Makefile.am
+A data/icons/hicolor/symbolic/gnome-power-statistics-symbolic.svg
+
+commit 58f98c9900c506f223dd7fece56d8b718b5394e3
+Author: GNOME Translation Robot
+Date: 2015-04-02
+
+ Updated Russian translation
+
+M po/ru.po
+
+commit 461c93134c6a58293f5ca2182e48aad6dcb7b159
+Author: Richard Hughes
+Date: 2015-03-23
+
+ trivial: Post release version bump
+
+M RELEASE
+M configure.ac
+
+commit 7697d295564d95aeae2a9bbc51e477693a441fac
+Author: Richard Hughes
+Date: 2015-03-23
+
+ GNOME Power Manager 3.16.0
+
+M data/appdata/gnome-power-statistics.appdata.xml.in
+
commit 2f0957e0029469bfca433245579aa6d7811eb811
Author: Cheng-Chia Tseng <>
-Date: 2015-03-19
+Date: 2015-03-19
Updated Chinese (Taiwan) translation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-power-manager-3.16.0/NEWS new/gnome-power-manager-3.16.1/NEWS
--- old/gnome-power-manager-3.16.0/NEWS 2015-03-23 10:50:26.000000000 +0100
+++ new/gnome-power-manager-3.16.1/NEWS 2015-04-27 19:30:33.000000000 +0200
@@ -1,3 +1,27 @@
+Version 3.16.1
+~~~~~~~~~~~~~~
+Released: 2015-04-27
+
+This stable release adds a symbolic variant of the application icon.
+
+Version 3.16.0
+~~~~~~~~~~~~~~
+Released: 2015-03-23
+
+This stable release marks the release of GNOME 3.16!
+
+Version 3.15.92
+~~~~~~~~~~~~~~~
+Released: 2015-03-16
+
+This release only updates translations.
+
+Version 3.15.91
+~~~~~~~~~~~~~~~
+Released: 2015-03-02
+
+This release only updates translations.
+
Version 3.15.90
~~~~~~~~~~~~~~~
Released: 2014-01-19
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-power-manager-3.16.0/compile new/gnome-power-manager-3.16.1/compile
--- old/gnome-power-manager-3.16.0/compile 2015-02-05 11:16:22.000000000 +0100
+++ new/gnome-power-manager-3.16.1/compile 2015-04-27 19:19:04.000000000 +0200
@@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey .
#
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-power-manager-3.16.0/configure.ac new/gnome-power-manager-3.16.1/configure.ac
--- old/gnome-power-manager-3.16.0/configure.ac 2015-03-16 10:51:22.000000000 +0100
+++ new/gnome-power-manager-3.16.1/configure.ac 2015-04-27 19:21:53.000000000 +0200
@@ -1,6 +1,6 @@
AC_PREREQ(2.63)
-AC_INIT([gnome-power-manager],[3.16.0])
+AC_INIT([gnome-power-manager],[3.16.1])
AC_CONFIG_SRCDIR(src)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar foreign])
@@ -119,7 +119,6 @@
data/appdata/Makefile
data/icons/Makefile
data/icons/hicolor/Makefile
-data/icons/HighContrast/Makefile
])
AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-power-manager-3.16.0/data/appdata/gnome-power-statistics.appdata.xml.in new/gnome-power-manager-3.16.1/data/appdata/gnome-power-statistics.appdata.xml.in
--- old/gnome-power-manager-3.16.0/data/appdata/gnome-power-statistics.appdata.xml.in 2015-03-23 10:48:59.000000000 +0100
+++ new/gnome-power-manager-3.16.1/data/appdata/gnome-power-statistics.appdata.xml.in 2015-04-27 19:26:55.000000000 +0200
@@ -25,6 +25,11 @@
Use `date -d "2010-10-02" "+%s"` to get the timestamp.
-->
<releases>
+ <release version="3.16.1" timestamp="1430155609">
+ <description>
+ <p>This stable release adds a symbolic variant of the application icon.</p>
+ </description>
+ </release>
<release version="3.16.0" timestamp="1427103917">
<description>
<p>This stable release marks the release of GNOME 3.16!</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-power-manager-3.16.0/data/gnome-power-statistics.desktop.in new/gnome-power-manager-3.16.1/data/gnome-power-statistics.desktop.in
--- old/gnome-power-manager-3.16.0/data/gnome-power-statistics.desktop.in 2015-03-23 10:49:18.000000000 +0100
+++ new/gnome-power-manager-3.16.1/data/gnome-power-statistics.desktop.in 2015-04-27 19:22:05.000000000 +0200
@@ -12,5 +12,5 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-power-manager
X-GNOME-Bugzilla-Component=gnome-power-statistics
-X-GNOME-Bugzilla-Version=3.16.0
+X-GNOME-Bugzilla-Version=3.16.1
X-Desktop-File-Install-Version=0.10
Files old/gnome-power-manager-3.16.0/data/icons/HighContrast/16x16/gnome-power-statistics.png and new/gnome-power-manager-3.16.1/data/icons/HighContrast/16x16/gnome-power-statistics.png differ
Files old/gnome-power-manager-3.16.0/data/icons/HighContrast/22x22/gnome-power-statistics.png and new/gnome-power-manager-3.16.1/data/icons/HighContrast/22x22/gnome-power-statistics.png differ
Files old/gnome-power-manager-3.16.0/data/icons/HighContrast/24x24/gnome-power-statistics.png and new/gnome-power-manager-3.16.1/data/icons/HighContrast/24x24/gnome-power-statistics.png differ
Files old/gnome-power-manager-3.16.0/data/icons/HighContrast/256x256/gnome-power-statistics.png and new/gnome-power-manager-3.16.1/data/icons/HighContrast/256x256/gnome-power-statistics.png differ
Files old/gnome-power-manager-3.16.0/data/icons/HighContrast/48x48/gnome-power-statistics.png and new/gnome-power-manager-3.16.1/data/icons/HighContrast/48x48/gnome-power-statistics.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-power-manager-3.16.0/data/icons/HighContrast/Makefile.am new/gnome-power-manager-3.16.1/data/icons/HighContrast/Makefile.am
--- old/gnome-power-manager-3.16.0/data/icons/HighContrast/Makefile.am 2014-05-24 14:08:25.000000000 +0200
+++ new/gnome-power-manager-3.16.1/data/icons/HighContrast/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-icon16dir=$(datadir)/icons/HighContrast/16x16/apps
-icon22dir=$(datadir)/icons/HighContrast/22x22/apps
-icon24dir=$(datadir)/icons/HighContrast/24x24/apps
-icon48dir=$(datadir)/icons/HighContrast/48x48/apps
-icon256dir=$(datadir)/icons/HighContrast/256x256/apps
-
-icon16_DATA = 16x16/gnome-power-statistics.png
-icon22_DATA = 22x22/gnome-power-statistics.png
-icon24_DATA = 24x24/gnome-power-statistics.png
-icon48_DATA = 48x48/gnome-power-statistics.png
-icon256_DATA = 256x256/gnome-power-statistics.png
-
-EXTRA_DIST = $(icon16_DATA) $(icon22_DATA) $(icon24_DATA) $(icon48_DATA) $(icon256_DATA)
-
--include $(top_srcdir)/git.mk
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-power-manager-3.16.0/data/icons/Makefile.am new/gnome-power-manager-3.16.1/data/icons/Makefile.am
--- old/gnome-power-manager-3.16.0/data/icons/Makefile.am 2014-05-24 14:08:25.000000000 +0200
+++ new/gnome-power-manager-3.16.1/data/icons/Makefile.am 2015-04-27 19:13:22.000000000 +0200
@@ -1,4 +1,4 @@
-SUBDIRS = hicolor HighContrast
+SUBDIRS = hicolor
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(pkgdatadir)/icons/hicolor
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-power-manager-3.16.0/data/icons/hicolor/Makefile.am new/gnome-power-manager-3.16.1/data/icons/hicolor/Makefile.am
--- old/gnome-power-manager-3.16.0/data/icons/hicolor/Makefile.am 2014-05-24 14:08:25.000000000 +0200
+++ new/gnome-power-manager-3.16.1/data/icons/hicolor/Makefile.am 2015-04-27 19:13:22.000000000 +0200
@@ -4,6 +4,7 @@
icon32dir=$(datadir)/icons/hicolor/32x32/apps
icon48dir=$(datadir)/icons/hicolor/48x48/apps
iconscalabledir=$(datadir)/icons/hicolor/scalable/apps
+iconsymbolicdir=$(datadir)/icons/hicolor/symbolic/apps
icon16_DATA = 16x16/gnome-power-statistics.png
icon22_DATA = 22x22/gnome-power-statistics.png
@@ -11,7 +12,8 @@
icon32_DATA = 32x32/gnome-power-statistics.png
icon48_DATA = 48x48/gnome-power-statistics.png
iconscalable_DATA = scalable/gnome-power-statistics.svg
+iconsymbolic_DATA = symbolic/gnome-power-statistics-symbolic.svg
-EXTRA_DIST = $(icon16_DATA) $(icon22_DATA) $(icon24_DATA) $(icon32_DATA) $(icon48_DATA) $(iconscalable_DATA)
+EXTRA_DIST = $(icon16_DATA) $(icon22_DATA) $(icon24_DATA) $(icon32_DATA) $(icon48_DATA) $(iconscalable_DATA) $(iconsymbolic_DATA)
-include $(top_srcdir)/git.mk
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-power-manager-3.16.0/data/icons/hicolor/symbolic/gnome-power-statistics-symbolic.svg new/gnome-power-manager-3.16.1/data/icons/hicolor/symbolic/gnome-power-statistics-symbolic.svg
--- old/gnome-power-manager-3.16.0/data/icons/hicolor/symbolic/gnome-power-statistics-symbolic.svg 1970-01-01 01:00:00.000000000 +0100
+++ new/gnome-power-manager-3.16.1/data/icons/hicolor/symbolic/gnome-power-statistics-symbolic.svg 2015-04-27 19:13:22.000000000 +0200
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='gnome-power-statistics-symbolic.svg' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='0.91 r13725' width='16.000002' xmlns='http://www.w3.org/2000/svg'>
+ <metadata id='metadata90'>
+ rdf:RDF
+
+ dc:formatimage/svg+xml
+
+ dc:titleGnome Symbolic Icon Theme
+
+
+ </metadata>
+
+
+
+ <title id='title9167'>Gnome Symbolic Icon Theme</title>
+ <defs id='defs7386'>
+ <linearGradient id='linearGradient7212' osb:paint='solid'>
+ <stop id='stop7214' offset='0' style='stop-color:#000000;stop-opacity:1;'/>
+ </linearGradient>
+ </defs>
+ <g inkscape:groupmode='layer' id='layer9' inkscape:label='apps' style='display:inline' transform='translate(-283.0002,145)'>
+
+ <path inkscape:connector-curvature='0' d='m 284.09395,-145 c -0.60366,0 -1.09375,0.49009 -1.09375,1.09375 l 0,13.8125 c 0,0.60365 0.49009,1.09375 1.09375,1.09375 l 13.8125,0 c 0.60365,0 1.09375,-0.4901 1.09375,-1.09375 l 0,-13.8125 c 0,-0.60366 -0.4901,-1.09375 -1.09375,-1.09375 l -13.8125,0 z m 0,1 13.8125,0 c 0.0669,0 0.0937,0.0268 0.0937,0.0937 l 0,4.90625 -1.09375,0 c -0.20035,-0.58018 -0.7551,-1 -1.40625,-1 -0.82251,0 -1.5,0.6775 -1.5,1.5 0,0.2449 0.0807,0.45035 0.1875,0.65625 l -3,3 c -0.20078,-0.10112 -0.44584,-0.1562 -0.68745,-0.1562 -0.26731,0 -0.49947,0.0653 -0.71875,0.1875 l -1,-0.9375 c 0.13561,-0.22779 0.21875,-0.46726 0.21875,-0.75 0,-0.8225 -0.6775,-1.5 -1.5,-1.5 -0.8225,0 -1.5,0.6775 -1.5,1.5 0,0.32346 0.13417,0.59637 0.3125,0.84375 l -2.3125,2.375 0,-10.625 c 0,-0.0669 0.0268,-0.0937 0.0937,-0.0937 z m 11.40625,5 c 0.28206,0 0.5,0.21794 0.5,0.5 0,0.28206 -0.21794,0.5 -0.5,0.5 -0.28206,0 -0.5,-0.21794 -0.5,-0.5 0,-0.28206 0.21794,-0.5 0.5,-0.5 z m 1.40625,1 1.09375,0 0,7.90625 c 0,0.0669 -0.0268,0.0937 -0.0937,0.0937 l -13.8125,0 c -0.067,0 -0.0937,-0.0268 -0.0937,-0.0937 l 0,-1.75 3.15625,-3.21875 c 0.11821,0.0305 0.21695,0.0625 0.34375,0.0625 0.17136,0 0.34732,-0.0393 0.5,-0.0937 l 1.125,1.03125 c -0.0698,0.17026 -0.125,0.36715 -0.125,0.5625 0,0.8225 0.6775,1.5 1.5,1.5 0.8225,0 1.5,-0.6775 1.5,-1.5 0,-0.21591 -0.0431,-0.44059 -0.125,-0.625 l 3,-3.03125 c 0.1963,0.0949 0.39511,0.15625 0.625,0.15625 0.64087,0 1.1983,-0.42761 1.40625,-1 z m -9.40625,1 c 0.28206,0 0.5,0.21794 0.5,0.5 0,0.28206 -0.21794,0.5 -0.5,0.5 -0.28206,0 -0.5,-0.21794 -0.5,-0.5 0,-0.28206 0.21794,-0.5 0.5,-0.5 z m 3,3 c 0.28206,0 0.5,0.21794 0.5,0.5 0,0.28206 -0.21794,0.5 -0.5,0.5 -0.28206,0 -0.5,-0.21794 -0.5,-0.5 0,-0.28206 0.21794,-0.5 0.5,-0.5 z' id='rect6029' style='color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate'/>
+ </g>
+</svg>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-power-manager-3.16.0/m4/intltool.m4 new/gnome-power-manager-3.16.1/m4/intltool.m4
--- old/gnome-power-manager-3.16.0/m4/intltool.m4 2015-02-05 11:16:16.000000000 +0100
+++ new/gnome-power-manager-3.16.1/m4/intltool.m4 2015-04-27 19:18:54.000000000 +0200
@@ -155,31 +155,6 @@
# Substitute ALL_LINGUAS so we can use it in po/Makefile
AC_SUBST(ALL_LINGUAS)
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[]],
- [[extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr]])],
- [DATADIRNAME=share],
- [case $host in
- *-*-solaris*)
- dnl On Solaris, if bind_textdomain_codeset is in libc,
- dnl GNU format message catalog is always supported,
- dnl since both are added to the libc all together.
- dnl Hence, we'd like to go with DATADIRNAME=share
- dnl in this case.
- AC_CHECK_FUNC(bind_textdomain_codeset,
- [DATADIRNAME=share], [DATADIRNAME=lib])
- ;;
- *)
- [DATADIRNAME=lib]
- ;;
- esac])
-fi
-AC_SUBST(DATADIRNAME)
-
IT_PO_SUBDIR([po])
])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-power-manager-3.16.0/missing new/gnome-power-manager-3.16.1/missing
--- old/gnome-power-manager-3.16.0/missing 2015-02-05 11:16:22.000000000 +0100
+++ new/gnome-power-manager-3.16.1/missing 2015-04-27 19:19:04.000000000 +0200
@@ -3,7 +3,7 @@
scriptversion=2013-10-28.13; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-power-manager-3.16.0/po/Makefile.in.in new/gnome-power-manager-3.16.1/po/Makefile.in.in
--- old/gnome-power-manager-3.16.0/po/Makefile.in.in 2015-02-05 11:16:16.000000000 +0100
+++ new/gnome-power-manager-3.16.1/po/Makefile.in.in 2015-04-27 19:18:54.000000000 +0200
@@ -33,8 +33,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+localedir = @localedir@
subdir = po
install_sh = @install_sh@
# Automake >= 1.8 provides @mkdir_p@.
@@ -80,7 +79,7 @@
.po.pox:
$(MAKE) $(GETTEXT_PACKAGE).pot
- $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+ $(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox
.po.mo:
$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
@@ -108,7 +107,7 @@
install-data-yes: all
linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
- dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+ dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
$(mkdir_p) $$dir; \
if test -r $$lang.gmo; then \
$(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
@@ -142,8 +141,8 @@
uninstall:
linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done
check: all $(GETTEXT_PACKAGE).pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-power-manager-3.16.0/po/ru.po new/gnome-power-manager-3.16.1/po/ru.po
--- old/gnome-power-manager-3.16.0/po/ru.po 2015-02-08 17:25:40.000000000 +0100
+++ new/gnome-power-manager-3.16.1/po/ru.po 2015-04-27 19:21:44.000000000 +0200
@@ -4,6 +4,7 @@
# Copyright (C) 2005-2009, 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the gnome-power-manager package.
#
+#
# Leonid Kanter , 2006, 2010.
# Nickolay V. Shmyrev , 2007.
# Yuri Kozlov , 2008.
@@ -11,44 +12,44 @@
# Yuri Kozlov , 2010.
# Alexander Saprykin , 2010.
# Stas Solovey , 2014, 2015.
-#
+# Julia Dronova , 2015.
msgid ""
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
"power-manager&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-02-06 08:26+0000\n"
-"PO-Revision-Date: 2015-02-06 14:51+0300\n"
-"Last-Translator: Stas Solovey \n"
-"Language-Team: Русский \n"
+"POT-Creation-Date: 2015-04-02 19:42+0000\n"
+"PO-Revision-Date: 2015-04-03 01:11+0300\n"
+"Last-Translator: Julia Dronova \n"
+"Language-Team: Russian \n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Lokalize 1.5\n"
#: ../data/org.gnome.power-manager.gschema.xml.h:1
msgid "Whether we should show the history data points"
-msgstr "Показывать ли точками исторические данные"
+msgstr "Показывать историю точками на графике"
#: ../data/org.gnome.power-manager.gschema.xml.h:2
msgid ""
"Whether we should show the history data points in the statistics window."
-msgstr "Показывать ли точками исторические данные в окне статистики."
+msgstr "Показывать историю точками на графике в окне статистики."
#: ../data/org.gnome.power-manager.gschema.xml.h:3
msgid "Whether we should smooth the history data"
-msgstr "Сглаживать ли исторические данные на графике"
+msgstr "Выравнивать представление данных истории на графике"
#: ../data/org.gnome.power-manager.gschema.xml.h:4
msgid "Whether we should smooth the history data in the graph."
-msgstr "Сглаживать ли исторические данные на графике."
+msgstr "Выравнивать представление данных истории на графике."
#: ../data/org.gnome.power-manager.gschema.xml.h:5
msgid "The default graph type to show for history"
-msgstr "Тип графика по умолчанию для истории"
+msgstr "Тип графика по умолчанию для показа истории"
#: ../data/org.gnome.power-manager.gschema.xml.h:6
msgid "The default graph type to show in the history window."
@@ -56,28 +57,28 @@
#: ../data/org.gnome.power-manager.gschema.xml.h:7
msgid "The maximum time displayed for history"
-msgstr "Максимальное время, показанное для истории"
+msgstr "Максимальный показываемый отрезок времени для истории"
#: ../data/org.gnome.power-manager.gschema.xml.h:8
msgid ""
"The maximum duration of time displayed on the x-axis of the history graph."
-msgstr "Максимальное время, отложенное по оси X графика истории."
+msgstr "Максимальный отрезок времени для графика показываемой истории по оси X"
#: ../data/org.gnome.power-manager.gschema.xml.h:9
msgid "Whether we should show the stats data points"
-msgstr "Показывать ли точками статистические данные"
+msgstr "Показывать точки статистических данных"
#: ../data/org.gnome.power-manager.gschema.xml.h:10
msgid "Whether we should show the stats data points in the statistics window."
-msgstr "Показывать ли точками статистические данные в окне статистики."
+msgstr "Показывать точки статистических данных в окне статистики."
#: ../data/org.gnome.power-manager.gschema.xml.h:11
msgid "Whether we should smooth the stats data"
-msgstr "Сглаживать ли статистические данные на графике"
+msgstr "Выравнивать статистические данные на графике"
#: ../data/org.gnome.power-manager.gschema.xml.h:12
msgid "Whether we should smooth the stats data in the graph."
-msgstr "Сглаживать ли статистические данные на графике."
+msgstr "Выравнивать статистические данные на графике"
#: ../data/org.gnome.power-manager.gschema.xml.h:13
msgid "The default graph type to show for stats"
@@ -96,8 +97,8 @@
"The index of the page number to show by default which is used to return "
"focus to the correct page."
msgstr ""
-"Индекс номера страница по умолчанию, который используется для возвращения "
-"фокуса коррктной странице."
+"Индекс номера страницы по умолчанию, используемый для возвращения "
+"фокуса корректной странице."
#: ../data/org.gnome.power-manager.gschema.xml.h:17
msgid "The ID of the last device selected"
@@ -108,11 +109,10 @@
"The identifier of the last device which is used to return focus to the "
"correct device."
msgstr ""
-"Идентификатор последнего устройства, которое используется для возвращение "
+"Идентификатор последнего устройства, используемый для возвращения "
"фокуса корректному устройству."
#: ../data/appdata/gnome-power-statistics.appdata.xml.in.h:1
-#| msgid "Power Statistics"
msgid "GNOME Power Statistics"
msgstr "Статистика энергопотребления GNOME"
@@ -150,7 +150,7 @@
#: ../data/gnome-power-statistics.desktop.in.in.h:3
msgid "battery;consumption;charge;"
-msgstr "батарея;разрядка;зарядка;"
+msgstr "аккумулятор;потребление;зарядка"
#: ../src/gpm-statistics.ui.h:2 ../src/gpm-statistics.c:475
msgid "Details"
@@ -162,19 +162,19 @@
#: ../src/gpm-statistics.ui.h:4
msgid "Data length:"
-msgstr "Продолжительность:"
+msgstr "Интервал:"
#: ../src/gpm-statistics.ui.h:5
msgid "There is no data to display."
-msgstr "Нет сведений для отображения."
+msgstr "Нет данных для отображения."
#: ../src/gpm-statistics.ui.h:6
msgid "Use smoothed line"
-msgstr "Использовать сглаживание"
+msgstr "Выравнивать линии"
#: ../src/gpm-statistics.ui.h:7
msgid "Show data points"
-msgstr "Показывать отсчёты"
+msgstr "Показывать точки данных"
#: ../src/gpm-statistics.ui.h:8
msgid "History"
@@ -259,7 +259,7 @@
#. TRANSLATORS: the rate of discharge for the device
#: ../src/gpm-statistics.c:82 ../src/gpm-statistics.c:733
msgid "Rate"
-msgstr "Скорость"
+msgstr "Скорость разрядки"
#: ../src/gpm-statistics.c:83
msgid "Charge"
@@ -564,7 +564,7 @@
#. * would be TRUE, but a mobile phone or mouse taking power is FALSE
#: ../src/gpm-statistics.c:683
msgid "Supply"
-msgstr "Поставщик энергии"
+msgstr "Устройство питания"
#: ../src/gpm-statistics.c:686
#, c-format
@@ -578,7 +578,7 @@
#. * usually a few seconds when a device is discharging or charging.
#: ../src/gpm-statistics.c:690
msgid "Refreshed"
-msgstr "Обновлено"
+msgstr "Обновление данных"
#. TRANSLATORS: Present is whether the device is currently attached
#. * to the computer, as some devices (e.g. laptop batteries) can
@@ -591,7 +591,7 @@
#. * batteries rather than alkaline ones
#: ../src/gpm-statistics.c:707
msgid "Rechargeable"
-msgstr "Перезаряжаемо"
+msgstr "С возможностью перезарядки"
#. TRANSLATORS: The state of the device, e.g. "Changing" or "Fully charged"
#: ../src/gpm-statistics.c:713
@@ -604,11 +604,11 @@
#: ../src/gpm-statistics.c:720
msgid "Energy when empty"
-msgstr "Энергия при опустошении"
+msgstr "Энергия при нулевой зарядке"
#: ../src/gpm-statistics.c:723
msgid "Energy when full"
-msgstr "Энергия при заполнении"
+msgstr "Энергия при полной зарядке"
#: ../src/gpm-statistics.c:726
msgid "Energy (design)"
@@ -621,7 +621,7 @@
#. TRANSLATORS: the amount of charge the cell contains
#: ../src/gpm-statistics.c:762
msgid "Percentage"
-msgstr "Процент"
+msgstr "Текущий процент заряда"
#. TRANSLATORS: the capacity of the device, which is basically a measure
#. * of how full it can get, relative to the design capacity
@@ -668,7 +668,7 @@
#. TRANSLATORS: the keyboard and mouse device event
#: ../src/gpm-statistics.c:1180
msgid "PS/2 keyboard/mouse/touchpad"
-msgstr "Клавиатура/Мышь/Сенсорная панель"
+msgstr "PS/2 клавиатура/Мышь/Сенсорная панель"
#. TRANSLATORS: ACPI, the Intel power standard on laptops and desktops
#: ../src/gpm-statistics.c:1183
@@ -698,14 +698,14 @@
#: ../src/gpm-statistics.c:1219
#, c-format
msgid "Timer %s"
-msgstr "Периодическая активность %s"
+msgstr "Активный таймер %s"
#. TRANSLATORS: the parameter is the name of task that's woken up from sleeping.
#. * This is shown when the task wakes up.
#: ../src/gpm-statistics.c:1223
#, c-format
msgid "Sleep %s"
-msgstr "Пробуждение %s"
+msgstr "Бездействие %s"
#. TRANSLATORS: this is the name of a new realtime task.
#: ../src/gpm-statistics.c:1226
@@ -743,17 +743,17 @@
#: ../src/gpm-statistics.c:1247
#, c-format
msgid "Wakeup %s"
-msgstr "Пробуждение периодического задания %s"
+msgstr "Пробуждение %s"
#. TRANSLATORS: interupts on the system required for basic operation
#: ../src/gpm-statistics.c:1250
msgid "Local interrupts"
-msgstr "Прерывания"
+msgstr "Локальные прерывания"
#. TRANSLATORS: interrupts when a task gets moved from one core to another
#: ../src/gpm-statistics.c:1253
msgid "Rescheduling interrupts"
-msgstr "Перепланировка задач"
+msgstr "Перепланировка прерываний"
#. TRANSLATORS: shown on the titlebar
#: ../src/gpm-statistics.c:1362
@@ -779,7 +779,7 @@
#: ../src/gpm-statistics.c:1575 ../src/gpm-statistics.c:1581
#: ../src/gpm-statistics.c:1587 ../src/gpm-statistics.c:1593
msgid "Time elapsed"
-msgstr "Среднее время до окончания"
+msgstr "Затраченное время"
#. TRANSLATORS: this is the Y axis on the graph
#: ../src/gpm-statistics.c:1577
@@ -792,7 +792,7 @@
#: ../src/gpm-statistics.c:1632 ../src/gpm-statistics.c:1638
#: ../src/gpm-statistics.c:1644
msgid "Cell charge"
-msgstr "Заряд ячейки"
+msgstr "Заряд аккумулятора"
#. TRANSLATORS: this is the Y axis on the graph
#: ../src/gpm-statistics.c:1589 ../src/gpm-statistics.c:1595
@@ -802,17 +802,17 @@
#. TRANSLATORS: this is the Y axis on the graph
#: ../src/gpm-statistics.c:1628 ../src/gpm-statistics.c:1640
msgid "Correction factor"
-msgstr "Коррекция"
+msgstr "Поправочный коэффициент"
#. TRANSLATORS: this is the Y axis on the graph
#: ../src/gpm-statistics.c:1634 ../src/gpm-statistics.c:1646
msgid "Prediction accuracy"
-msgstr "Точность предсказания"
+msgstr "Точность прогноза"
#. TRANSLATORS: show verbose debugging
#: ../src/gpm-statistics.c:1806
msgid "Show extra debugging information"
-msgstr "Показывать отладочную информацию"
+msgstr "Показывать дополнительную отладочную информацию"
#. TRANSLATORS: show a device by default
#: ../src/gpm-statistics.c:1809
@@ -823,3 +823,4 @@
#: ../src/gpm-statistics.c:2059
msgid "Processor"
msgstr "Процессор"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-power-manager-3.16.0/test-driver new/gnome-power-manager-3.16.1/test-driver
--- old/gnome-power-manager-3.16.0/test-driver 2015-02-05 11:16:22.000000000 +0100
+++ new/gnome-power-manager-3.16.1/test-driver 2015-04-27 19:19:04.000000000 +0200
@@ -3,7 +3,7 @@
scriptversion=2013-07-13.22; # UTC
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -106,11 +106,14 @@
# Test script is run here.
"$@" >$log_file 2>&1
estatus=$?
+
if test $enable_hard_errors = no && test $estatus -eq 99; then
- estatus=1
+ tweaked_estatus=1
+else
+ tweaked_estatus=$estatus
fi
-case $estatus:$expect_failure in
+case $tweaked_estatus:$expect_failure in
0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
0:*) col=$grn res=PASS recheck=no gcopy=no;;
77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
@@ -119,6 +122,12 @@
*:*) col=$red res=FAIL recheck=yes gcopy=yes;;
esac
+# Report the test outcome and exit status in the logs, so that one can
+# know whether the test passed or failed simply by looking at the '.log'
+# file, without the need of also peaking into the corresponding '.trs'
+# file (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" >>$log_file
+
# Report outcome to console.
echo "${col}${res}${std}: $test_name"