June 2015 - openSUSE Commits - openSUSE Mailing Lists

commit fcitx-qt5 for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '15

01 Jun '15

Hello community, here is the log from the commit of package fcitx-qt5 for openSUSE:Factory checked in at 2015-06-01 09:56:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx-qt5 (Old) and /work/SRC/openSUSE:Factory/.fcitx-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fcitx-qt5" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx-qt5/fcitx-qt5.changes 2015-04-13 20:31:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx-qt5.new/fcitx-qt5.changes 2015-06-01 09:56:11.000000000 +0200 @@ -1,0 +2,10 @@ +Sat May 30 16:11:57 UTC 2015 - i(a)marguerite.su + +- update version 1.0.2 + * fix google code issue 748 + * fix dependency check + * fix leak + * use xkbcommon for compose + * install to lib instead of data + +------------------------------------------------------------------- Old: ---- fcitx-qt5-1.0.1.tar.xz New: ---- fcitx-qt5-1.0.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx-qt5.spec ++++++ --- /var/tmp/diff_new_pack.NrtuZk/_old 2015-06-01 09:56:11.000000000 +0200 +++ /var/tmp/diff_new_pack.NrtuZk/_new 2015-06-01 09:56:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: fcitx-qt5 -Version: 1.0.1 +Version: 1.0.2 Release: 0 Summary: Fcitx QT5 Input Context License: GPL-2.0+ @@ -32,6 +32,7 @@ BuildRequires: libicu-devel BuildRequires: libqt5-qtbase-devel BuildRequires: libqt5-qtbase-private-headers-devel +BuildRequires: libxkbcommon-devel BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build # fcitx-qt5 is using private QPA API, which can, and does break BC even in point releases, @@ -75,6 +76,6 @@ %defattr(-,root,root) %{_includedir}/FcitxQt5 %{_libdir}/libFcitxQt5*Addons.so -%{_datadir}/cmake/FcitxQt5*Addons/ +%{_libdir}/cmake/FcitxQt5*Addons/ %changelog ++++++ fcitx-qt5-1.0.1.tar.xz -> fcitx-qt5-1.0.2.tar.xz ++++++ ++++ 4984 lines of diff (skipped)

1 0

commit libpfm for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '15

01 Jun '15

Hello community, here is the log from the commit of package libpfm for openSUSE:Factory checked in at 2015-06-01 09:55:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpfm (Old) and /work/SRC/openSUSE:Factory/.libpfm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libpfm" Changes: -------- --- /work/SRC/openSUSE:Factory/libpfm/libpfm.changes 2015-03-16 09:42:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libpfm.new/libpfm.changes 2015-06-01 09:55:53.000000000 +0200 @@ -4 +4 @@ -- Version bump to 4.6.0: +- Version bump to 4.6.0 fate#318068: @@ -13,0 +14,2 @@ +- Drop obsolete patch: + * libpfm-add-ibm-power8-support.patch @@ -31,0 +34,5 @@ + +------------------------------------------------------------------- +Thu Jan 9 18:28:09 UTC 2014 - tonyj(a)suse.com + +- Add Power8 support (libpfm-add-ibm-power8-support.patch) FATE#315274 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit gnote for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '15

01 Jun '15

Hello community, here is the log from the commit of package gnote for openSUSE:Factory checked in at 2015-06-01 09:55:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnote (Old) and /work/SRC/openSUSE:Factory/.gnote.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnote" Changes: -------- --- /work/SRC/openSUSE:Factory/gnote/gnote.changes 2015-04-05 02:04:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnote.new/gnote.changes 2015-06-01 09:55:37.000000000 +0200 @@ -1,0 +2,9 @@ +Sat May 30 10:45:49 UTC 2015 - zaitor(a)opensuse.org + +- Update to version 3.16.1: + + Use client side window decorations only in Gnome (bgo#748121). + + Do not lose identation on first item when double (bgo#749658). + + Fix typos in documentation. + + Update translations. + +------------------------------------------------------------------- Old: ---- gnote-3.16.0.tar.xz New: ---- gnote-3.16.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnote.spec ++++++ --- /var/tmp/diff_new_pack.VJLstk/_old 2015-06-01 09:55:39.000000000 +0200 +++ /var/tmp/diff_new_pack.VJLstk/_new 2015-06-01 09:55:39.000000000 +0200 @@ -17,7 +17,7 @@ Name: gnote -Version: 3.16.0 +Version: 3.16.1 Release: 0 Summary: A Port of Tomboy to C++ License: GPL-3.0+ ++++++ gnote-3.16.0.tar.xz -> gnote-3.16.1.tar.xz ++++++ ++++ 6675 lines of diff (skipped)

1 0

commit python3-simplejson for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '15

01 Jun '15

