Hello community, here is the log from the commit of package mate-menus for openSUSE:Factory checked in at 2015-11-11 10:30:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-menus (Old) and /work/SRC/openSUSE:Factory/.mate-menus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-menus" Changes: -------- --- /work/SRC/openSUSE:Factory/mate-menus/mate-menus.changes 2015-07-03 00:09:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mate-menus.new/mate-menus.changes 2015-11-11 10:30:43.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Nov 5 20:43:01 UTC 2015 - [email protected] + +- Update to 1.12.0. +- Add baselibs.conf. + +------------------------------------------------------------------- +Thu Oct 15 18:45:24 UTC 2015 - [email protected] + +- Update to 1.11.0: + * Use pkg-config to check for Python (requires Python 2.7). + * Some fixes and cleanups. + * Update translations. + +------------------------------------------------------------------- Old: ---- mate-menus-1.10.0.tar.xz New: ---- baselibs.conf mate-menus-1.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-menus.spec ++++++ --- /var/tmp/diff_new_pack.rAYnyM/_old 2015-11-11 10:30:44.000000000 +0100 +++ /var/tmp/diff_new_pack.rAYnyM/_new 2015-11-11 10:30:44.000000000 +0100 @@ -16,28 +16,30 @@ # -%define lname libmate-menu2 +%define soname libmate-menu +%define sover 2 %define typelib typelib-1_0-MateMenu-2_0 -%define _version 1.10 +%define _version 1.12 Name: mate-menus -Version: 1.10.0 +Version: 1.12.0 Release: 0 Summary: MATE Desktop Menu License: GPL-2.0+ and LGPL-2.1+ Group: System/GUI/Other Url: http://mate-desktop.org/ Source: http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz +Source1: baselibs.conf BuildRequires: intltool -BuildRequires: mate-common +BuildRequires: mate-common >= %{_version} +BuildRequires: python-devel BuildRequires: update-desktop-files +BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libwnck-1.0) BuildRequires: pkgconfig(pygobject-2.0) -BuildRequires: pkgconfig(python) -Requires: %{name}-branding = %{version} -Recommends: %{name}-lang = %{version} +Requires: %{name}-branding +Recommends: %{name}-lang %description mate-menus contains the libmate-menu library, the layout @@ -70,12 +72,12 @@ This package provides the upstream definitions for menus. -%package -n %{lname} +%package -n %{soname}%{sover} Summary: MATE Desktop Menu License: GPL-2.0+ and LGPL-2.1+ Group: System/Libraries -%description -n %{lname} +%description -n %{soname}%{sover} The libmate-menu library implements the "Desktop Menu Specification" from freedesktop.org. @@ -92,7 +94,7 @@ Summary: Python Bindings for MATE Desktop Menu License: GPL-2.0+ and LGPL-2.1+ Group: System/GUI/Other -Requires: %{lname} = %{version} +Requires: %{soname}%{sover} = %{version} %description -n python-%{name} mate-menus contains the libmate-menu library, the layout @@ -105,10 +107,10 @@ %package devel Summary: MATE Desktop Menu License: GPL-2.0+ and LGPL-2.1+ -Group: Development/Libraries/Other -Requires: %{lname} = %{version} +Group: Development/Libraries/C and C++ +Requires: %{soname}%{sover} = %{version} Requires: %{typelib} = %{version} -Requires: glib2-devel +Requires: pkgconfig(glib-2.0) %description devel mate-menus contains the libmate-menu library, the layout configuration @@ -123,7 +125,8 @@ %setup -q %build -%configure --disable-static +%configure \ + --disable-static make %{?_smp_mflags} %install @@ -131,9 +134,9 @@ %find_lang %{name} %{?no_lang_C} find %{buildroot} -type f -name "*.la" -delete -print -%post -n %{lname} -p /sbin/ldconfig +%post -n %{soname}%{sover} -p /sbin/ldconfig -%postun -n %{lname} -p /sbin/ldconfig +%postun -n %{soname}%{sover} -p /sbin/ldconfig %files %defattr(-,root,root) @@ -160,14 +163,14 @@ %{py_sitedir}/matemenu.so %{_datadir}/mate-menus/examples -%files -n %{lname} +%files -n %{soname}%{sover} %defattr(-,root,root) -%{_libdir}/libmate-menu.so.* +%{_libdir}/%{soname}.so.%{sover}* %files devel %defattr(-,root,root) %{_includedir}/mate-menus/ -%{_libdir}/*.so +%{_libdir}/%{soname}.so %{_libdir}/pkgconfig/*.pc %{_datadir}/gir-1.0/MateMenu-2.0.gir ++++++ baselibs.conf ++++++ libmate-menu2 ++++++ mate-menus-1.10.0.tar.xz -> mate-menus-1.12.0.tar.xz ++++++ ++++ 2366 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-menus-1.10.0/NEWS new/mate-menus-1.12.0/NEWS --- old/mate-menus-1.10.0/NEWS 2015-04-09 20:17:31.000000000 +0200 +++ new/mate-menus-1.12.0/NEWS 2015-11-03 19:03:39.000000000 +0100 @@ -1,3 +1,9 @@ +mate-menus 1.12.0 + + - Use pkg-config to check for python (requires python 2.7) + - Some fixes and cleanups + - Translations update + mate-menus 1.10.0 - Translations update diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-menus-1.10.0/configure.ac new/mate-menus-1.12.0/configure.ac --- old/mate-menus-1.10.0/configure.ac 2015-04-09 20:17:28.000000000 +0200 +++ new/mate-menus-1.12.0/configure.ac 2015-11-03 19:03:39.000000000 +0100 @@ -1,6 +1,6 @@ AC_PREREQ(2.62) -AC_INIT([mate-menus], [1.10.0], [http://www.mate-desktop.org]) +AC_INIT([mate-menus], [1.12.0], [http://www.mate-desktop.org]) AC_CONFIG_SRCDIR(libmenu/matemenu-tree.h) AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz check-news]) @@ -30,16 +30,11 @@ IT_PROG_INTLTOOL([0.40.0]) -AC_ISC_POSIX AC_PROG_CC AC_STDC_HEADERS AC_ARG_PROGRAM -AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL -dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work -AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS") - PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.36.0 gio-2.0 >= 2.15.2) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) @@ -76,57 +71,22 @@ AC_ARG_ENABLE(python, [AC_HELP_STRING([--enable-python], - [build python bindings @<:@default=auto@:>@])], - [enable_deprecations=$enableval], - [enable_deprecations=auto]) + [build python bindings])], + [enable_python=$enableval], + [enable_python=yes]) # Detect if we can build Python bindings (need python and python headers) -if test "x$enable_python" = "xno" ; then - have_python=no +if test "x$enable_python" = "xyes" ; then + AM_PATH_PYTHON(2.7) + PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}], [have_python=yes], [have_python=no]) else - AC_MSG_NOTICE([Checking to see if we can build Python bindings]) - have_python=no - AM_PATH_PYTHON(2.3) - - if test "x$PYTHON" = "x" ; then - AC_MSG_WARN([Python not found]) - else - AM_CHECK_PYTHON_HEADERS(have_python_headers=yes, have_python_headers=no) - if test "x$have_python_headers" = "xyes" ; then - have_python=yes - fi - fi - - if test "x$have_python" = "xno" ; then - if test "x$enable_python" = "xyes" ; then - AC_MSG_ERROR([Building python explicitly requested, but can't build python bindings]) - else - AC_MSG_WARN([Couldn't find the Python headers, not building Python bindings]) - fi - fi + have_python=no fi +AC_SUBST(PYTHON_LIBS) +AC_SUBST(PYTHON_CFLAGS) AM_CONDITIONAL(HAVE_PYTHON, test x$have_python = xyes) -# Because of the way Python implements polymorphism, we get the following warning: -# "warning: dereferencing type-punned pointer will break strict-aliasing rules" -# -fno-strict-aliasing (as used in Python build) switches warnings off -NO_STRICT_ALIASING_CFLAGS="" -if test "x$GCC" = "xyes" ; then - AC_MSG_CHECKING(whether $CC accepts -fno-strict-aliasing) - ac_save_cc="$CC" - CC="$CC -fno-strict-aliasing" - AC_TRY_RUN([int main() { return 0; }], - ac_cv_no_strict_aliasing_ok=yes, - ac_cv_no_strict_aliasing_ok=no, - ac_cv_no_strict_aliasing_ok=no) - CC="$ac_save_cc" - AC_MSG_RESULT($ac_cv_no_strict_aliasing_ok) - if test "x$ac_cv_no_strict_aliasing_ok" = "xyes" ; then - NO_STRICT_ALIASING_CFLAGS="-fno-strict-aliasing" - fi -fi -AC_SUBST(NO_STRICT_ALIASING_CFLAGS) GOBJECT_INTROSPECTION_CHECK([0.6.7]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-menus-1.10.0/m4/libtool.m4 new/mate-menus-1.12.0/m4/libtool.m4 --- old/mate-menus-1.10.0/m4/libtool.m4 2015-04-09 20:17:52.000000000 +0200 +++ new/mate-menus-1.12.0/m4/libtool.m4 2015-11-03 19:04:46.000000000 +0100 @@ -1324,19 +1324,12 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in - *x86-64*) - LD="${LD-ld} -m elf32_x86_64" - ;; - *) - LD="${LD-ld} -m elf_i386" - ;; - esac + LD="${LD-ld} -m elf_i386" ;; - powerpc64le-*) + powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" ;; - powerpc64-*) + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1355,10 +1348,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*) + powerpcle-*linux*) LD="${LD-ld} -m elf64lppc" ;; - powerpc-*) + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1701,8 +1694,7 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -2526,6 +2518,17 @@ esac ;; +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2642,7 +2645,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -2672,10 +2675,14 @@ # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2687,18 +2694,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -3258,6 +3253,10 @@ fi ;; +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3296,11 +3295,11 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4048,7 +4047,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4112,7 +4111,7 @@ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4347,7 +4346,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4589,9 +4588,6 @@ ;; esac ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4654,9 +4650,6 @@ openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4878,7 +4871,7 @@ fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5055,7 +5048,6 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5360,7 +5352,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6240,6 +6232,9 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; + gnu*) + ;; + haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6401,7 +6396,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-menus-1.10.0/m4/python.m4 new/mate-menus-1.12.0/m4/python.m4 --- old/mate-menus-1.10.0/m4/python.m4 2014-03-05 21:44:34.000000000 +0100 +++ new/mate-menus-1.12.0/m4/python.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,86 +0,0 @@ -dnl a macro to check for ability to create python extensions -dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) -dnl function also defines PYTHON_INCLUDES -AC_DEFUN([AM_CHECK_PYTHON_HEADERS], -[AC_REQUIRE([AM_PATH_PYTHON]) - -AC_SUBST(PYTHON_INCLUDES) -AC_SUBST(PYTHON_LIBS) -AC_SUBST(PYTHON_EMBED_LIBS) -AC_SUBST(PYTHON_LDFLAGS) -AC_SUBST(PYTHON_CC) - -AC_MSG_CHECKING(for headers required to compile python extensions) -dnl deduce PYTHON_INCLUDES -py_prefix=`$PYTHON -c "import sys; print sys.prefix"` -py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` -if test -x "$PYTHON-config"; then - PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null` -else - PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" - if test "$py_prefix" != "$py_exec_prefix"; then - PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" - fi -fi -dnl check if the headers exist: -save_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" -AC_TRY_CPP([#include <Python.h>],dnl -[AC_MSG_RESULT(found) - -AC_MSG_CHECKING(for python libraries) - - -dnl Check whether python was compiled as shared library -link_pymodules_libpython=false; -py_enable_shared=`$PYTHON -c "from distutils.sysconfig import get_config_var; print repr(get_config_var('Py_ENABLE_SHARED'))"` -if test $py_enable_shared == 1 ; then - if test x`uname -s` != xDarwin; then - PYTHON_LDFLAGS="-no-undefined" - link_pymodules_libpython=true; - fi -fi - -dnl use distutils to get some python configuration variables.. -PYTHON_CC=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('CC')"` -PYTHON_LIB_DEPS=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('SYSLIBS'), sysconfig.get_config_var('SHLIBS')"` -PYTHON_LIBDIR=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('LIBDIR')"` -PYTHON_LIBPL=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('LIBPL')"` - -save_CC="$CC" -save_LIBS="$LIBS" - -PYTHON_EMBED_LIBS="-L${PYTHON_LIBDIR} ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION}" - -CC="$PYTHON_CC" -LIBS="$LIBS $PYTHON_EMBED_LIBS" -AC_TRY_LINK_FUNC(Py_Initialize, dnl - [ - LIBS="$save_LIBS"; - if $link_pymodules_libpython; then - PYTHON_LIBS="$PYTHON_EMBED_LIBS"; - fi - AC_MSG_RESULT([$PYTHON_EMBED_LIBS]); - $1], dnl -[ - - PYTHON_EMBED_LIBS="-L${PYTHON_LIBPL} ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION}" - - LIBS="$save_LIBS $PYTHON_EMBED_LIBS"; - AC_TRY_LINK_FUNC(Py_Initialize, dnl - [ - LIBS="$save_LIBS"; - if $link_pymodules_libpython; then - PYTHON_LIBS="$PYTHON_EMBED_LIBS"; - fi - AC_MSG_RESULT([$PYTHON_EMBED_LIBS]); - $1], dnl - AC_MSG_RESULT(not found); $2) -]) -CC="$save_CC" - -$1],dnl -[AC_MSG_RESULT(not found) -$2]) -CPPFLAGS="$save_CPPFLAGS" -]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-menus-1.10.0/po/ro.po new/mate-menus-1.12.0/po/ro.po --- old/mate-menus-1.10.0/po/ro.po 2014-03-05 21:44:34.000000000 +0100 +++ new/mate-menus-1.12.0/po/ro.po 2015-11-03 19:03:39.000000000 +0100 @@ -6,14 +6,15 @@ # Adi Roiban <[email protected]>, 2008 # Alexandru Szasz <[email protected]>, 2007 # Dan Damian <[email protected]>, 2005 +# Daniel <[email protected]>, 2015 msgid "" msgstr "" "Project-Id-Version: MATE Desktop Environment\n" -"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"; -"POT-Creation-Date: 2012-07-04 15:45+0200\n" -"PO-Revision-Date: 2012-07-04 13:50+0000\n" -"Last-Translator: Stefano Karapetsas <[email protected]>\n" -"Language-Team: Romanian (http://www.transifex.com/projects/p/MATE/language/ro/)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-09-09 13:05+0200\n" +"PO-Revision-Date: 2015-11-03 14:09+0000\n" +"Last-Translator: Daniel <[email protected]>\n" +"Language-Team: Romanian (http://www.transifex.com/mate/MATE/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -34,7 +35,7 @@ #: ../desktop-directories/mate-development.directory.in.h:2 msgid "Tools for software development" -msgstr "Unelte pentru dezvoltare de software" +msgstr "Unelte pentru dezvoltare de programe" #: ../desktop-directories/mate-education.directory.in.h:1 msgid "Education" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-menus-1.10.0/po/ru.po new/mate-menus-1.12.0/po/ru.po --- old/mate-menus-1.10.0/po/ru.po 2014-03-05 21:44:34.000000000 +0100 +++ new/mate-menus-1.12.0/po/ru.po 2015-10-06 19:02:08.000000000 +0200 @@ -3,21 +3,21 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Dmitry G. Mastrukov <[email protected]>, 2004. -# Leonid Kanter <[email protected]>, 2005, 2007. +# Dmitry G. Mastrukov <[email protected]>, 2004 +# Leonid Kanter <[email protected]>, 2005, 2007 msgid "" msgstr "" "Project-Id-Version: MATE Desktop Environment\n" -"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"; +"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-07-04 15:45+0200\n" -"PO-Revision-Date: 2013-03-11 20:10+0000\n" -"Last-Translator: Alexei Sorokin <[email protected]>\n" +"PO-Revision-Date: 2015-05-29 01:35+0000\n" +"Last-Translator: Alexei Sorokin <[email protected]>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/MATE/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" #: ../desktop-directories/mate-audio-video.directory.in.h:1 msgid "Sound & Video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-menus-1.10.0/po/uk.po new/mate-menus-1.12.0/po/uk.po --- old/mate-menus-1.10.0/po/uk.po 2014-10-23 11:16:06.000000000 +0200 +++ new/mate-menus-1.12.0/po/uk.po 2015-10-06 19:02:08.000000000 +0200 @@ -4,13 +4,13 @@ # # Translators: # Copyright (C) Free Software Foundation Inc., 2005 -# Микола Ткач <[email protected]>, 2013-2014 +# Микола Ткач <[email protected]>, 2013-2015 msgid "" msgstr "" "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-07-04 15:45+0200\n" -"PO-Revision-Date: 2014-09-20 07:33+0000\n" +"PO-Revision-Date: 2015-05-08 16:11+0000\n" "Last-Translator: Микола Ткач <[email protected]>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/MATE/language/uk/)\n" "MIME-Version: 1.0\n" @@ -29,11 +29,11 @@ #: ../desktop-directories/mate-development.directory.in.h:1 msgid "Programming" -msgstr "Програмування" +msgstr "Проґрамування" #: ../desktop-directories/mate-development.directory.in.h:2 msgid "Tools for software development" -msgstr "Засоби розробки програм" +msgstr "Засоби розробки проґрам" #: ../desktop-directories/mate-education.directory.in.h:1 msgid "Education" @@ -53,7 +53,7 @@ #: ../desktop-directories/mate-graphics.directory.in.h:2 msgid "Graphics applications" -msgstr "Графічні програми" +msgstr "Графічні проґрами" #: ../desktop-directories/mate-hardware.directory.in.h:1 msgid "Hardware" @@ -85,7 +85,7 @@ #: ../desktop-directories/mate-network.directory.in.h:2 msgid "Programs for Internet access such as web and email" -msgstr "Програми для роботи з Інтернет (пошта, переглядач тенет, тощо)" +msgstr "Проґрами для роботи з Інтернет (пошта, оглядач тенет, тощо)" #: ../desktop-directories/mate-office.directory.in.h:1 msgid "Office" @@ -93,7 +93,7 @@ #: ../desktop-directories/mate-office.directory.in.h:2 msgid "Office Applications" -msgstr "Офісні програми" +msgstr "Офісні проґрами" #. Translators: this is Personal as in "Personal settings" #: ../desktop-directories/mate-personal.directory.in.h:2 @@ -123,7 +123,7 @@ #: ../desktop-directories/mate-system.directory.in.h:1 #: ../desktop-directories/mate-menu-system.directory.in.h:1 msgid "System" -msgstr "Системна" +msgstr "Система" #: ../desktop-directories/mate-system.directory.in.h:2 msgid "System settings" @@ -151,11 +151,11 @@ #: ../desktop-directories/mate-utility.directory.in.h:2 msgid "Desktop accessories" -msgstr "Стандартні програми" +msgstr "Стандартні проґрами" #: ../desktop-directories/mate-menu-applications.directory.in.h:1 msgid "Applications" -msgstr "Програми" +msgstr "Проґрами" #: ../desktop-directories/mate-menu-system.directory.in.h:2 msgid "Personal preferences and administration settings" @@ -167,4 +167,4 @@ #: ../desktop-directories/mate-other.directory.in.h:2 msgid "Applications that did not fit in other categories" -msgstr "Програми, що не належать до жодної категорії" +msgstr "Проґрами, що не належать до жодної категорії" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mate-menus-1.10.0/python/Makefile.am new/mate-menus-1.12.0/python/Makefile.am --- old/mate-menus-1.10.0/python/Makefile.am 2014-03-05 21:44:34.000000000 +0100 +++ new/mate-menus-1.12.0/python/Makefile.am 2015-10-06 19:02:08.000000000 +0200 @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ - $(PYTHON_INCLUDES) \ + $(PYTHON_CFLAGS) \ -I$(srcdir)/../libmenu \ -DMATEMENU_I_KNOW_THIS_IS_UNSTABLE \ $(DISABLE_DEPRECATED_CFLAGS) \