Hello community, here is the log from the commit of package python3-simplejson for openSUSE:Factory checked in at 2015-06-01 09:55:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-simplejson (Old) and /work/SRC/openSUSE:Factory/.python3-simplejson.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-simplejson" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-simplejson/python3-simplejson.changes 2014-12-01 14:01:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-simplejson.new/python3-simplejson.changes 2015-06-01 09:55:19.000000000 +0200 @@ -1,0 +2,20 @@ +Sat May 30 17:54:55 UTC 2015 - arun(a)gmx.de + +- specfile: + * update copyright year + +- update to version 3.7.2: + * Do not cache Decimal class in encoder, only reference the decimal + module. This may make reload work in more common scenarios. + +- changes from Version 3.7.1: + * Fix compilation with MSVC + https://github.com/simplejson/simplejson/pull/119 + +- changes from Version 3.7.0: + * simplejson no longer trusts custom str/repr methods for int, long, + float subclasses. These instances are now formatted as if they + were exact instances of those types. + https://github.com/simplejson/simplejson/issues/118 + +------------------------------------------------------------------- Old: ---- simplejson-3.6.5.tar.gz New: ---- simplejson-3.7.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-simplejson.spec ++++++ --- /var/tmp/diff_new_pack.aLx473/_old 2015-06-01 09:55:20.000000000 +0200 +++ /var/tmp/diff_new_pack.aLx473/_new 2015-06-01 09:55:20.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python3-simplejson # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python3-simplejson -Version: 3.6.5 +Version: 3.7.2 Release: 0 Url: http://github.com/simplejson/simplejson Summary: Simple, fast, extensible JSON encoder/decoder for Python ++++++ simplejson-3.6.5.tar.gz -> simplejson-3.7.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplejson-3.6.5/CHANGES.txt new/simplejson-3.7.2/CHANGES.txt --- old/simplejson-3.6.5/CHANGES.txt 2014-10-24 17:13:39.000000000 +0200 +++ new/simplejson-3.7.2/CHANGES.txt 2015-05-22 18:26:24.000000000 +0200 @@ -1,3 +1,20 @@ +Version 3.7.2 released 2015-05-22 + +* Do not cache Decimal class in encoder, only reference the decimal module. + This may make reload work in more common scenarios. + +Version 3.7.1 released 2015-05-18 + +* Fix compilation with MSVC + https://github.com/simplejson/simplejson/pull/119 + +Version 3.7.0 released 2015-05-18 + +* simplejson no longer trusts custom str/repr methods for int, long, float + subclasses. These instances are now formatted as if they were exact + instances of those types. + https://github.com/simplejson/simplejson/issues/118 + Version 3.6.5 released 2014-10-24 * Importing bug fix for reference leak when an error occurs during diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplejson-3.6.5/PKG-INFO new/simplejson-3.7.2/PKG-INFO --- old/simplejson-3.6.5/PKG-INFO 2014-10-24 17:18:17.000000000 +0200 +++ new/simplejson-3.7.2/PKG-INFO 2015-05-22 18:34:43.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: simplejson -Version: 3.6.5 +Version: 3.7.2 Summary: Simple, fast, extensible JSON encoder/decoder for Python Home-page: http://github.com/simplejson/simplejson Author: Bob Ippolito diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplejson-3.6.5/conf.py new/simplejson-3.7.2/conf.py --- old/simplejson-3.6.5/conf.py 2014-10-24 17:14:03.000000000 +0200 +++ new/simplejson-3.7.2/conf.py 2015-05-22 18:23:16.000000000 +0200 @@ -36,15 +36,15 @@ # General substitutions. project = 'simplejson' -copyright = '2014, Bob Ippolito' +copyright = '2015, Bob Ippolito' # The default replacements for |version| and |release|, also used in various # other places throughout the built documents. # # The short X.Y version. -version = '3.6' +version = '3.7' # The full version, including alpha/beta/rc tags. -release = '3.6.5' +release = '3.7.2' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplejson-3.6.5/index.rst new/simplejson-3.7.2/index.rst --- old/simplejson-3.6.5/index.rst 2014-08-18 21:53:31.000000000 +0200 +++ new/simplejson-3.7.2/index.rst 2015-05-18 18:28:42.000000000 +0200 @@ -101,7 +101,7 @@ >>> def encode_complex(obj): ... if isinstance(obj, complex): ... return [obj.real, obj.imag] - ... raise TypeError(repr(o) + " is not JSON serializable") + ... raise TypeError(repr(obj) + " is not JSON serializable") ... >>> json.dumps(2 + 1j, default=encode_complex) '[2.0, 1.0]' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplejson-3.6.5/setup.py new/simplejson-3.7.2/setup.py --- old/simplejson-3.6.5/setup.py 2014-10-24 17:14:06.000000000 +0200 +++ new/simplejson-3.7.2/setup.py 2015-05-22 18:23:31.000000000 +0200 @@ -11,7 +11,7 @@ DistutilsPlatformError IS_PYPY = hasattr(sys, 'pypy_translation_info') -VERSION = '3.6.5' +VERSION = '3.7.2' DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python" with open('README.rst', 'r') as f: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplejson-3.6.5/simplejson/__init__.py new/simplejson-3.7.2/simplejson/__init__.py --- old/simplejson-3.6.5/simplejson/__init__.py 2014-10-24 17:14:00.000000000 +0200 +++ new/simplejson-3.7.2/simplejson/__init__.py 2015-05-22 18:21:54.000000000 +0200 @@ -98,7 +98,7 @@ Expecting property name: line 1 column 3 (char 2) """ from __future__ import absolute_import -__version__ = '3.6.5' +__version__ = '3.7.2' __all__ = [ 'dump', 'dumps', 'load', 'loads', 'JSONDecoder', 'JSONDecodeError', 'JSONEncoder', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplejson-3.6.5/simplejson/_speedups.c new/simplejson-3.7.2/simplejson/_speedups.c --- old/simplejson-3.6.5/simplejson/_speedups.c 2014-10-24 17:12:40.000000000 +0200 +++ new/simplejson-3.7.2/simplejson/_speedups.c 2015-05-19 04:12:00.000000000 +0200 @@ -10,6 +10,7 @@ #define PyString_AS_STRING PyBytes_AS_STRING #define PyString_FromStringAndSize PyBytes_FromStringAndSize #define PyInt_Check(obj) 0 +#define PyInt_CheckExact(obj) 0 #define JSON_UNICHR Py_UCS4 #define JSON_InternFromString PyUnicode_InternFromString #define JSON_Intern_GET_SIZE PyUnicode_GET_SIZE @@ -660,7 +661,20 @@ return _encoded_const(key); } else if (PyInt_Check(key) || PyLong_Check(key)) { - return PyObject_Str(key); + if (!(PyInt_CheckExact(key) || PyLong_CheckExact(key))) { + /* See #118, do not trust custom str/repr */ + PyObject *res; + PyObject *tmp = PyObject_CallFunctionObjArgs((PyObject *)&PyLong_Type, key, NULL); + if (tmp == NULL) { + return NULL; + } + res = PyObject_Str(tmp); + Py_DECREF(tmp); + return res; + } + else { + return PyObject_Str(key); + } } else if (s->use_decimal && PyObject_TypeCheck(key, (PyTypeObject *)s->Decimal)) { return PyObject_Str(key); @@ -2637,7 +2651,7 @@ s->tuple_as_array = PyObject_IsTrue(tuple_as_array); if (PyInt_Check(int_as_string_bitcount) || PyLong_Check(int_as_string_bitcount)) { static const unsigned int long_long_bitsize = SIZEOF_LONG_LONG * 8; - int int_as_string_bitcount_val = PyLong_AsLong(int_as_string_bitcount); + int int_as_string_bitcount_val = (int)PyLong_AsLong(int_as_string_bitcount); if (int_as_string_bitcount_val > 0 && int_as_string_bitcount_val < long_long_bitsize) { s->max_long_size = PyLong_FromUnsignedLongLong(1ULL << int_as_string_bitcount_val); s->min_long_size = PyLong_FromLongLong(-1LL << int_as_string_bitcount_val); @@ -2800,7 +2814,20 @@ } } /* Use a better float format here? */ - return PyObject_Repr(obj); + if (PyFloat_CheckExact(obj)) { + return PyObject_Repr(obj); + } + else { + /* See #118, do not trust custom str/repr */ + PyObject *res; + PyObject *tmp = PyObject_CallFunctionObjArgs((PyObject *)&PyFloat_Type, obj, NULL); + if (tmp == NULL) { + return NULL; + } + res = PyObject_Repr(tmp); + Py_DECREF(tmp); + return res; + } } static PyObject * @@ -2840,7 +2867,21 @@ rv = _steal_accumulate(rval, encoded); } else if (PyInt_Check(obj) || PyLong_Check(obj)) { - PyObject *encoded = PyObject_Str(obj); + PyObject *encoded; + if (PyInt_CheckExact(obj) || PyLong_CheckExact(obj)) { + encoded = PyObject_Str(obj); + } + else { + /* See #118, do not trust custom str/repr */ + PyObject *tmp = PyObject_CallFunctionObjArgs((PyObject *)&PyLong_Type, obj, NULL); + if (tmp == NULL) { + encoded = NULL; + } + else { + encoded = PyObject_Str(tmp); + Py_DECREF(tmp); + } + } if (encoded != NULL) { encoded = maybe_quote_bigint(s, encoded, obj); if (encoded == NULL) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplejson-3.6.5/simplejson/encoder.py new/simplejson-3.7.2/simplejson/encoder.py --- old/simplejson-3.6.5/simplejson/encoder.py 2014-07-22 22:30:14.000000000 +0200 +++ new/simplejson-3.7.2/simplejson/encoder.py 2015-05-22 18:21:25.000000000 +0200 @@ -3,7 +3,8 @@ from __future__ import absolute_import import re from operator import itemgetter -from decimal import Decimal +# Do not import Decimal directly to avoid reload issues +import decimal from .compat import u, unichr, binary_type, string_types, integer_types, PY3 def _import_speedups(): try: @@ -311,6 +312,9 @@ elif o == _neginf: text = '-Infinity' else: + if type(o) != float: + # See #118, do not trust custom str/repr + o = float(o) return _repr(o) if ignore_nan: @@ -334,7 +338,7 @@ self.namedtuple_as_object, self.tuple_as_array, int_as_string_bitcount, self.item_sort_key, self.encoding, self.for_json, - self.ignore_nan, Decimal) + self.ignore_nan, decimal.Decimal) else: _iterencode = _make_iterencode( markers, self.default, _encoder, self.indent, floatstr, @@ -343,7 +347,7 @@ self.namedtuple_as_object, self.tuple_as_array, int_as_string_bitcount, self.item_sort_key, self.encoding, self.for_json, - Decimal=Decimal) + Decimal=decimal.Decimal) try: return _iterencode(o, 0) finally: @@ -386,7 +390,7 @@ _PY3=PY3, ValueError=ValueError, string_types=string_types, - Decimal=Decimal, + Decimal=None, dict=dict, float=float, id=id, @@ -396,6 +400,8 @@ str=str, tuple=tuple, ): + if _use_decimal and Decimal is None: + Decimal = decimal.Decimal if _item_sort_key and not callable(_item_sort_key): raise TypeError("item_sort_key must be None or callable") elif _sort_keys and not _item_sort_key: @@ -412,6 +418,9 @@ or _int_as_string_bitcount < 1 ) + if type(value) not in integer_types: + # See #118, do not trust custom str/repr + value = int(value) if ( skip_quoting or (-1 << _int_as_string_bitcount) @@ -501,6 +510,9 @@ elif key is None: key = 'null' elif isinstance(key, integer_types): + if key not in integer_types: + # See #118, do not trust custom str/repr + key = int(key) key = str(key) elif _use_decimal and isinstance(key, Decimal): key = str(key) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplejson-3.6.5/simplejson/tests/__init__.py new/simplejson-3.7.2/simplejson/tests/__init__.py --- old/simplejson-3.6.5/simplejson/tests/__init__.py 2014-07-22 22:30:14.000000000 +0200 +++ new/simplejson-3.7.2/simplejson/tests/__init__.py 2015-05-18 19:39:10.000000000 +0200 @@ -62,6 +62,7 @@ 'simplejson.tests.test_namedtuple', 'simplejson.tests.test_tool', 'simplejson.tests.test_for_json', + 'simplejson.tests.test_subclass', ])) suite = get_suite() import simplejson diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplejson-3.6.5/simplejson/tests/test_subclass.py new/simplejson-3.7.2/simplejson/tests/test_subclass.py --- old/simplejson-3.6.5/simplejson/tests/test_subclass.py 1970-01-01 01:00:00.000000000 +0100 +++ new/simplejson-3.7.2/simplejson/tests/test_subclass.py 2015-05-18 20:36:17.000000000 +0200 @@ -0,0 +1,37 @@ +from unittest import TestCase +import simplejson as json + +from decimal import Decimal + +class AlternateInt(int): + def __repr__(self): + return 'invalid json' + __str__ = __repr__ + + +class AlternateFloat(float): + def __repr__(self): + return 'invalid json' + __str__ = __repr__ + + +# class AlternateDecimal(Decimal): +# def __repr__(self): +# return 'invalid json' + + +class TestSubclass(TestCase): + def test_int(self): + self.assertEqual(json.dumps(AlternateInt(1)), '1') + self.assertEqual(json.dumps(AlternateInt(-1)), '-1') + self.assertEqual(json.loads(json.dumps({AlternateInt(1): 1})), {'1': 1}) + + def test_float(self): + self.assertEqual(json.dumps(AlternateFloat(1.0)), '1.0') + self.assertEqual(json.dumps(AlternateFloat(-1.0)), '-1.0') + self.assertEqual(json.loads(json.dumps({AlternateFloat(1.0): 1})), {'1.0': 1}) + + # NOTE: Decimal subclasses are not supported as-is + # def test_decimal(self): + # self.assertEqual(json.dumps(AlternateDecimal('1.0')), '1.0') + # self.assertEqual(json.dumps(AlternateDecimal('-1.0')), '-1.0') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplejson-3.6.5/simplejson.egg-info/PKG-INFO new/simplejson-3.7.2/simplejson.egg-info/PKG-INFO --- old/simplejson-3.6.5/simplejson.egg-info/PKG-INFO 2014-10-24 17:18:12.000000000 +0200 +++ new/simplejson-3.7.2/simplejson.egg-info/PKG-INFO 2015-05-22 18:34:39.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: simplejson -Version: 3.6.5 +Version: 3.7.2 Summary: Simple, fast, extensible JSON encoder/decoder for Python Home-page: http://github.com/simplejson/simplejson Author: Bob Ippolito diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simplejson-3.6.5/simplejson.egg-info/SOURCES.txt new/simplejson-3.7.2/simplejson.egg-info/SOURCES.txt --- old/simplejson-3.6.5/simplejson.egg-info/SOURCES.txt 2014-10-24 17:18:13.000000000 +0200 +++ new/simplejson-3.7.2/simplejson.egg-info/SOURCES.txt 2015-05-22 18:34:39.000000000 +0200 @@ -42,6 +42,7 @@ simplejson/tests/test_scanstring.py simplejson/tests/test_separators.py simplejson/tests/test_speedups.py +simplejson/tests/test_subclass.py simplejson/tests/test_tool.py simplejson/tests/test_tuple.py simplejson/tests/test_unicode.py \ No newline at end of file

1 0

commit taskwarrior for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '15

01 Jun '15

Hello community, here is the log from the commit of package taskwarrior for openSUSE:Factory checked in at 2015-06-01 09:55:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/taskwarrior (Old) and /work/SRC/openSUSE:Factory/.taskwarrior.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "taskwarrior" Changes: -------- --- /work/SRC/openSUSE:Factory/taskwarrior/taskwarrior.changes 2015-02-22 17:26:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.taskwarrior.new/taskwarrior.changes 2015-06-01 09:55:02.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 29 06:48:58 UTC 2015 - mvyskocil(a)opensuse.org + +- Update to 2.4.4 bugfix release +- Drop taskwarrior-no-return.patch + +------------------------------------------------------------------- Old: ---- task-2.4.0.tar.gz taskwarrior-no-return.patch New: ---- task-2.4.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ taskwarrior.spec ++++++ --- /var/tmp/diff_new_pack.vmGG7d/_old 2015-06-01 09:55:03.000000000 +0200 +++ /var/tmp/diff_new_pack.vmGG7d/_new 2015-06-01 09:55:03.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package taskwarrior # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: taskwarrior -Version: 2.4.0 +Version: 2.4.4 Release: 0 Summary: Command-line todo list manager License: MIT @@ -26,10 +26,8 @@ Source0: http://www.taskwarrior.org/download/task-%{version}.tar.gz #PATCH-FIX-OPENSUSE: skip the INSTALL from files intended for the installation Patch0: task-skip-INSTALL.patch -#PATCH-FIX-OPENSUSE: shut up compiler -Patch1: taskwarrior-no-return.patch # PATCH-FIX-UPSTREAM taskwarrior-gcc47.patch dimstar(a)opensuse.org -- Fix build with gcc 4.7 -Patch2: taskwarrior-gcc47.patch +Patch1: taskwarrior-gcc47.patch BuildRequires: awk BuildRequires: cmake >= 2.8 BuildRequires: coreutils @@ -60,7 +58,6 @@ %setup -q -n task-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 # replace __TIME__/__DATE__ with values from source code tarball DATE=$(/bin/date -r "%{SOURCE0}" | awk '{print $2" "$3" "$6}') ++++++ task-2.4.0.tar.gz -> task-2.4.4.tar.gz ++++++ ++++ 16774 lines of diff (skipped)

1 0

commit fcitx-skk for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '15

01 Jun '15

Hello community, here is the log from the commit of package fcitx-skk for openSUSE:Factory checked in at 2015-06-01 09:54:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx-skk (Old) and /work/SRC/openSUSE:Factory/.fcitx-skk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fcitx-skk" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx-skk/fcitx-skk.changes 2014-06-10 14:39:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx-skk.new/fcitx-skk.changes 2015-06-01 09:54:46.000000000 +0200 @@ -1,0 +2,6 @@ +Sat May 30 16:33:21 UTC 2015 - i(a)marguerite.su + +- update version 0.1.2 + * candidate selection key config + +------------------------------------------------------------------- Old: ---- fcitx-skk-0.1.1.tar.xz New: ---- fcitx-skk-0.1.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx-skk.spec ++++++ --- /var/tmp/diff_new_pack.1X2lkV/_old 2015-06-01 09:54:47.000000000 +0200 +++ /var/tmp/diff_new_pack.1X2lkV/_new 2015-06-01 09:54:47.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package fcitx-skk # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: fcitx-skk -Version: 0.1.1 +Version: 0.1.2 Release: 0 Summary: Japanese SKK IME Wrapper for Fcitx License: GPL-3.0+ ++++++ fcitx-skk-0.1.1.tar.xz -> fcitx-skk-0.1.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/README.md new/fcitx-skk-0.1.2/README.md --- old/fcitx-skk-0.1.1/README.md 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/README.md 2014-12-13 08:39:45.000000000 +0100 @@ -2,15 +2,37 @@ fcitx-skk is an input method engine for Fcitx, which uses libskk as its backend. -Requirements: +## Requirements: + - libskk - Qt4 (optional), for rule and dictionary configuration UI. - fcitx 4.2.8 - skk-jisyo -Build dependency: +### For Ubuntu User + +Please install this packages before build this Program. + + - libskk-dev + - libqt4-dev + - fcitx-libs-dev + - skkdic + + $ sudo aptitude install libskk-dev libqt4-dev fcitx-libs-dev skkdic + + +## Build dependency: + - cmake + - C++ Compiler(g++) You can specify the skk dictionary path by -DSKK_DEFAULT_PATH=path_you_want By default it's /usr/share/skk/SKK-JISYO.L + +## Installation + + git clone https://github.com/fcitx/fcitx-skk.git + cd fcitx-skk + cmake . + sudo make install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/po/de.po new/fcitx-skk-0.1.2/po/de.po --- old/fcitx-skk-0.1.1/po/de.po 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/po/de.po 2014-12-13 08:39:45.000000000 +0100 @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# mar well <marwell.1980(a)freenet.de>, 2013 +# mar well <m.wellendorf(a)gmx.de>, 2013 +# mar well <m.wellendorf(a)gmx.de>, 2014 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev(a)googlegroups.com\n" -"POT-Creation-Date: 2013-10-31 06:03-0400\n" -"PO-Revision-Date: 2013-10-31 05:48+0000\n" -"Last-Translator: mar well <marwell.1980(a)freenet.de>\n" +"POT-Creation-Date: 2014-12-09 12:02+0100\n" +"PO-Revision-Date: 2014-12-09 09:44+0000\n" +"Last-Translator: mar well <m.wellendorf(a)gmx.de>\n" "Language-Team: German (http://www.transifex.com/projects/p/fcitx/language/" "de/)\n" "Language: de\n" @@ -39,6 +40,10 @@ msgid "&Type:" msgstr "&Typ:" +#: src/fcitx-skk.desc:60 +msgid "ABC (a,b,c,...)" +msgstr "ABC (a,b,c,...)" + #: src/fcitx-skk.desc:36 msgid "Candidate List Layout" msgstr "Layout der Kandidatenliste" @@ -51,13 +56,17 @@ msgid "Dictionary and Rule" msgstr "Wörterbücher und Regeln" +#: src/fcitx-skk.desc:59 +msgid "Digit (0,1,2,...)" +msgstr "Ziffer (0,1,2,...)" + #: src/fcitx-skk.desc:19 msgid "Direct input" msgstr "Direkte Eingabe" #: src/fcitx-skk.desc:1 src/fcitx-skk.desc:11 src/fcitx-skk.desc:22 #: src/fcitx-skk.desc:29 src/fcitx-skk.desc:34 src/fcitx-skk.desc:43 -#: src/fcitx-skk.desc:50 +#: src/fcitx-skk.desc:50 src/fcitx-skk.desc:55 msgid "General" msgstr "Allgemein" @@ -93,6 +102,10 @@ msgid "Katakana" msgstr "Katakana" +#: src/fcitx-skk.desc:57 +msgid "Keys to Select from Candidate Window" +msgstr "Auswahltaste für die Kandidaten" + #: src/skk.c:98 src/fcitx-skk.desc:7 msgid "Latin" msgstr "Latin" @@ -109,6 +122,10 @@ msgid "Punctuation Style" msgstr "Stil der Interpunktion" +#: src/fcitx-skk.desc:61 +msgid "Qwerty Center Row (a,s,d,...)" +msgstr "Mittlere Reihe der QWERTY Tastatur (a,s,d,...)" + #: src/fcitx-skk.desc:31 msgid "Return-key does not insert new line on commit" msgstr "Return-Taste erzeugt keinen Zeilenwechsel" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/po/fcitx-skk.pot new/fcitx-skk-0.1.2/po/fcitx-skk.pot --- old/fcitx-skk-0.1.1/po/fcitx-skk.pot 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/po/fcitx-skk.pot 2014-12-13 08:39:45.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: fcitx-dev(a)googlegroups.com\n" -"POT-Creation-Date: 2013-10-21 12:00-0400\n" +"POT-Creation-Date: 2014-12-08 12:40+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -57,31 +57,31 @@ msgid "Dictionary Manager" msgstr "" -#: src/skk.c:93 src/fcitx-skk.desc:16 +#: src/skk.c:95 src/fcitx-skk.desc:16 msgid "Hiragana" msgstr "" -#: src/skk.c:94 src/fcitx-skk.desc:17 +#: src/skk.c:96 src/fcitx-skk.desc:17 msgid "Katakana" msgstr "" -#: src/skk.c:95 src/fcitx-skk.desc:18 +#: src/skk.c:97 src/fcitx-skk.desc:18 msgid "Half width Katakana" msgstr "" -#: src/skk.c:96 src/fcitx-skk.desc:7 +#: src/skk.c:98 src/fcitx-skk.desc:7 msgid "Latin" msgstr "" -#: src/skk.c:97 src/fcitx-skk.desc:8 src/fcitx-skk.desc:20 +#: src/skk.c:99 src/fcitx-skk.desc:8 src/fcitx-skk.desc:20 msgid "Wide latin" msgstr "" -#: src/skk.c:438 src/fcitx-skk.conf.in:3 src/skk.conf.in:3 +#: src/skk.c:440 src/fcitx-skk.conf.in:3 src/skk.conf.in:3 msgid "Skk" msgstr "" -#: src/skk.c:464 +#: src/skk.c:466 msgid "Input Mode" msgstr "" @@ -95,7 +95,7 @@ #: src/fcitx-skk.desc:1 src/fcitx-skk.desc:11 src/fcitx-skk.desc:22 #: src/fcitx-skk.desc:29 src/fcitx-skk.desc:34 src/fcitx-skk.desc:43 -#: src/fcitx-skk.desc:50 +#: src/fcitx-skk.desc:50 src/fcitx-skk.desc:55 msgid "General" msgstr "" @@ -150,3 +150,19 @@ #: src/fcitx-skk.desc:52 msgid "Show Annotation" msgstr "" + +#: src/fcitx-skk.desc:57 +msgid "Keys to Select from Candidate Window" +msgstr "" + +#: src/fcitx-skk.desc:59 +msgid "Digit (0,1,2,...)" +msgstr "" + +#: src/fcitx-skk.desc:60 +msgid "ABC (a,b,c,...)" +msgstr "" + +#: src/fcitx-skk.desc:61 +msgid "Qwerty Center Row (a,s,d,...)" +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/po/ja.po new/fcitx-skk-0.1.2/po/ja.po --- old/fcitx-skk-0.1.1/po/ja.po 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/po/ja.po 2014-12-13 08:39:45.000000000 +0100 @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# AWASHIRO Ikuya <ikunya(a)gmail.com>, 2014 # emasaka <emasaka(a)gmail.com>, 2014 -# shirou - しろう, 2013 +# WAKAYAMA Shirou <shirou.faw(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev(a)googlegroups.com\n" -"POT-Creation-Date: 2014-02-04 12:24+0000\n" -"PO-Revision-Date: 2014-02-04 11:28+0000\n" -"Last-Translator: emasaka <emasaka(a)gmail.com>\n" +"POT-Creation-Date: 2014-12-08 12:02+0100\n" +"PO-Revision-Date: 2014-12-08 09:49+0000\n" +"Last-Translator: AWASHIRO Ikuya <ikunya(a)gmail.com>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/fcitx/language/" "ja/)\n" "Language: ja\n" @@ -22,7 +23,7 @@ #: gui/adddictdialog.cpp:37 msgid "&Host:" -msgstr "ホスト:" +msgstr "ホスト(&H):" #: gui/adddictdialog.cpp:36 msgid "&Path:" @@ -30,15 +31,19 @@ #: gui/adddictdialog.cpp:38 msgid "&Port:" -msgstr "ポート:" +msgstr "ポート(&P):" #: gui/dictwidget.cpp:34 msgid "&Rule:" -msgstr "タイピング方式" +msgstr "タイピング方式(&R):" #: gui/adddictdialog.cpp:35 msgid "&Type:" -msgstr "形式:" +msgstr "形式(&T):" + +#: src/fcitx-skk.desc:60 +msgid "ABC (a,b,c,...)" +msgstr "ABC (a,b,c,...)" #: src/fcitx-skk.desc:36 msgid "Candidate List Layout" @@ -52,13 +57,17 @@ msgid "Dictionary and Rule" msgstr "辞書とタイピング方式" +#: src/fcitx-skk.desc:59 +msgid "Digit (0,1,2,...)" +msgstr "数字キー (0,1,2,...)" + #: src/fcitx-skk.desc:19 msgid "Direct input" msgstr "直接入力" #: src/fcitx-skk.desc:1 src/fcitx-skk.desc:11 src/fcitx-skk.desc:22 #: src/fcitx-skk.desc:29 src/fcitx-skk.desc:34 src/fcitx-skk.desc:43 -#: src/fcitx-skk.desc:50 +#: src/fcitx-skk.desc:50 src/fcitx-skk.desc:55 msgid "General" msgstr "全般" @@ -94,6 +103,10 @@ msgid "Katakana" msgstr "カタカナ" +#: src/fcitx-skk.desc:57 +msgid "Keys to Select from Candidate Window" +msgstr "候補ウィンドウからの選択キー" + #: src/skk.c:98 src/fcitx-skk.desc:7 msgid "Latin" msgstr "英数" @@ -110,6 +123,10 @@ msgid "Punctuation Style" msgstr "句読点スタイル" +#: src/fcitx-skk.desc:61 +msgid "Qwerty Center Row (a,s,d,...)" +msgstr "Qwertyキーボード中央行 (a,s,d,...)" + #: src/fcitx-skk.desc:31 msgid "Return-key does not insert new line on commit" msgstr "確定時にリターンキーを押しても改行を挿入しない" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/po/vi.po new/fcitx-skk-0.1.2/po/vi.po --- old/fcitx-skk-0.1.1/po/vi.po 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/po/vi.po 2014-12-13 08:39:45.000000000 +0100 @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# bizover, 2013 +# Thu Hoai <contact(a)bizover.net>, 2013 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev(a)googlegroups.com\n" -"POT-Creation-Date: 2013-10-21 12:00-0400\n" -"PO-Revision-Date: 2013-10-18 10:06+0000\n" -"Last-Translator: Xuetian Weng <wengxt(a)gmail.com>\n" +"POT-Creation-Date: 2014-12-08 06:02+0100\n" +"PO-Revision-Date: 2013-10-21 16:06+0000\n" +"Last-Translator: csslayer <wengxt(a)gmail.com>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/fcitx/" "language/vi/)\n" "Language: vi\n" @@ -39,6 +39,10 @@ msgid "&Type:" msgstr "" +#: src/fcitx-skk.desc:60 +msgid "ABC (a,b,c,...)" +msgstr "" + #: src/fcitx-skk.desc:36 msgid "Candidate List Layout" msgstr "" @@ -51,13 +55,17 @@ msgid "Dictionary and Rule" msgstr "" +#: src/fcitx-skk.desc:59 +msgid "Digit (0,1,2,...)" +msgstr "" + #: src/fcitx-skk.desc:19 msgid "Direct input" msgstr "" #: src/fcitx-skk.desc:1 src/fcitx-skk.desc:11 src/fcitx-skk.desc:22 #: src/fcitx-skk.desc:29 src/fcitx-skk.desc:34 src/fcitx-skk.desc:43 -#: src/fcitx-skk.desc:50 +#: src/fcitx-skk.desc:50 src/fcitx-skk.desc:55 msgid "General" msgstr "" @@ -65,11 +73,11 @@ msgid "Global" msgstr "" -#: src/skk.c:95 src/fcitx-skk.desc:18 +#: src/skk.c:97 src/fcitx-skk.desc:18 msgid "Half width Katakana" msgstr "" -#: src/skk.c:93 src/fcitx-skk.desc:16 +#: src/skk.c:95 src/fcitx-skk.desc:16 msgid "Hiragana" msgstr "" @@ -81,7 +89,7 @@ msgid "Initial Input Mode" msgstr "" -#: src/skk.c:464 +#: src/skk.c:466 msgid "Input Mode" msgstr "" @@ -89,11 +97,15 @@ msgid "Japanese" msgstr "" -#: src/skk.c:94 src/fcitx-skk.desc:17 +#: src/skk.c:96 src/fcitx-skk.desc:17 msgid "Katakana" msgstr "" -#: src/skk.c:96 src/fcitx-skk.desc:7 +#: src/fcitx-skk.desc:57 +msgid "Keys to Select from Candidate Window" +msgstr "" + +#: src/skk.c:98 src/fcitx-skk.desc:7 msgid "Latin" msgstr "" @@ -109,6 +121,10 @@ msgid "Punctuation Style" msgstr "" +#: src/fcitx-skk.desc:61 +msgid "Qwerty Center Row (a,s,d,...)" +msgstr "" + #: src/fcitx-skk.desc:31 msgid "Return-key does not insert new line on commit" msgstr "" @@ -125,7 +141,7 @@ msgid "Show Annotation" msgstr "" -#: src/skk.c:438 src/fcitx-skk.conf.in:3 src/skk.conf.in:3 +#: src/skk.c:440 src/fcitx-skk.conf.in:3 src/skk.conf.in:3 msgid "Skk" msgstr "Skk" @@ -145,7 +161,7 @@ msgid "Vertical" msgstr "" -#: src/skk.c:97 src/fcitx-skk.desc:8 src/fcitx-skk.desc:20 +#: src/skk.c:99 src/fcitx-skk.desc:8 src/fcitx-skk.desc:20 msgid "Wide latin" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/po/zh_CN.po new/fcitx-skk-0.1.2/po/zh_CN.po --- old/fcitx-skk-0.1.1/po/zh_CN.po 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/po/zh_CN.po 2014-12-13 08:39:45.000000000 +0100 @@ -4,14 +4,14 @@ # # Translators: # Christopher Meng <cickumqt(a)gmail.com>, 2013 -# Xuetian Weng <wengxt(a)gmail.com>, 2013 +# csslayer <wengxt(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev(a)googlegroups.com\n" -"POT-Creation-Date: 2013-10-27 12:02-0400\n" +"POT-Creation-Date: 2014-12-08 06:02+0100\n" "PO-Revision-Date: 2013-10-27 15:06+0000\n" -"Last-Translator: Xuetian Weng <wengxt(a)gmail.com>\n" +"Last-Translator: csslayer <wengxt(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/fcitx/" "language/zh_CN/)\n" "Language: zh_CN\n" @@ -40,6 +40,10 @@ msgid "&Type:" msgstr "类型(&T)：" +#: src/fcitx-skk.desc:60 +msgid "ABC (a,b,c,...)" +msgstr "" + #: src/fcitx-skk.desc:36 msgid "Candidate List Layout" msgstr "候选词列表" @@ -52,13 +56,17 @@ msgid "Dictionary and Rule" msgstr "词典和规则" +#: src/fcitx-skk.desc:59 +msgid "Digit (0,1,2,...)" +msgstr "" + #: src/fcitx-skk.desc:19 msgid "Direct input" msgstr "直接输入" #: src/fcitx-skk.desc:1 src/fcitx-skk.desc:11 src/fcitx-skk.desc:22 #: src/fcitx-skk.desc:29 src/fcitx-skk.desc:34 src/fcitx-skk.desc:43 -#: src/fcitx-skk.desc:50 +#: src/fcitx-skk.desc:50 src/fcitx-skk.desc:55 msgid "General" msgstr "常规" @@ -94,6 +102,10 @@ msgid "Katakana" msgstr "片假名" +#: src/fcitx-skk.desc:57 +msgid "Keys to Select from Candidate Window" +msgstr "" + #: src/skk.c:98 src/fcitx-skk.desc:7 msgid "Latin" msgstr "英文" @@ -110,6 +122,10 @@ msgid "Punctuation Style" msgstr "标点风格" +#: src/fcitx-skk.desc:61 +msgid "Qwerty Center Row (a,s,d,...)" +msgstr "" + #: src/fcitx-skk.desc:31 msgid "Return-key does not insert new line on commit" msgstr "回车提交时不插入新行" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/po/zh_TW.po new/fcitx-skk-0.1.2/po/zh_TW.po --- old/fcitx-skk-0.1.1/po/zh_TW.po 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/po/zh_TW.po 2014-12-13 08:39:45.000000000 +0100 @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# BrLi <rainman59118(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev(a)googlegroups.com\n" -"POT-Creation-Date: 2013-10-21 12:00-0400\n" -"PO-Revision-Date: 2013-10-21 16:06+0000\n" -"Last-Translator: Xuetian Weng <wengxt(a)gmail.com>\n" +"POT-Creation-Date: 2014-12-08 12:40+0900\n" +"PO-Revision-Date: 2014-12-08 05:03+0000\n" +"Last-Translator: csslayer <wengxt(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/fcitx/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,71 +20,71 @@ #: gui/adddictdialog.cpp:35 msgid "&Type:" -msgstr "" +msgstr "類型(&T)：" #: gui/adddictdialog.cpp:36 msgid "&Path:" -msgstr "" +msgstr "路徑(&P)：" #: gui/adddictdialog.cpp:37 msgid "&Host:" -msgstr "" +msgstr "主機(&H)：" #: gui/adddictdialog.cpp:38 msgid "&Port:" -msgstr "" +msgstr "埠口(&P)：" #: gui/adddictdialog.cpp:39 msgid "System" -msgstr "" +msgstr "系統" #: gui/adddictdialog.cpp:40 msgid "User" -msgstr "" +msgstr "使用者" #: gui/adddictdialog.cpp:41 msgid "Server" -msgstr "" +msgstr "伺服器" #: gui/adddictdialog.cpp:101 gui/adddictdialog.cpp:113 msgid "Select Dictionary File" -msgstr "" +msgstr "選擇字典檔案" #: gui/dictwidget.cpp:34 msgid "&Rule:" -msgstr "" +msgstr "按鍵方案(&R)：" #: gui/dictwidget.cpp:61 msgid "Dictionary Manager" -msgstr "" +msgstr "字典管理員" -#: src/skk.c:93 src/fcitx-skk.desc:16 +#: src/skk.c:95 src/fcitx-skk.desc:16 msgid "Hiragana" -msgstr "" +msgstr "平假名" -#: src/skk.c:94 src/fcitx-skk.desc:17 +#: src/skk.c:96 src/fcitx-skk.desc:17 msgid "Katakana" -msgstr "" +msgstr "片假名" -#: src/skk.c:95 src/fcitx-skk.desc:18 +#: src/skk.c:97 src/fcitx-skk.desc:18 msgid "Half width Katakana" -msgstr "" +msgstr "半形片假名" -#: src/skk.c:96 src/fcitx-skk.desc:7 +#: src/skk.c:98 src/fcitx-skk.desc:7 msgid "Latin" -msgstr "" +msgstr "英文" -#: src/skk.c:97 src/fcitx-skk.desc:8 src/fcitx-skk.desc:20 +#: src/skk.c:99 src/fcitx-skk.desc:8 src/fcitx-skk.desc:20 msgid "Wide latin" -msgstr "" +msgstr "全形英文" -#: src/skk.c:438 src/fcitx-skk.conf.in:3 src/skk.conf.in:3 +#: src/skk.c:440 src/fcitx-skk.conf.in:3 src/skk.conf.in:3 msgid "Skk" msgstr "Skk" -#: src/skk.c:464 +#: src/skk.c:466 msgid "Input Mode" -msgstr "" +msgstr "輸入模式" #: src/fcitx-skk.conf.in:4 msgid "Skk Input Method For Fcitx" @@ -91,62 +92,78 @@ #: src/fcitx-skk.conf.in:9 msgid "Dictionary and Rule" -msgstr "" +msgstr "字典與規則" #: src/fcitx-skk.desc:1 src/fcitx-skk.desc:11 src/fcitx-skk.desc:22 #: src/fcitx-skk.desc:29 src/fcitx-skk.desc:34 src/fcitx-skk.desc:43 -#: src/fcitx-skk.desc:50 +#: src/fcitx-skk.desc:50 src/fcitx-skk.desc:55 msgid "General" -msgstr "" +msgstr "一般" #: src/fcitx-skk.desc:3 msgid "Punctuation Style" -msgstr "" +msgstr "標點風格" #: src/fcitx-skk.desc:6 msgid "Japanese" -msgstr "" +msgstr "日語" #: src/fcitx-skk.desc:9 msgid "Wide latin Japanese" -msgstr "" +msgstr "全形拉丁日語" #: src/fcitx-skk.desc:13 msgid "Initial Input Mode" -msgstr "" +msgstr "初始輸入模式" #: src/fcitx-skk.desc:19 msgid "Direct input" -msgstr "" +msgstr "直接輸入" #: src/fcitx-skk.desc:24 msgid "Page size" -msgstr "" +msgstr "頁面大小" #: src/fcitx-skk.desc:31 msgid "Return-key does not insert new line on commit" -msgstr "" +msgstr "確認送出時 Enter 鍵不輸入新行" #: src/fcitx-skk.desc:36 msgid "Candidate List Layout" -msgstr "" +msgstr "候選詞清單" #: src/fcitx-skk.desc:38 msgid "Global" -msgstr "" +msgstr "全域" #: src/fcitx-skk.desc:39 msgid "Vertical" -msgstr "" +msgstr "縱向" #: src/fcitx-skk.desc:40 msgid "Horizontal" -msgstr "" +msgstr "橫向" #: src/fcitx-skk.desc:45 msgid "Number candidate of Triggers To Show Candidate Window" -msgstr "" +msgstr "觸發顯示候選字視窗的按鍵次數" #: src/fcitx-skk.desc:52 msgid "Show Annotation" +msgstr "顯示注釋" + +#: src/fcitx-skk.desc:57 +msgid "Keys to Select from Candidate Window" +msgstr "" + +#: src/fcitx-skk.desc:59 +msgid "Digit (0,1,2,...)" +msgstr "" + +#: src/fcitx-skk.desc:60 +msgid "ABC (a,b,c,...)" +msgstr "" + +#: src/fcitx-skk.desc:61 +msgid "Qwerty Center Row (a,s,d,...)" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/src/fcitx-skk.desc new/fcitx-skk-0.1.2/src/fcitx-skk.desc --- old/fcitx-skk-0.1.1/src/fcitx-skk.desc 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/src/fcitx-skk.desc 2014-12-13 08:39:45.000000000 +0100 @@ -52,5 +52,15 @@ Description=Show Annotation DefaultValue=True +[General/CandidateChooseKey] +Type=Enum +Description=Keys to Select from Candidate Window +EnumCount=3 +Enum0=Digit (0,1,2,...) +Enum1=ABC (a,b,c,...) +Enum2=Qwerty Center Row (a,s,d,...) +DefaultValue=Digit (0,1,2,...) + + [DescriptionFile] LocaleDomain=fcitx-skk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/src/skk-config.c new/fcitx-skk-0.1.2/src/skk-config.c --- old/fcitx-skk-0.1.1/src/skk-config.c 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/src/skk-config.c 2014-12-13 08:39:45.000000000 +0100 @@ -27,4 +27,5 @@ CONFIG_BINDING_REGISTER("General", "NTriggersToShowCandWin", nTriggersToShowCandWin) CONFIG_BINDING_REGISTER("General", "ShowAnnotation", showAnnotation) CONFIG_BINDING_REGISTER("General", "EggLikeNewLine", eggLikeNewLine) +CONFIG_BINDING_REGISTER("General", "CandidateChooseKey", candidateChooseKey) /* candidate selection keys */ CONFIG_BINDING_END() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/src/skk.c new/fcitx-skk-0.1.2/src/skk.c --- old/fcitx-skk-0.1.1/src/skk.c 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/src/skk.c 2014-12-13 08:39:45.000000000 +0100 @@ -630,7 +630,20 @@ FcitxInputState* input = FcitxInstanceGetInputState(skk->owner); FcitxCandidateWordList* candList = FcitxInputStateGetCandidateList(input); SkkCandidateList* skkCandList = skk_context_get_candidates(skk->context); - FcitxCandidateWordSetChoose(candList, DIGIT_STR_CHOOSE); + switch (skk->config.candidateChooseKey){ + case ChooseABCD: + FcitxCandidateWordSetChoose(candList, ABCD_STR_CHOOSE); + break; + case ChooseASDF: + FcitxCandidateWordSetChoose(candList, ASDF_STR_CHOOSE); + break; + case ChooseDigit: +// FALL THRU + default: + FcitxCandidateWordSetChoose(candList, DIGIT_STR_CHOOSE); + break; + } + FcitxCandidateWordSetPageSize(candList, skk->config.pageSize); FcitxCandidateWordSetLayoutHint(candList, skk->config.candidateLayout); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-skk-0.1.1/src/skk.h new/fcitx-skk-0.1.2/src/skk.h --- old/fcitx-skk-0.1.1/src/skk.h 2014-02-04 14:17:26.000000000 +0100 +++ new/fcitx-skk-0.1.2/src/skk.h 2014-12-13 08:39:45.000000000 +0100 @@ -33,6 +33,15 @@ #define _(x) dgettext("fcitx-skk", x) #define N_(x) (x) +#define ABCD_STR_CHOOSE "abcdefghij" +#define ASDF_STR_CHOOSE "asdfghjkl;" + +typedef enum _FcitxSkkChooseKeyType { + ChooseDigit, + ChooseABCD, + ChooseASDF +} FcitxSkkChooseKeyType; + typedef struct _FcitxSkkConfig { FcitxGenericConfig gconfig; SkkPeriodStyle punctuationStyle; @@ -42,6 +51,7 @@ int pageSize; boolean showAnnotation; boolean eggLikeNewLine; + FcitxSkkChooseKeyType candidateChooseKey; } FcitxSkkConfig; typedef struct {

1 0

commit libqt5-qtct for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '15

01 Jun '15

Hello community, here is the log from the commit of package libqt5-qtct for openSUSE:Factory checked in at 2015-06-01 09:54:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtct (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtct.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtct" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtct/libqt5-qtct.changes 2015-05-15 07:44:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtct.new/libqt5-qtct.changes 2015-06-01 09:54:30.000000000 +0200 @@ -1,0 +2,7 @@ +Sat May 30 12:21:42 UTC 2015 - sor.alexei(a)meowr.ru + +- Update to 0.12: + * Fix infinite loop in the icon theme parser. + * Add Chinese Simplified translation. + +------------------------------------------------------------------- Old: ---- qt5ct-0.11.tar.bz2 New: ---- qt5ct-0.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtct.spec ++++++ --- /var/tmp/diff_new_pack.aH1L4O/_old 2015-06-01 09:54:31.000000000 +0200 +++ /var/tmp/diff_new_pack.aH1L4O/_new 2015-06-01 09:54:31.000000000 +0200 @@ -18,7 +18,7 @@ %define _name qt5ct Name: libqt5-qtct -Version: 0.11 +Version: 0.12 Release: 0 Summary: Qt5 Configuration Tool License: BSD-2-Clause ++++++ qt5ct-0.11.tar.bz2 -> qt5ct-0.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.11/AUTHORS new/qt5ct-0.12/AUTHORS --- old/qt5ct-0.11/AUTHORS 2015-05-12 20:09:55.000000000 +0200 +++ new/qt5ct-0.12/AUTHORS 2015-05-21 10:00:04.000000000 +0200 @@ -5,6 +5,7 @@ Translators: Bulgarian - Kiril Kirilov + Chinese (Simplified) - Cary Tian Chinese (Taiwan) - Jeff Huang Czech - fri Greek - Dimitrios Glentadakis diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.11/ChangeLog new/qt5ct-0.12/ChangeLog --- old/qt5ct-0.11/ChangeLog 2015-05-12 20:09:55.000000000 +0200 +++ new/qt5ct-0.12/ChangeLog 2015-05-21 10:00:04.000000000 +0200 @@ -69,3 +69,7 @@ * fixed fonts.conf generation * fixed segmentation fault on "widget-less" applications * updated German translation (Ettore Atalan) + +Version 0.12 +* added Chinese Simplified translation (Cary Tian) +* fixed infinite loop in the icon theme parser (Sergey A. Sukiyazov) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.11/ChangeLog.svn new/qt5ct-0.12/ChangeLog.svn --- old/qt5ct-0.11/ChangeLog.svn 2015-05-12 20:09:55.000000000 +0200 +++ new/qt5ct-0.12/ChangeLog.svn 2015-05-21 10:00:04.000000000 +0200 @@ -1,4 +1,37 @@ ------------------------------------------------------------------------ +r168 | trialuser02 | 2015-05-21 10:58:21 +0300 (Чт., 21 мая 2015) | 1 line + +updated .ts files +------------------------------------------------------------------------ +r167 | trialuser02 | 2015-05-21 10:56:51 +0300 (Чт., 21 мая 2015) | 1 line + +fixed changelog +------------------------------------------------------------------------ +r166 | trialuser02 | 2015-05-20 23:02:25 +0300 (Ср., 20 мая 2015) | 1 line + +fixed qt5ct.desktop +------------------------------------------------------------------------ +r165 | trialuser02 | 2015-05-20 22:59:32 +0300 (Ср., 20 мая 2015) | 1 line + +updated AUTHORS +------------------------------------------------------------------------ +r164 | trialuser02 | 2015-05-20 22:56:29 +0300 (Ср., 20 мая 2015) | 1 line + +added Chinese Simplified translation (Cary Tian) +------------------------------------------------------------------------ +r163 | trialuser02 | 2015-05-16 21:18:08 +0300 (Сб., 16 мая 2015) | 2 lines + +fixed regression + +------------------------------------------------------------------------ +r162 | trialuser02 | 2015-05-16 10:33:58 +0300 (Сб., 16 мая 2015) | 1 line + +fixed problem in the the IconThemePage::findIcon(..) method (patch by Sergey A. Sukiyazov) (#3) +------------------------------------------------------------------------ +r161 | trialuser02 | 2015-05-12 21:15:43 +0300 (Вт., 12 мая 2015) | 1 line + +version bump +------------------------------------------------------------------------ r157 | trialuser02 | 2015-05-12 21:03:34 +0300 (Вт., 12 мая 2015) | 1 line fixed typo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.11/src/qt5ct/desktop-translations/qt5ct_zh_CN.desktop.in new/qt5ct-0.12/src/qt5ct/desktop-translations/qt5ct_zh_CN.desktop.in --- old/qt5ct-0.11/src/qt5ct/desktop-translations/qt5ct_zh_CN.desktop.in 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5ct-0.12/src/qt5ct/desktop-translations/qt5ct_zh_CN.desktop.in 2015-05-21 10:00:04.000000000 +0200 @@ -0,0 +1,22 @@ +[Desktop Entry] +X-Desktop-File-Install-Version=0.11 +Name=Qt5 Settings + +Comment=Qt5 Configuration Tool + + + + + + +Exec=qt5ct +Icon=preferences-desktop-theme +Terminal=false +Type=Application +Categories=Settings;DesktopSettings;Qt; + + +# Translations +Comment[zh_CN]=Qt5 配置工具 +Name[zh_CN]=Qt5 设置 +Icon[zh_CN]=偏好的桌面主题 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.11/src/qt5ct/iconthemepage.cpp new/qt5ct-0.12/src/qt5ct/iconthemepage.cpp --- old/qt5ct-0.11/src/qt5ct/iconthemepage.cpp 2015-05-12 20:09:54.000000000 +0200 +++ new/qt5ct-0.12/src/qt5ct/iconthemepage.cpp 2015-05-21 10:00:04.000000000 +0200 @@ -95,7 +95,7 @@ foreach(QFileInfo info, themeFileList) { - loadTheme(info.absoluteFilePath()); + loadTheme(info.canonicalFilePath()); } } @@ -192,14 +192,16 @@ parents.append("hicolor"); //add fallback themes parents.append("gnome"); + parents.removeDuplicates(); foreach (QString parent, parents) { - QString filePath = QFileInfo(themePath).path() + "/../" + parent + "/index.theme"; - if(!QFile::exists(filePath)) + QString parentThemePath = QDir(QFileInfo(themePath).path() + "/../" + parent).canonicalPath() + "/index.theme"; + + if(!QFile::exists(parentThemePath) || parentThemePath == themePath) continue; - QIcon icon = findIcon(filePath, size, name); + QIcon icon = findIcon(parentThemePath, size, name); if(!icon.isNull()) return icon; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.11/src/qt5ct/qt5ct.desktop new/qt5ct-0.12/src/qt5ct/qt5ct.desktop --- old/qt5ct-0.11/src/qt5ct/qt5ct.desktop 2015-05-12 20:09:54.000000000 +0200 +++ new/qt5ct-0.12/src/qt5ct/qt5ct.desktop 2015-05-21 10:00:04.000000000 +0200 @@ -28,6 +28,9 @@ Comment[pl]=Narzędzie konfiguracji Qt5 Name[pl]=Ustawienia Qt5 +Comment[zh_CN]=Qt5 配置工具 +Name[zh_CN]=Qt5 设置 + Comment[zh_TW]=Qt5 設定工具 Name[zh_TW]=Qt5 設定 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.11/src/qt5ct/qt5ct.h new/qt5ct-0.12/src/qt5ct/qt5ct.h --- old/qt5ct-0.11/src/qt5ct/qt5ct.h 2015-05-12 20:09:54.000000000 +0200 +++ new/qt5ct-0.12/src/qt5ct/qt5ct.h 2015-05-21 10:00:04.000000000 +0200 @@ -30,7 +30,7 @@ #define QT5CT_H #define QT5CT_VERSION_MAJOR 0 -#define QT5CT_VERSION_MINOR 11 +#define QT5CT_VERSION_MINOR 12 #define QT5CT_TOSTRING(s) #s #define QT5CT_STRINGIFY(s) QT5CT_TOSTRING(s) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.11/src/qt5ct/translations/qt5ct_zh_CN.ts new/qt5ct-0.12/src/qt5ct/translations/qt5ct_zh_CN.ts --- old/qt5ct-0.11/src/qt5ct/translations/qt5ct_zh_CN.ts 2015-05-12 20:09:54.000000000 +0200 +++ new/qt5ct-0.12/src/qt5ct/translations/qt5ct_zh_CN.ts 2015-05-21 10:00:04.000000000 +0200 @@ -6,47 +6,47 @@ <message> <location filename="../appearancepage.ui" line="20"/> <source>Style:</source> - <translation type="unfinished"></translation> + <translation>风格：</translation> </message> <message> <location filename="../appearancepage.ui" line="27"/> <source>Preview</source> - <translation type="unfinished"></translation> + <translation>预览</translation> </message> <message> <location filename="../appearancepage.ui" line="34"/> <source>Active palette</source> - <translation type="unfinished"></translation> + <translation>激活状态的调色板</translation> </message> <message> <location filename="../appearancepage.ui" line="39"/> <source>Inactive palette</source> - <translation type="unfinished"></translation> + <translation>非激活状态的调色板</translation> </message> <message> <location filename="../appearancepage.ui" line="44"/> <source>Disabled palette</source> - <translation type="unfinished"></translation> + <translation>失效状态的调色板</translation> </message> <message> <location filename="../appearancepage.ui" line="75"/> <source>Palette</source> - <translation type="unfinished"></translation> + <translation>调色板</translation> </message> <message> <location filename="../appearancepage.ui" line="81"/> <source>Default</source> - <translation type="unfinished"></translation> + <translation>缺省</translation> </message> <message> <location filename="../appearancepage.ui" line="91"/> <source>Custom</source> - <translation type="unfinished"></translation> + <translation>自定义</translation> </message> <message> <location filename="../appearancepage.ui" line="101"/> <source>Change...</source> - <translation type="unfinished"></translation> + <translation>改变调色板</translation> </message> </context> <context> @@ -55,78 +55,78 @@ <location filename="../fontconfigdialog.ui" line="14"/> <location filename="../fontconfigdialog.cpp" line="73"/> <source>Font Configuration</source> - <translation type="unfinished"></translation> + <translation>字体配置</translation> </message> <message> <location filename="../fontconfigdialog.ui" line="29"/> <source>Disable automatic hinting for bold fonts</source> - <translation type="unfinished"></translation> + <translation>禁用粗体自动微调</translation> </message> <message> <location filename="../fontconfigdialog.ui" line="36"/> <source>LCD filter:</source> - <translation type="unfinished"></translation> + <translation>LCD 过滤器：</translation> </message> <message> <location filename="../fontconfigdialog.ui" line="43"/> <source>Automatic hinting</source> - <translation type="unfinished"></translation> + <translation>自动微调</translation> </message> <message> <location filename="../fontconfigdialog.ui" line="50"/> <source>Hinting</source> - <translation type="unfinished"></translation> + <translation>微调</translation> </message> <message> <location filename="../fontconfigdialog.ui" line="67"/> <source>Font resolution:</source> - <translation type="unfinished"></translation> + <translation>字体分辨率</translation> </message> <message> <location filename="../fontconfigdialog.ui" line="110"/> <source> dpi</source> - <translation type="unfinished"></translation> + <translation>dpi</translation> </message> <message> <location filename="../fontconfigdialog.ui" line="83"/> <source>Subpixel geometry:</source> - <translation type="unfinished"></translation> + <translation>子像素排列：</translation> </message> <message> <location filename="../fontconfigdialog.ui" line="90"/> <source>Antialiasing</source> - <translation type="unfinished"></translation> + <translation>抗锯齿</translation> </message> <message> <location filename="../fontconfigdialog.ui" line="97"/> <source>Hinting style:</source> - <translation type="unfinished"></translation> + <translation>微调风格</translation> </message> <message> <location filename="../fontconfigdialog.cpp" line="42"/> <location filename="../fontconfigdialog.cpp" line="47"/> <source>None</source> - <translation type="unfinished"></translation> + <translation>无</translation> </message> <message> <location filename="../fontconfigdialog.cpp" line="43"/> <source>Slight</source> - <translation type="unfinished"></translation> + <translation>轻微</translation> </message> <message> <location filename="../fontconfigdialog.cpp" line="44"/> <source>Medium</source> - <translation type="unfinished"></translation> + <translation>中等</translation> </message> <message> <location filename="../fontconfigdialog.cpp" line="45"/> <source>Full</source> - <translation type="unfinished"></translation> + <translation>全部</translation> </message> <message> <location filename="../fontconfigdialog.cpp" line="74"/> <source>%1 already exists. Do you want to replace it?</source> - <translation type="unfinished"></translation> + <translation>%1 已经存在。您想要取代它吗？</translation> </message> </context> <context> @@ -137,37 +137,37 @@ <location filename="../fontspage.ui" line="80"/> <location filename="../fontspage.ui" line="87"/> <source>...</source> - <translation type="unfinished"></translation> + <translation>...</translation> </message> <message> <location filename="../fontspage.ui" line="57"/> <source>General:</source> - <translation type="unfinished"></translation> + <translation>一般：</translation> </message> <message> <location filename="../fontspage.ui" line="94"/> <source>Fixed width:</source> - <translation type="unfinished"></translation> + <translation>固定宽度：</translation> </message> <message> <location filename="../fontspage.ui" line="119"/> <source>Create fonts.conf</source> - <translation type="unfinished"></translation> + <translation>创建 fonts.conf</translation> </message> <message> <location filename="../fontspage.ui" line="126"/> <source>Remove fonts.conf</source> - <translation type="unfinished"></translation> + <translation>移除 fonts.conf</translation> </message> <message> <location filename="../fontspage.cpp" line="111"/> <source>Remove Font Configuration</source> - <translation type="unfinished"></translation> + <translation>移除字体配置</translation> </message> <message> <location filename="../fontspage.cpp" line="112"/> <source>Are you sure you want to delete %1?</source> - <translation type="unfinished"></translation> + <translation>您确定要删除%1吗？</translation> </message> </context> <context> @@ -175,33 +175,33 @@ <message> <location filename="../interfacepage.ui" line="22"/> <source>Double click interval:</source> - <translation type="unfinished"></translation> + <translation>双击间隔：</translation> </message> <message> <location filename="../interfacepage.ui" line="29"/> <source>Cursor flash time:</source> - <translation type="unfinished"></translation> + <translation>光标闪烁间隔：</translation> </message> <message> <location filename="../interfacepage.ui" line="36"/> <source>ComboBox effect:</source> - <translation type="unfinished"></translation> + <translation>下拉框效果：</translation> </message> <message> <location filename="../interfacepage.ui" line="43"/> <source>ToolTip effect:</source> - <translation type="unfinished"></translation> + <translation>提示效果：</translation> </message> <message> <location filename="../interfacepage.ui" line="50"/> <source>ToolBox effect:</source> - <translation type="unfinished"></translation> + <translation>工具箱效果：</translation> </message> <message> <location filename="../interfacepage.ui" line="57"/> <location filename="../interfacepage.ui" line="67"/> <source> ms</source> - <translation type="unfinished"></translation> + <translation>毫秒</translation> </message> <message> <location filename="../interfacepage.ui" line="81"/> @@ -209,7 +209,7 @@ <location filename="../interfacepage.ui" line="120"/> <location filename="../interfacepage.ui" line="144"/> <source>Disable</source> - <translation type="unfinished"></translation> + <translation>禁用</translation> </message> <message> <location filename="../interfacepage.ui" line="86"/> @@ -217,28 +217,28 @@ <location filename="../interfacepage.ui" line="125"/> <location filename="../interfacepage.ui" line="149"/> <source>Animate</source> - <translation type="unfinished"></translation> + <translation>动画</translation> </message> <message> <location filename="../interfacepage.ui" line="108"/> <location filename="../interfacepage.ui" line="154"/> <source>Fade</source> - <translation type="unfinished"></translation> + <translation>阴影</translation> </message> <message> <location filename="../interfacepage.ui" line="133"/> <source>Menu effect:</source> - <translation type="unfinished"></translation> + <translation>菜单效果：</translation> </message> <message> <location filename="../interfacepage.ui" line="162"/> <source>Enable gui effects</source> - <translation type="unfinished"></translation> + <translation>启用GUI效果</translation> </message> <message> <location filename="../interfacepage.ui" line="169"/> <source>Dialog buttons layout:</source> - <translation type="unfinished"></translation> + <translation>对话框按钮布局：</translation> </message> </context> <context> @@ -246,37 +246,37 @@ <message> <location filename="../mainwindow.ui" line="14"/> <source>Qt5 Configuration Tool</source> - <translation type="unfinished"></translation> + <translation>Qt5 配置工具</translation> </message> <message> <location filename="../mainwindow.cpp" line="45"/> <source>Appearance</source> - <translation type="unfinished"></translation> + <translation>外观</translation> </message> <message> <location filename="../mainwindow.cpp" line="46"/> <source>Fonts</source> - <translation type="unfinished"></translation> + <translation>字体</translation> </message> <message> <location filename="../mainwindow.cpp" line="47"/> <source>Icon Theme</source> - <translation type="unfinished"></translation> + <translation>图标主题</translation> </message> <message> <location filename="../mainwindow.cpp" line="48"/> <source>Interface</source> - <translation type="unfinished"></translation> + <translation>界面</translation> </message> <message> <location filename="../mainwindow.cpp" line="50"/> <source>Style Sheets</source> - <translation type="unfinished"></translation> + <translation>样式表</translation> </message> <message> <location filename="../mainwindow.cpp" line="58"/> <source>Version: %1</source> - <translation type="unfinished"></translation> + <translation>版本：%1</translation> </message> </context> <context> @@ -284,142 +284,142 @@ <message> <location filename="../paletteeditdialog.ui" line="14"/> <source>Palette Editor</source> - <translation type="unfinished"></translation> + <translation>调色板编辑器</translation> </message> <message> <location filename="../paletteeditdialog.ui" line="43"/> <source>Reset palette</source> - <translation type="unfinished"></translation> + <translation>重置调色板</translation> </message> <message> <location filename="../paletteeditdialog.ui" line="29"/> <source>Build inactive palette</source> - <translation type="unfinished"></translation> + <translation>构建非激活的调色板</translation> </message> <message> <location filename="../paletteeditdialog.ui" line="36"/> <source>Build disabled palette</source> - <translation type="unfinished"></translation> + <translation>构建禁用状态调色板</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="47"/> <source>Active</source> - <translation type="unfinished"></translation> + <translation>激活</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="47"/> <source>Inactive</source> - <translation type="unfinished"></translation> + <translation>非激活</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="47"/> <source>Disabled</source> - <translation type="unfinished"></translation> + <translation>已禁用</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="86"/> <source>Dark</source> - <translation type="unfinished"></translation> + <translation>暗</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="86"/> <source>Window text</source> - <translation type="unfinished"></translation> + <translation>窗口文字</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="86"/> <source>Button background</source> - <translation type="unfinished"></translation> + <translation>按钮背景</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="86"/> <source>Bright</source> - <translation type="unfinished"></translation> + <translation>亮</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="86"/> <source>Less bright</source> - <translation type="unfinished"></translation> + <translation>较不亮</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="86"/> <source>Less dark</source> - <translation type="unfinished"></translation> + <translation>较不暗</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="87"/> <source>Window</source> - <translation type="unfinished"></translation> + <translation>窗口</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="87"/> <source>Shadow</source> - <translation type="unfinished"></translation> + <translation>阴影</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="87"/> <source>Bright text</source> - <translation type="unfinished"></translation> + <translation>亮文字</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="87"/> <source>Button text</source> - <translation type="unfinished"></translation> + <translation>按钮文字</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="87"/> <source>Normal text</source> - <translation type="unfinished"></translation> + <translation>普通文字</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="87"/> <source>Normal background</source> - <translation type="unfinished"></translation> + <translation>普通背景</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="88"/> <source>Highlight</source> - <translation type="unfinished"></translation> + <translation>高亮</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="88"/> <source>Highlighted text</source> - <translation type="unfinished"></translation> + <translation>高亮文字</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="88"/> <source>Visited link</source> - <translation type="unfinished"></translation> + <translation>已访问的链接</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="89"/> <source>Default</source> - <translation type="unfinished"></translation> + <translation>缺省</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="89"/> <source>Tooltip background</source> - <translation type="unfinished"></translation> + <translation>提示语背景</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="89"/> <source>Tooltip text</source> - <translation type="unfinished"></translation> + <translation>提示语文字</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="88"/> <source>Link</source> - <translation type="unfinished"></translation> + <translation>链接</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="89"/> <source>Alternate background</source> - <translation type="unfinished"></translation> + <translation>备用背景</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="95"/> <source>Select Color</source> - <translation type="unfinished"></translation> + <translation>选择颜色</translation> </message> </context> <context> @@ -427,32 +427,32 @@ <message> <location filename="../previewform.ui" line="14"/> <source>Preview Window</source> - <translation type="unfinished"></translation> + <translation>预览窗口</translation> </message> <message> <location filename="../previewform.ui" line="24"/> <source>Tab 1</source> - <translation type="unfinished"></translation> + <translation>页面1</translation> </message> <message> <location filename="../previewform.ui" line="30"/> <source>PushButton</source> - <translation type="unfinished"></translation> + <translation>按钮</translation> </message> <message> <location filename="../previewform.ui" line="51"/> <source>Tab 2</source> - <translation type="unfinished"></translation> + <translation>页面2</translation> </message> <message> <location filename="../previewform.ui" line="57"/> <source>RadioButton</source> - <translation type="unfinished"></translation> + <translation>单选按钮</translation> </message> <message> <location filename="../previewform.ui" line="64"/> <source>CheckBox</source> - <translation type="unfinished"></translation> + <translation>复选框</translation> </message> </context> <context> @@ -460,12 +460,12 @@ <message> <location filename="../qsseditordialog.cpp" line="43"/> <source>%1 - Style Sheet Editor</source> - <translation type="unfinished"></translation> + <translation>%1 - 样式表编辑器</translation> </message> <message> <location filename="../qsseditordialog.ui" line="14"/> <source>Style Sheet Editor</source> - <translation type="unfinished"></translation> + <translation>样式表编辑器</translation> </message> </context> <context> @@ -473,77 +473,77 @@ <message> <location filename="../qsspage.ui" line="23"/> <source>Create</source> - <translation type="unfinished"></translation> + <translation>新建</translation> </message> <message> <location filename="../qsspage.ui" line="66"/> <location filename="../qsspage.cpp" line="51"/> <source>Edit</source> - <translation type="unfinished"></translation> + <translation>编辑</translation> </message> <message> <location filename="../qsspage.ui" line="76"/> <location filename="../qsspage.cpp" line="52"/> <source>Rename</source> - <translation type="unfinished"></translation> + <translation>重命名</translation> </message> <message> <location filename="../qsspage.ui" line="33"/> <location filename="../qsspage.cpp" line="54"/> <source>Remove</source> - <translation type="unfinished"></translation> + <translation>删除</translation> </message> <message> <location filename="../qsspage.cpp" line="97"/> <source>File name:</source> - <translation type="unfinished"></translation> + <translation>文件名：</translation> </message> <message> <location filename="../qsspage.cpp" line="97"/> <source>Enter Style Sheet Name</source> - <translation type="unfinished"></translation> + <translation>输入样式表名称</translation> </message> <message> <location filename="../qsspage.cpp" line="108"/> <location filename="../qsspage.cpp" line="200"/> <location filename="../qsspage.cpp" line="211"/> <source>Error</source> - <translation type="unfinished"></translation> + <translation>错误</translation> </message> <message> <location filename="../qsspage.cpp" line="108"/> <source>The file "%1" already exists</source> - <translation type="unfinished"></translation> + <translation>文件 “%1” 已经存在</translation> </message> <message> <location filename="../qsspage.cpp" line="142"/> <source>Confirm Remove</source> - <translation type="unfinished"></translation> + <translation>确定删除</translation> </message> <message> <location filename="../qsspage.cpp" line="143"/> <source>Are you shure you want to remove style sheet "%1"?</source> - <translation type="unfinished"></translation> + <translation>您确定要删除样式表 “%1” 吗？</translation> </message> <message> <location filename="../qsspage.cpp" line="193"/> <source>Rename Style Sheet</source> - <translation type="unfinished"></translation> + <translation>重命名样式表</translation> </message> <message> <location filename="../qsspage.cpp" line="193"/> <source>Style sheet name:</source> - <translation type="unfinished"></translation> + <translation>样式表名称：</translation> </message> <message> <location filename="../qsspage.cpp" line="200"/> <source>The style sheet "%1" already exists</source> - <translation type="unfinished"></translation> + <translation>样式表 “%1” 已经存在</translation> </message> <message> <location filename="../qsspage.cpp" line="211"/> <source>Unable to rename file</source> - <translation type="unfinished"></translation> + <translation>无法重命名文件</translation> </message> </context> </TS>

1 0

commit blueberry for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '15

01 Jun '15

Hello community, here is the log from the commit of package blueberry for openSUSE:Factory checked in at 2015-06-01 09:54:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blueberry (Old) and /work/SRC/openSUSE:Factory/.blueberry.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "blueberry" Changes: -------- --- /work/SRC/openSUSE:Factory/blueberry/blueberry.changes 2015-04-02 16:03:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.blueberry.new/blueberry.changes 2015-06-01 09:54:12.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 29 23:12:49 UTC 2015 - sor.alexei(a)meowr.ru + +- Update to 1.0.7 (changes since 1.0.4): + * List rfkill dependency. + +------------------------------------------------------------------- Old: ---- blueberry-1.0.4.tar.gz New: ---- blueberry-1.0.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blueberry.spec ++++++ --- /var/tmp/diff_new_pack.Wyugfj/_old 2015-06-01 09:54:13.000000000 +0200 +++ /var/tmp/diff_new_pack.Wyugfj/_new 2015-06-01 09:54:13.000000000 +0200 @@ -17,7 +17,7 @@ Name: blueberry -Version: 1.0.4 +Version: 1.0.7 Release: 0 Summary: A configuration tool for Bluetooth License: GPL-3.0+ @@ -30,6 +30,7 @@ BuildRequires: python >= 2.4 BuildRequires: update-desktop-files Requires: gnome-bluetooth >= 3.14 +Requires: rfkill Requires: wmctrl Recommends: %{name}-lang = %{version} BuildArch: noarch ++++++ blueberry-1.0.4.tar.gz -> blueberry-1.0.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.0.4/debian/changelog new/blueberry-1.0.7/debian/changelog --- old/blueberry-1.0.4/debian/changelog 2015-03-31 12:20:30.000000000 +0200 +++ new/blueberry-1.0.7/debian/changelog 2015-05-29 10:12:16.000000000 +0200 @@ -1,3 +1,22 @@ +blueberry (1.0.7) betsy; urgency=medium + + [ monsta ] + * add rfkill dependency + + -- Clement Lefebvre <root(a)linuxmint.com> Fri, 29 May 2015 10:11:45 +0200 + +blueberry (1.0.6) betsy; urgency=medium + + * Packaging: Replaces cinnamon-bluetooth + + -- Clement Lefebvre <root(a)linuxmint.com> Thu, 07 May 2015 16:21:48 +0200 + +blueberry (1.0.5) betsy; urgency=medium + + * Packaging: Break cinnamon-bluetooth + + -- Clement Lefebvre <root(a)linuxmint.com> Thu, 07 May 2015 15:53:15 +0200 + blueberry (1.0.4) betsy; urgency=medium [ Michael Webster ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.0.4/debian/control new/blueberry-1.0.7/debian/control --- old/blueberry-1.0.4/debian/control 2015-03-31 12:20:30.000000000 +0200 +++ new/blueberry-1.0.7/debian/control 2015-05-29 10:12:16.000000000 +0200 @@ -7,6 +7,8 @@ Package: blueberry Architecture: all -Depends: python (>= 2.4), python (<< 3), gnome-bluetooth, gir1.2-gnomebluetooth-1.0, wmctrl +Depends: python (>= 2.4), python (<< 3), gnome-bluetooth, gir1.2-gnomebluetooth-1.0, rfkill, wmctrl +Breaks: cinnamon-bluetooth +Replaces: cinnamon-bluetooth Description: A configuration tool for Bluetooth Configure Bluetooth devices.

1 0

commit collectl for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '15

01 Jun '15

Hello community, here is the log from the commit of package collectl for openSUSE:Factory checked in at 2015-06-01 09:53:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/collectl (Old) and /work/SRC/openSUSE:Factory/.collectl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "collectl" Changes: -------- --- /work/SRC/openSUSE:Factory/collectl/collectl.changes 2015-04-25 11:25:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.collectl.new/collectl.changes 2015-06-01 09:53:54.000000000 +0200 @@ -1,0 +2,13 @@ +Thu May 28 18:34:49 UTC 2015 - tabraham(a)suse.com + +- Update to 4.0.2 + * add /bin/bash to list of 'known shells' excluded from output with + --procopt k + * generalize ethernet network device name to include ALL names + matching type 'p\dp' so we pick up p2p, p3p, p4p... [thanks Matt] + * collect nr_shmem so we can track shared memory, apparently something + I thought of but never acted on [thanks Christian] + * do not include guest cpu metrics in totals since already accounted + for in user time + +------------------------------------------------------------------- Old: ---- collectl-4.0.0.src.tar.gz New: ---- collectl-4.0.2.src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ collectl.spec ++++++ --- /var/tmp/diff_new_pack.6MBDHt/_old 2015-06-01 09:53:55.000000000 +0200 +++ /var/tmp/diff_new_pack.6MBDHt/_new 2015-06-01 09:53:55.000000000 +0200 @@ -17,7 +17,7 @@ Name: collectl -Version: 4.0.0 +Version: 4.0.2 Release: 0 Summary: Collects data that describes the current system status License: Artistic-1.0 and GPL-2.0+ ++++++ collectl-4.0.0.src.tar.gz -> collectl-4.0.2.src.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/collectl-4.0.0/RELEASE-collectl new/collectl-4.0.2/RELEASE-collectl --- old/collectl-4.0.0/RELEASE-collectl 2015-03-10 20:52:21.000000000 +0100 +++ new/collectl-4.0.2/RELEASE-collectl 2015-05-27 15:02:55.000000000 +0200 @@ -13,24 +13,13 @@ Configure to start on boot - In both cases, collectl will not be configured to start on boot - but can easily be set to do so with the command: + On RedHat based installations, collectl will not be configured to start + on boot, but can easily be set to do so with the command: chkconfig collectl on KNOWN PROBLEMS/RESTRICTIONS - - There is a known problem with older perl Time::HiRes modules, newer - versions of glibc and colletcl intervals of 1 second or greater (see - http://collectl.sourceforge.net/HiResTime.html for more details) that - can result in 'setitimer' messages being logged at system startup when - collectl has been configured to run as a daemon. these messages appear - to benign, but be sure to let someone know if that proves not to be the - case. If collectl determines your system has this mismatch, it will - report it as a warning in collectl's message file in /var/log/collectl - every time it starts as a daemon. If you choose, you can easily turn - off the checking by editing the entry at the bottom of /etc/collectl.conf - named TimeHiResCheck and setting it to 0. - if system time is changed by more then the log rolling frequency after collectl starts, multiple log files will be created during the next polling cycle(s) @@ -38,6 +27,31 @@ COLLECTL CHANGES +4.0.2 May 27, 2015 + - add /bin/bash to list of 'known shells' excluded from output with + --procopt k + - generalize ethernet network device name to include ALL names + matching type 'p\dp' so we pick up p2p, p3p, p4p... [thanks Matt] + - collect nr_shmem so we can track shared memory, apparently something + I thought of but never acted on [thanks Christian] + - do not include guest cpu metrics in totals since already accounted + for in user time + +4.0.1 + - change /usr/sbin to /usr/bin in init.d/collectl [thanks Ladislav] + - pattern match to exclude partitions from disk summary is WRONG and + we need to make sure name doesn't match cciss disks like c0d0! + [thanks, Laurent] + - changed help text for -retaddr to NOT use 'use' preceding -deb because + rpmbuild gets confused ang tries to include '-deb' as a dependency + [thanks dan] + - include 'en' network devices in summary data [thanks homerl] + - change buddyinfo to deal with less fields in /proc/buddyinfo as apparently + there are not always 11 of them [thanks greg] + - remove lustre from --showsubsys + - removed 'known problem' with older versions of Time::HiRes in these + release notes as that was quite a long time ago + 4.0.0 Mar 9, 2015 - rare, but if selecting processes by parent pid or command name, it's possible when a new pid is seen that it's already exited by the time @@ -56,14 +70,18 @@ COLMUX CHANGES +4.9.0 ??? + - header name printing in single line mode not quite right for all + combinations of switches + 4.8.3 Mar 9, 2015 -- -oT -test wasn't including time column in help output whereas -od and -oD - did [thanks, robbin] -- new switch: -retaddr tells collectl to connect back to this address rather - than the one colmux chooses by default which is default interface's addr -- change in way return address is determined because RHEL 7 changed the - format of the ifconfig output, changing Bcast to broadcast and dropping - addr: [thanks hank] + - -oT -test wasn't including time column in help output whereas -od and -oD + did [thanks, robbin] + - new switch: -retaddr tells collectl to connect back to this address rather + than the one colmux chooses by default which is default interface's addr + - change in way return address is determined because RHEL 7 changed the + format of the ifconfig output, changing Bcast to broadcast and dropping + addr: [thanks hank] PRE-4.0 COLLECTL CHANGES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/collectl-4.0.0/collectl new/collectl-4.0.2/collectl --- old/collectl-4.0.0/collectl 2015-03-10 20:52:21.000000000 +0100 +++ new/collectl-4.0.2/collectl 2015-05-27 15:02:55.000000000 +0200 @@ -111,7 +111,7 @@ $rootFlag=(!$PcFlag && `whoami`=~/root/) ? 1 : 0; $SrcArch= $Config{"archname"}; -$Version= '4.0.0-1'; +$Version= '4.0.2-1'; $Copyright='Copyright 2003-2015 Hewlett-Packard Development Company, L.P.'; $License= "collectl may be copied only under the terms of either the Artistic License\n"; $License.= "or the GNU General Public License, which may be found in the source kit"; @@ -3841,7 +3841,7 @@ # Memory elsif ($type==5) { - next if $line=~/^nr/; + next if $line=~/^nr/ && $line!~/^nr_sh/; next if $line=~/^numa/; last if $memOpts!~/[ps]/ && $line=~/^pgre/; # ignore from pgrefill forward last if $memOpts!~/s/ && $line=~/^pgst/; # ignore from pgstead forward @@ -6367,7 +6367,6 @@ f - nfs i - inodes j - interrupts by CPU - l - lustre m - memory n - network s - sockets @@ -6382,7 +6381,6 @@ E - environmental (fan, power, temp) [requires ipmitool] F - nfs data J - interrupts by CPU by interrupt number - L - lustre M - memory numa/node N - individual Networks T - tcp details (lots of data!) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/collectl-4.0.0/colmux new/collectl-4.0.2/colmux --- old/collectl-4.0.0/colmux 2015-03-10 20:52:21.000000000 +0100 +++ new/collectl-4.0.2/colmux 2015-05-27 15:02:55.000000000 +0200 @@ -65,7 +65,7 @@ my $Collectl='/usr/bin/collectl'; my $Program='colmux'; -my $Version='4.8.3'; +my $Version='4.9.0'; my $Copyright='Copyright 2005-2014 Hewlett-Packard Development Company, L.P.'; my $License="colmux may be copied only under the terms of either the Artistic License\n"; $License.= "or the GNU General Public License, which may be found in the source kit"; @@ -657,10 +657,12 @@ { exit if !reformatHeaders(); + print "LASTHEADER: $lastHeader\n"; foreach my $col (split(/\s+/, $lastHeader)) { # strip detail field names including surrounding []s $col=~s/\[.*\]// if $colnoinstFlag; + print "PUSH: $col\n"; push @headernames, $col; } } @@ -1740,14 +1742,16 @@ $datetime.=' ' if $options=~/m/; my $dtpad=' ' x length($datetime); - # write name of column over each set of hostnames, noting there's an - # extra column for hostname so we need to subtract one + # write name of column over each set of hostnames print $dtpad; for (my $i=0; $i<@columns; $i++) { for (my $j=0; $j<@hostnames; $j++) { - my $col=$columns[$i]-1; + # note that because of the way the header names are stored (which DO include + # a timestamp), we need to skip printing date/timestamps when -o not specified + my $col=($options=~/[TdD]/ || $plotFlag) ? $columns[$i]-1 : $columns[$i]; + if ($j==0) { printf " %-${colwidth}s", @headernames ? $headernames[$col] : '???'; @@ -1784,7 +1788,7 @@ print ' | ' if !$colnodetFlag; for (my $i=0; $i<@columns; $i++) { - my $col=(!$plotFlag) ? $columns[$i] : $columns[$i]-1; + my $col=($plotFlag || $options=~/[TdD]/) ? $columns[$i]-1 : $columns[$i]; printf " %${wider}s", @headernames ? $headernames[$col] : '???'; } } @@ -2338,7 +2342,7 @@ -keepalive secs pass this in the ssh command as '-o ServerAliveInterval=secs' to prevent ssh exiting early from an inactive ssh connection -retaddr addr tell collectl to connect back to this address. - use -deb 1 to see address collectl told to use + start with -deb 1 to see address collectl told to use -timeout secs use this timeout for remote collectl to connect back requires collectl V3.6.4 or better diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/collectl-4.0.0/formatit.ph new/collectl-4.0.2/formatit.ph --- old/collectl-4.0.0/formatit.ph 2015-03-10 20:52:21.000000000 +0100 +++ new/collectl-4.0.2/formatit.ph 2015-05-27 15:02:55.000000000 +0200 @@ -2489,7 +2489,7 @@ $buddyZone[$budIndex]=$fields[3]; $buddyNode[$budIndex]=~s/,$//; - for (my $i=0; $i<11; $i++) + for (my $i=0; $i<scalar(@fields)-4; $i++) { $buddyInfo[$budIndex][$i]=$fields[$i+4]; $buddyInfoTot[$i]+=$fields[$i+4]; @@ -2529,7 +2529,8 @@ $guest= fix($guestNow-$guestLast[$cpuIndex]); $guestN=fix($guestNNow-$guestNLast[$cpuIndex]); - $total=$user+$nice+$sys+$idle+$wait+$irq+$soft+$steal+$guest+$guestN; + # NOTE - guest times already included as part of user times + $total=$user+$nice+$sys+$idle+$wait+$irq+$soft+$steal; $total=100 if $options=~/n/; # when normalizing, this cancels '100*' $total=1 if !$total; # has seen to be 0 when interval=0; @@ -2544,10 +2545,10 @@ $guestP[$cpuIndex]= 100*$guest/$total; $guestNP[$cpuIndex]=100*$guestN/$total; + # guest times already part of user $totlP[$cpuIndex]=$userP[$cpuIndex]+$niceP[$cpuIndex]+ $sysP[$cpuIndex]+$irqP[$cpuIndex]+ - $softP[$cpuIndex]+$stealP[$cpuIndex]+ - $guestP[$cpuIndex]+$guestNP[$cpuIndex]; + $softP[$cpuIndex]+$stealP[$cpuIndex]; $userLast[$cpuIndex]= $userNow; $niceLast[$cpuIndex]= $niceNow; @@ -2604,8 +2605,7 @@ $guestNP[$cpuIndex]/=$cpusUsed; $totlP[$cpuIndex]=$userP[$cpuIndex]+$niceP[$cpuIndex]+ $sysP[$cpuIndex]+$irqP[$cpuIndex]+ - $softP[$cpuIndex]+$stealP[$cpuIndex]+ - $guestP[$cpuIndex]+$guestNP[$cpuIndex]; + $softP[$cpuIndex]+$stealP[$cpuIndex]; } } @@ -3347,9 +3347,11 @@ # Apply filters to summary totals, explicitly ignoring those we don't want if ($diskName!~/^dm-|^psv/ && ($dskFilt eq '' || $diskName!~/$dskFiltIgnore/)) { - # if some explicitly named to keep, keep only those BUT only if not a - # partition or else we end up double counting. - if ($diskName!~/\d$/ && ($dskFiltKeep eq '' || $diskName=~/$dskFiltKeep/)) + # if some disks explicitly named to keep, keep only those BUT only if + # not a partition or else we end up double counting. Note that we're + # doing a lookbehind to make sure not a cciss name like c0d0 which DOES + # look like a partition when in fact it's not. + if ($diskName!~/(?<!c\dd)\d$/ && ($dskFiltKeep eq '' || $diskName=~/$dskFiltKeep/)) { $dskReadTot+= $dskRead[$dskIndex]; $dskReadMrgTot+= $dskReadMrg[$dskIndex]; @@ -3812,7 +3814,7 @@ } } - elsif ($subsys=~/m/i && $type=~/^Buffers|^Cached|^Dirty|^Active|^Inactive|^AnonPages|^Mapped|^Slab:|^Committed_AS:|^Huge|^SUnreclaim|^Mloc/) + elsif ($subsys=~/m/i && $type=~/^Buffers|^Cached|^Dirty|^Active|^Inactive|^AnonPages|^Mapped|^Slab:|^Committed_AS:|^Huge|^SUnreclaim|^Mloc|^nr/) { $data=(split(/\s+/, $data))[0]; $memBuf=$data if $type=~/^Buf/; @@ -3829,6 +3831,7 @@ $memHugeFree=$data if $type=~/^HugePages_F/; $memHugeRsvd=$data if $type=~/^HugePages_R/; $memSUnreclaim=$data if $type=~/^SUnreclaim/; + $memShared=$data*4 if $type=~/^nr_shmem/; # These are 'changes' since last interval, both positive/negative # but we only want to do when last one in list seen. @@ -4157,7 +4160,7 @@ # at least for now, we're only worrying about totals on real network # first, always ignore those in ignore list - if (($netFilt eq '' && $netNameNow=~/^eth|^ib|^em|^p1p/) || + if (($netFilt eq '' && $netNameNow=~/^eth|^ib|^em|^en|^p\dp/) || ($netFiltKeep ne '' && $netNameNow=~/$netFiltKeep/) || ($netFiltIgnore ne '' && $netNameNow!~/$netFiltIgnore/)) { @@ -5847,7 +5850,7 @@ # skip idle CPUs if --cpuopts z specified. I'd rather check for idle==100% but some kernels don't # always increment counts and there are actually idle cpus with values of 0 here. next if $cpuOpts=~/z/ && $userP[$i]+$niceP[$i]+$sysP[$i]+$waitP[$i]+$irqP[$i]+ - $softP[$i]+$stealP[$i]+$guestP[$i]+$guestNP[$i]==0; + $softP[$i]+$stealP[$i]==0; # apply filters if specified next if (@cpuFiltKeep && !defined($cpuFiltKeep[$i])) || @@ -7579,7 +7582,7 @@ # if told to do so, remove some of the known/standard shells from the command string in cmd0; if ($procOpts=~/k/) { - if ($cmd0=~m[/bin/sh|/usr/bin/perl|/usr/bin/python|^python]) + if ($cmd0=~m[/bin/sh|/bin/bash|/usr/bin/perl|/usr/bin/python|^python]) { $cmd1=~s/^-\S+\s+//; # remove optional switch some shells have @@ -8238,7 +8241,7 @@ { $i=$NumCpus; $sysTot=$sysP[$i]+$irqP[$i]+$softP[$i]+$stealP[$i]; - $cpuTot=$userP[$i]+$niceP[$i]+$guestP[$i]+$guestNP[$i]+$sysTot; + $cpuTot=$userP[$i]+$niceP[$i]+$sysTot; $line.=sprintf("%3d %3d %5s %6s ", $cpuTot, $sysTot, cvt($intrpt/$intSecs,5), cvt($ctxt/$intSecs,6)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/collectl-4.0.0/initd/collectl-suse new/collectl-4.0.2/initd/collectl-suse --- old/collectl-4.0.0/initd/collectl-suse 2015-03-10 20:52:21.000000000 +0100 +++ new/collectl-4.0.2/initd/collectl-suse 2015-05-27 15:02:56.000000000 +0200 @@ -34,16 +34,13 @@ [ -r /etc/rc.status ] && . /etc/rc.status rc_reset -COLLECTL=/usr/sbin/collectl +COLLECTL=/usr/bin/collectl if [ ! -f $COLLECTL ]; then echo -n "Cannot find $COLLECTL" rc_status -s rc_exit fi -PATH=/bin:/usr/bin:/sbin:/usr/sbin -export PATH - # Just to make sure nothing is different when running 'collectl', we # won't use --check even though it's probably ok to use all the time. PNAME=collectl

1 0

commit nut for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '15

01 Jun '15

Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2015-06-01 09:53:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nut" Changes: -------- --- /work/SRC/openSUSE:Factory/nut/nut.changes 2014-11-12 00:22:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2015-06-01 09:53:38.000000000 +0200 @@ -1,0 +2,17 @@ +Mon May 18 10:11:40 UTC 2015 - mvyskocil(a)opensuse.org + +- fix https://github.com/networkupstools/nut/issues/200 + * 0001-Restore-systemd-relationship-with-nut-driver-service.patch + +------------------------------------------------------------------- +Fri May 15 15:10:48 UTC 2015 - mvyskocil(a)opensuse.org + +- update to 2.7.3 (bugfixes and new devices support) + see NEWS and UPGRADING in /usr/share/doc/packages/nut +- refreshed patches: + * nut-notifyflag.patch: rename of upsmon.conf.sample.in + * nut-preconfig.patch: rename of upsmon.conf.sample.in + * nut-systemd-dirs.patch: refresh to 2.7.3 +- changed keyring to new key 55CA5976 (Arnaud Quette <arnaud.quette(a)free.fr>) + +------------------------------------------------------------------- Old: ---- nut-2.7.2.tar.gz nut-2.7.2.tar.gz.sig New: ---- 0001-Restore-systemd-relationship-with-nut-driver-service.patch nut-2.7.3.tar.gz nut-2.7.3.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nut.spec ++++++ --- /var/tmp/diff_new_pack.vfktHd/_old 2015-06-01 09:53:39.000000000 +0200 +++ /var/tmp/diff_new_pack.vfktHd/_new 2015-06-01 09:53:39.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package nut # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -59,7 +59,7 @@ Summary: Network UPS Tools Core (Uninterruptible Power Supply Monitoring) License: GPL-2.0+ Group: Hardware/UPS -Version: 2.7.2 +Version: 2.7.3 Release: 0 Url: http://www.networkupstools.org/ Source: http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz @@ -80,6 +80,9 @@ Patch6: nut-udev.patch # PATCH-FIX-UPSTREAM nut-systemd-dirs.patch sbrabec(a)suse.cz -- Fix systemd targets. Patch7: nut-systemd-dirs.patch +# PATCH-FIX-UPSTREAM: nut-server vs nut-drivers relation +# https://github.com/networkupstools/nut/commit/c98fab9f5dec993aa9f5e0a3e79de… +Patch8: 0001-Restore-systemd-relationship-with-nut-driver-service.patch Provides: smartups = %version Obsoletes: smartups < %version Conflicts: apcupsd @@ -212,14 +215,13 @@ %if %suse_version < 1030 %patch6 -R %endif -sed -i "s/@UPSD_USER@/%{USER}/g" upsd.init conf/upsmon.conf.sample +sed -i "s/@UPSD_USER@/%{USER}/g" upsd.init %if %suse_version < 1030 sed -i 's:/usr/lib/pm-utils/functions:/etc/pm/functions:' nut.sleep %endif %patch7 -p1 +%patch8 -p1 sed -i s:/usr/local/ups/bin:/bin: conf/upssched.conf.sample.in -[ -f docs/nut-qa.txt ] -dos2unix docs/nut-qa.txt %build autoreconf -f -i ++++++ 0001-Restore-systemd-relationship-with-nut-driver-service.patch ++++++ >From c98fab9f5dec993aa9f5e0a3e79de53ae9ecd32b Mon Sep 17 00:00:00 2001 From: Arnaud Quette <arnaud.quette(a)free.fr> Date: Thu, 7 May 2015 15:43:17 +0200 Subject: [PATCH 1/2] Restore systemd relationship with nut-driver service The Requires directive from nut-server to nut-driver was previously removed, since it was preventing upsd from starting whenever one or more drivers, among several, was failing to start. Use the Wants directive, a weaker version of Requires, which will start upsd even if the nut-driver unit fails to start. closes https://github.com/networkupstools/nut/issues/200 --- scripts/systemd/nut-server.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/systemd/nut-server.service.in b/scripts/systemd/nut-server.service.in index dada977..fe20145 100644 --- a/scripts/systemd/nut-server.service.in +++ b/scripts/systemd/nut-server.service.in @@ -4,7 +4,7 @@ After=local-fs.target network.target nut-driver.service # We don't Require drivers to be successfully started! This would be # a change of behavior compared to init SysV, and could prevent from # accessing successfully started, at least to audit a system. -#Requires=nut-driver.service +Wants=nut-driver.service Before=nut-monitor.service [Service] -- 2.1.4 ++++++ nut-2.7.2.tar.gz -> nut-2.7.3.tar.gz ++++++ ++++ 35398 lines of diff (skipped) ++++++ nut-notifyflag.patch ++++++ --- /var/tmp/diff_new_pack.vfktHd/_old 2015-06-01 09:53:40.000000000 +0200 +++ /var/tmp/diff_new_pack.vfktHd/_new 2015-06-01 09:53:40.000000000 +0200 @@ -1,5 +1,5 @@ ---- conf/upsmon.conf.sample -+++ conf/upsmon.conf.sample +--- conf/upsmon.conf.sample.in ++++ conf/upsmon.conf.sample.in @@ -243,6 +243,15 @@ # IGNORE - Don't do anything # ++++++ nut-preconfig.patch ++++++ --- /var/tmp/diff_new_pack.vfktHd/_old 2015-06-01 09:53:40.000000000 +0200 +++ /var/tmp/diff_new_pack.vfktHd/_new 2015-06-01 09:53:40.000000000 +0200 @@ -33,8 +33,8 @@ + password = @UPSD_INITIAL_SLAVE_PASSWORD@ + allowfrom = localhost + upsmon slave ---- conf/upsmon.conf.sample -+++ conf/upsmon.conf.sample +--- conf/upsmon.conf.sample.in ++++ conf/upsmon.conf.sample.in @@ -84,6 +84,8 @@ # MONITOR su700(a)server.example.com 1 upsmon secretpass slave # MONITOR myups@localhost 1 upsmon pass master (or slave) ++++++ nut-systemd-dirs.patch ++++++ --- /var/tmp/diff_new_pack.vfktHd/_old 2015-06-01 09:53:40.000000000 +0200 +++ /var/tmp/diff_new_pack.vfktHd/_new 2015-06-01 09:53:40.000000000 +0200 @@ -1,8 +1,8 @@ -Index: nut-2.6.5/configure.ac +Index: nut-2.7.3/configure.ac =================================================================== ---- nut-2.6.5.orig/configure.ac -+++ nut-2.6.5/configure.ac -@@ -986,9 +986,13 @@ dnl Override installation directory, wit +--- nut-2.7.3.orig/configure.ac ++++ nut-2.7.3/configure.ac +@@ -1065,7 +1065,12 @@ dnl Override installation directory, wit dnl prefix. This is needed for 'distcheck*' targets, otherwise dnl files will try to get intalled to the actual system directories if test -n "${systemdsystemunitdir}"; then @@ -14,7 +14,5 @@ + systemdsystemshutdowndir="${systemdsystemunitdir}/system-shutdown" + fi AC_MSG_RESULT(using ${systemdsystemunitdir}) -- systemdsystemunitdir="`echo ${systemdsystemunitdir} | sed 's/\/lib/\${libdir}/'`" else AC_MSG_RESULT(no) - fi ++++++ nut.keyring ++++++ --- /var/tmp/diff_new_pack.vfktHd/_old 2015-06-01 09:53:40.000000000 +0200 +++ /var/tmp/diff_new_pack.vfktHd/_new 2015-06-01 09:53:40.000000000 +0200 @@ -1,14 +1,20 @@ pub 1024D/204DDF1B 2002-07-15 -uid Arnaud Quette <aquette(a)debian.org> -uid Arnaud Quette <aquette.dev(a)gmail.com> -uid Arnaud Quette <arnaud.quette(a)free.fr> -uid Arnaud Quette <arnaud.quette(a)debian.org> -uid Arnaud Quette <arnaud.quette(a)mgeups.com> -uid Arnaud Quette <ArnaudQuette(a)Eaton.com> +uid [ unknown] Arnaud Quette <aquette(a)debian.org> +uid [ unknown] Arnaud Quette <aquette.dev(a)gmail.com> +uid [ unknown] Arnaud Quette <arnaud.quette(a)free.fr> +uid [ unknown] Arnaud Quette <arnaud.quette(a)debian.org> +uid [ unknown] Arnaud Quette <arnaud.quette(a)mgeups.com> +uid [ unknown] Arnaud Quette <ArnaudQuette(a)Eaton.com> sub 1024g/D8B1B6B4 2002-07-15 +pub 4096R/55CA5976 2014-04-22 +uid [ unknown] Arnaud Quette <arnaud.quette(a)free.fr> +uid [ unknown] Arnaud Quette <aquette(a)debian.org> +sub 4096R/F3AA7FEA 2014-04-22 +sub 4096R/0E515A22 2014-04-22 + -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2 mQGiBD0y56QRBACYMNr6RbAfj3T7ZoAyUWjofb/n5HalrHo7utL8V5qpbF0U95dJ 5KNXMzkSe79qviz5O8Np4UJdyzjbb1JSKdSiH56a08E/siJkwJ3c9b4eWCHB7Rq3 @@ -43,6 +49,87 @@ cfnLsfokDAxflfrtU8sasJy7ych9Iv0MFbYubs0pzywYr9sKOxJKTO9JVWrFvGCG Cjo/ek73zKISZUHKgv7jungAv0er2pTsMdE66+eEFRhK9IhOBBgRAgAGBQI9MufC ABIJENtkFMogTd8bB2VHUEcAAQG6NQCcDXQDPuv6+LysxTssJmCylZRLyaoAoMaI -YhUziTcacpO24e94Nt71AxEB -=4Dhx +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 +1Fl1SNx/VNIXb2ScB4cMtnHgIs9z4d7t +=H4gS -----END PGP PUBLIC KEY BLOCK-----

1 0