April 2016 - openSUSE Commits - openSUSE Mailing Lists

commit qtractor for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package qtractor for openSUSE:Factory checked in at 2016-04-30 23:31:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qtractor (Old) and /work/SRC/openSUSE:Factory/.qtractor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qtractor" Changes: -------- --- /work/SRC/openSUSE:Factory/qtractor/qtractor.changes 2016-04-08 09:39:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qtractor.new/qtractor.changes 2016-04-30 23:31:48.000000000 +0200 @@ -1,0 +2,22 @@ +Thu Apr 28 10:23:46 UTC 2016 - ecsos(a)opensuse.org + +- update to 0.7.7 + - LV2 UI Touch feature/interface support added. + - MIDI aware plug-ins are now void from multiple or parallel + instantiation. + - MIDI tracks and buses plug-in chains now honor the number of + effective audio channels from the assigned audio output bus; + dedicated audio output ports will keep default to the stereo + two channels. + - Plug-in rescan option has been added to plug-ins selection + dialog (yet another suggestion by Frank Neumann, thanks). + - Dropped the --enable-qt5 from configure as found redundant + given that's the build default anyway + - Immediate visual sync has been added to main and MIDI clip + editor thumb-views + - Fixed an old MIDI clip editor contents disappearing bug, + which manifested when drawing free-hand + (ie. Edit/Select Mode/Edit Draw is on) over and behind its + start/beginning position (while in the lower view pane). + +------------------------------------------------------------------- Old: ---- qtractor-0.7.6.tar.gz New: ---- qtractor-0.7.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtractor.spec ++++++ --- /var/tmp/diff_new_pack.nsEvl6/_old 2016-04-30 23:31:49.000000000 +0200 +++ /var/tmp/diff_new_pack.nsEvl6/_new 2016-04-30 23:31:49.000000000 +0200 @@ -17,7 +17,7 @@ Name: qtractor -Version: 0.7.6 +Version: 0.7.7 Release: 0 Summary: An Audio/MIDI multi-track sequencer License: GPL-2.0+ ++++++ qtractor-0.7.6.tar.gz -> qtractor-0.7.7.tar.gz ++++++ ++++ 12309 lines of diff (skipped)

1 0

commit qconf for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package qconf for openSUSE:Factory checked in at 2016-04-30 23:31:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qconf (Old) and /work/SRC/openSUSE:Factory/.qconf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qconf" Changes: -------- --- /work/SRC/openSUSE:Factory/qconf/qconf.changes 2015-09-30 05:53:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qconf.new/qconf.changes 2016-04-30 23:31:47.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 21 08:53:50 UTC 2016 - jslaby(a)suse.com + +- update to 20160309 + * drop qt3 support + * better qt5 support + * many small fixes + +------------------------------------------------------------------- Old: ---- qconf-20150608.4a9c329ba879.tar.xz New: ---- qconf-20160309.61a9b87f4f.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qconf.spec ++++++ --- /var/tmp/diff_new_pack.7YWF9W/_old 2016-04-30 23:31:48.000000000 +0200 +++ /var/tmp/diff_new_pack.7YWF9W/_new 2016-04-30 23:31:48.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package qconf # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -20,9 +20,11 @@ %define with_qt5 1 %endif +%define version_unconverted 20160309.61a9b87f4f + Name: qconf Url: http://delta.affinix.com/qconf/ -Version: 20150608.4a9c329ba879 +Version: 20160309.61a9b87f4f Release: 0 Summary: Configuration tool for qmake License: GPL-2.0 @@ -59,7 +61,7 @@ %files %defattr(-,root,root) -%doc COPYING README TODO +%doc COPYING README.md TODO %{_bindir}/qconf %{_datadir}/%{name} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.7YWF9W/_old 2016-04-30 23:31:48.000000000 +0200 +++ /var/tmp/diff_new_pack.7YWF9W/_new 2016-04-30 23:31:48.000000000 +0200 @@ -2,6 +2,7 @@ <service mode="localonly" name="tar_scm"> <param name="url">git://github.com/psi-plus/qconf.git</param> <param name="scm">git</param> + <param name="exclude">configure.exe</param> <param name="filename">qconf</param> <param name="versionformat">%ad.%h</param> </service> ++++++ qconf-20150608.4a9c329ba879.tar.xz -> qconf-20160309.61a9b87f4f.tar.xz ++++++ ++++ 1615 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/qconf-20150608.4a9c329ba879/AUTHORS new/qconf-20160309.61a9b87f4f/AUTHORS --- old/qconf-20150608.4a9c329ba879/AUTHORS 2015-09-29 14:54:51.000000000 +0200 +++ new/qconf-20160309.61a9b87f4f/AUTHORS 2016-04-21 14:39:18.000000000 +0200 @@ -1 +1,3 @@ Justin Karneges <justin(a)affinix.com> +Sergey Ilinykh <rion4ik(a)gmail.com> +Ivan Romanov <drizt(a)land.ru> 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/qconf-20150608.4a9c329ba879/README new/qconf-20160309.61a9b87f4f/README --- old/qconf-20150608.4a9c329ba879/README 2015-09-29 14:54:51.000000000 +0200 +++ new/qconf-20160309.61a9b87f4f/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,115 +0,0 @@ -QConf v1.5 ----------- -Date: May 30th, 2008 -Website: http://delta.affinix.com/qconf/ -Mailing List: Delta Project <delta(a)lists.affinix.com> - -Author: Justin Karneges <justin(a)affinix.com> - -Description: - - QConf allows you to have a nice configure script for your qmake-based - project. It is intended for developers who don't need (or want) to use - the more complex GNU autotools. - - Scripts generated by QConf are meant for unix. This means it should only - be used with projects based on Qt/X11, Qt/Mac, or Qt/Embedded. No effort - has been made in supporting Qt/Windows based projects (yet). - - NOTE: QConf is a Qt 4 program as of version 1.2. However, it can still - generate configure scripts for Qt 3 apps. See below for information. - - -Using QConf is easy: - - 1) First, install qconf: - - $ ./configure - $ make - # make install - - 2) Now, create a project.qc file. It is in an XML format: - <qconf> - <name>MyProject</name> <-- a friendly string - <profile>project.pro</profile> <-- your qmake profile - </qconf> - - 3) Then run qconf on your file: - - $ qconf project.qc - - Assuming all goes well, this will output a 'configure' script. Simply - copy this into your application package. Make sure to include(conf.pri) - in your project.pro file. - - Tip: If qconf is launched with no arguments, it will use the first .qc - file it can find in the current directory. If there is no .qc file, - then it will look for a .pro file, and create a .qc for you based on it. - - -Running 'configure': - - Once the configure script has been created, it is immediately usable. The - script simply performs the following tasks: - - 1) Check for a proper Qt build environment. This is done by compiling - the 'conf' program, which ensures that the Qt library, qmake, and - necessary compiler tools are present and functioning. - - 2) 'conf' is launched, which does any needed dependency checking and - creates a suitable conf.pri. This operation also ensures that - not only can we successfully build Qt-based programs, but launch - them as well. - - 3) qmake is invoked on the project's .pro file. - - Assuming configuration was a success, the Makefile should be generated and - the user can now type 'make'. - - The script does not touch any of your project files. It is up to you to - actually include conf.pri in your .pro file. - - Tip: Passing the '--verbose' option to configure can aid in diagnosing - configuration problems. - - -Q & A ------ -Q: How do I specify dependencies? -A: List them in your .qc file using the <dep> element. Follow sampledeps.qc - for a hint. - -Q: My dependency is not supported! -A: You will need to make it. Look in the 'modules' folder to see how it is - done. If you find that you need to make a lot of these, perhaps you - should consider GNU autotools. ;-) - -Q: How does qconf find modules? -A: Modules are found in the 'modules' subdirectory within the configured - libdir (default is /usr/local/share/qconf). Additional directories - can be specified using the <moddir> element. For instance: - <moddir>qcm</moddir> - would cause qconf to look for modules in the relative directory 'qcm'. - This is useful if you want to bundle modules within your application - distribution. - -Q: How do I perform custom processing or add project-specific arguments? -A: The recommended way of doing this is to create an extra.qcm file that - does the processing you need, and then just add it to your .qc file like - any normal dependency. Implement checkString() in your module to return - an empty QString if you want to suppress output. - -Q: How can I install more than just the binary with 'make install'? -A: You need to specify the extra files using the qmake INSTALLS variable - (see qmake docs for details). - -Q: What environment variables are available? -A: Main variables: PREFIX, BINDIR, LIBDIR, QTDIR. - All other variables are written as QC_FOO, where FOO is the option name - in all caps. Boolean variables are set to 'Y' when flagged. - -Q: How do I generate scripts for Qt 3 projects? -A: Include the <qt3/> element in the project's .qc file. Modules will not - be able to take advantage of most new qconf features, and everything - should work as they did with qconf 1.1. - 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/qconf-20150608.4a9c329ba879/README.md new/qconf-20160309.61a9b87f4f/README.md --- old/qconf-20150608.4a9c329ba879/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/qconf-20160309.61a9b87f4f/README.md 2016-04-21 14:39:18.000000000 +0200 @@ -0,0 +1,83 @@ +QConf v2.0 +========== + +Authors: Justin Karneges <justin(a)affinix.com>, Sergey Ilinykh <rion4ik(a)gmail.com>, Ivan Romanov <drizt(a)land.ru> +Mailing List: Delta Project <delta(a)lists.affinix.com> +Website: http://delta.affinix.com/qconf/ + +QConf allows you to have a nice configure script for your qmake-based project. It is intended for developers who don't need (or want) to use the more complex GNU autotools. QConf also generates a configure.exe program for use on Windows. + +Install +------- + +```sh +./configure +make +make install +``` + +Usage +----- + +First, create a project.qc file. It is in an XML format: + +```xml +<qconf> + <name>MyProject</name>  + <profile>project.pro</profile>  +</qconf> +``` + +Then, run qconf on your file: + +```sh +qconf project.qc +``` + +Assuming all goes well, this will output `configure` and `configure.exe` programs. Simply copy these files into your application package. Make sure to `include(conf.pri)` in your project.pro file. + +Tip: If qconf is launched with no arguments, it will use the first .qc file it can find in the current directory. If there is no .qc file, then it will look for a .pro file, and create a .qc for you based on it. + +The Configure Programs +---------------------- + +Once the configure programs have been created, they are immediately usable. The programs perform the following tasks: + +1. Check for a proper Qt build environment. This is done by compiling the `conf` program, which ensures that the Qt library, qmake, and necessary compiler tools are present and functioning. + +2. `conf` is launched, which does any needed dependency checking and creates a suitable `conf.pri`. This operation also ensures that not only can Qt-based programs be successfully built, but launched as well. + +3. qmake is invoked on the project's .pro file. + +Assuming configuration was a success, a `Makefile` should be generated and the user can now run the make tool (e.g. `make`). + +The script does not touch any of your project files. The only output is a `conf.pri` file. It is up to you to actually include `conf.pri` in your .pro file. + +Tip: Passing the `--verbose` option to configure can aid in diagnosing configuration problems. + +Q & A +----- + +Q: How do I specify dependencies? +A: List them in your .qc file using the `<dep>` element. Follow sampledeps.qc for a hint. + +Q: My dependency is not supported! +A: You will need to make it. Look in the `modules` folder to see how it is done. If you find that you need to make a lot of these, perhaps you should consider GNU autotools or CMake. + +Q: How does qconf find modules? +A: Modules are found in the `modules` subdirectory within the configured libdir (default is `/usr/local/share/qconf`). Additional directories can be specified using the `<moddir>` element. For instance: + +```xml +<moddir>qcm</moddir> +``` + +The above element would cause qconf to look for modules in the relative directory `qcm`. This is useful if you want to bundle modules within your application distribution. + +Q: How do I perform custom processing or add project-specific arguments? +A: The recommended way of doing this is to create an extra.qcm file that does the processing you need, and then just add it to your .qc file like any normal dependency. Implement `checkString()` in your module to return an empty QString if you want to suppress output. + +Q: How can I install more than just the binary with 'make install'? +A: You need to specify the extra files using the qmake `INSTALLS` variable (see qmake docs for details). + +Q: What environment variables are available? +A: Main variables: `PREFIX`, `BINDIR`, `LIBDIR`, `QTDIR`. All other variables are written as `QC_FOO`, where `FOO` is the option name in all caps. Boolean variables are set to `Y` when flagged. 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/qconf-20150608.4a9c329ba879/conf/conf4.cpp new/qconf-20160309.61a9b87f4f/conf/conf4.cpp --- old/qconf-20150608.4a9c329ba879/conf/conf4.cpp 2015-09-29 14:54:51.000000000 +0200 +++ new/qconf-20160309.61a9b87f4f/conf/conf4.cpp 2016-04-21 14:39:18.000000000 +0200 @@ -290,11 +290,13 @@ QString path = str.trimmed(); path = qc_trim_char(path, QLatin1Char('"')); path = qc_trim_char(path, QLatin1Char('\'')); -#ifdef Q_OS_WIN - QLatin1Char nativeSep('\\'); - path.replace(QLatin1Char('/'), QLatin1Char('\\')); -#else + + // It's OK to use unix style'/' pathes on windows Qt handles this without any problems. + // Using Windows-style '\\' can leads strange compilation error with MSYS which uses + // unix style. QLatin1Char nativeSep('/'); +#ifdef Q_OS_WIN + path.replace(QLatin1Char('\\'), QLatin1Char('/')); #endif // trim trailing slashes while (path.length() && path[path.length() - 1] == nativeSep) { @@ -996,19 +998,19 @@ str += "# qconf\n\n"; QString var; - var = qc_getenv("PREFIX"); + var = qc_normalize_path(qc_getenv("PREFIX")); if(!var.isEmpty()) str += QString("PREFIX = %1\n").arg(var); - var = qc_getenv("BINDIR"); + var = qc_normalize_path(qc_getenv("BINDIR")); if(!var.isEmpty()) str += QString("BINDIR = %1\n").arg(var); - var = qc_getenv("INCDIR"); + var = qc_normalize_path(qc_getenv("INCDIR")); if(!var.isEmpty()) str += QString("INCDIR = %1\n").arg(var); - var = qc_getenv("LIBDIR"); + var = qc_normalize_path(qc_getenv("LIBDIR")); if(!var.isEmpty()) str += QString("LIBDIR = %1\n").arg(var); - var = qc_getenv("DATADIR"); + var = qc_normalize_path(qc_getenv("DATADIR")); if(!var.isEmpty()) str += QString("DATADIR = %1\n").arg(var); str += '\n'; Files old/qconf-20150608.4a9c329ba879/configure.exe and new/qconf-20160309.61a9b87f4f/configure.exe differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qconf-20150608.4a9c329ba879/modules/qt31.qcm new/qconf-20160309.61a9b87f4f/modules/qt31.qcm --- old/qconf-20150608.4a9c329ba879/modules/qt31.qcm 2015-09-29 14:54:51.000000000 +0200 +++ new/qconf-20160309.61a9b87f4f/modules/qt31.qcm 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -/* -Copyright (C) 2003-2008 Justin Karneges - -This file is free software; unlimited permission is given to copy and/or -distribute it, with or without modifications, as long as this notice is -preserved. - -QCM (QConf Module) Howto: - - - Modules are Qt/C++ files that are compiled and run during configure time. - - Name your file "feature.qcm". - - Create a "BEGIN QCMOD" block like the one below, and specify a friendly - name for the feature. This block should be placed in a C comment, so - that it does not disrupt the compiler. - - If you want arguments for this feature, then add extra lines to the - QCMOD block in the format: "arg: {name}(=[{value}]),description". For - example: - arg: enable-foo,Enable the Foo feature - arg: with-foo-inc=[path],Path to Foo include files - These are set as environment variables, which your module can use - conf->getenv() to examine. - - Create a class like the one below, named qc_feature (yes, the same - word used in the filename), that inherits ConfObj. - - Derive name() to produce a friendly string. This should probably be - identical to the string used in the QCMOD block. It is this text - that is used when configure outputs "Checking for {name} ..." - - Derive shortname() to return "feature". - - You may also derive checkString() and resultString() if you want to - use different text than the usual "Checking for" and "yes/no" response. - For resultString(), you'll want to maintain the result of the last - call to exec(), so that you can output an appropriate string based on - the result. - - Below you will find a sample module that simply checks for Qt >= 3.1 - ------BEGIN QCMOD----- -name: Qt >= 3.1 ------END QCMOD----- -*/ -class qc_qt31 : public ConfObj -{ -public: - qc_qt31(Conf *c) : ConfObj(c) {} - QString name() const { return "Qt >= 3.1"; } - QString shortname() const { return "qt31"; } - bool exec() - { - conf->debug(QString("QT_VERSION = %1").arg(QT_VERSION)); - if(QT_VERSION >= 0x030100) - return true; - else - return false; - } -}; 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/qconf-20150608.4a9c329ba879/package.sh new/qconf-20160309.61a9b87f4f/package.sh --- old/qconf-20150608.4a9c329ba879/package.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/qconf-20160309.61a9b87f4f/package.sh 2016-04-21 14:39:18.000000000 +0200 @@ -0,0 +1,14 @@ +#!/bin/sh +set -e + +if [ $# -lt 1 ]; then + echo "usage: $0 [version]" + exit 1 +fi + +VERSION=$1 + +mkdir -p build/qconf-$VERSION +cp -a AUTHORS COPYING README.md TODO conf configure configure.exe examples modules qconf.* src build/qconf-$VERSION +cd build +tar jcvf qconf-$VERSION.tar.bz2 qconf-$VERSION 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/qconf-20150608.4a9c329ba879/qconf.pro new/qconf-20160309.61a9b87f4f/qconf.pro --- old/qconf-20150608.4a9c329ba879/qconf.pro 2015-09-29 14:54:51.000000000 +0200 +++ new/qconf-20160309.61a9b87f4f/qconf.pro 2016-04-21 14:39:18.000000000 +0200 @@ -7,7 +7,18 @@ HEADERS += src/stringhelp.h SOURCES += src/stringhelp.cpp src/qconf.cpp -include($$OUT_PWD/conf.pri) +exists($$OUT_PWD/conf.pri) { + include($$OUT_PWD/conf.pri) +} + +isEmpty(CXXFLAGS) { + CXXFLAGS=$$(CXXFLAGS) +} + +!isEmpty(CXXFLAGS) { + QMAKE_CXXFLAGS_DEBUG = $$CXXFLAGS + QMAKE_CXXFLAGS_RELEASE = $$CXXFLAGS +} !isEmpty(DATADIR) { contains($$list($$[QT_VERSION]), 4.0.*|4.1.*) { @@ -21,7 +32,7 @@ # install # we check for empty BINDIR here in case we're debugging with configexe on unix -unix:!isEmpty(BINDIR) { +!isEmpty(BINDIR):!isEmpty(DATADIR) { #CONFIG += no_fixpath target.path = $$BINDIR INSTALLS += target 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/qconf-20150608.4a9c329ba879/src/configexe/configexe.c new/qconf-20160309.61a9b87f4f/src/configexe/configexe.c --- old/qconf-20150608.4a9c329ba879/src/configexe/configexe.c 2015-09-29 14:54:51.000000000 +0200 +++ new/qconf-20160309.61a9b87f4f/src/configexe/configexe.c 2016-04-21 14:39:18.000000000 +0200 @@ -25,12 +25,22 @@ #ifdef QC_OS_WIN static char *qconftemp_path = "qconftemp"; +static char path_separator = ';'; #else static char *qconftemp_path = ".qconftemp"; +static char path_separator = ':'; #endif static int qc_verbose = 0; -static char *ex_qtdir = 0; +static char *ex_qtdir = NULL; +static char *qc_qtselect = NULL; +static char *qtsearchtext="4 or 5"; + +static char *prefix = NULL; +static char *bindir = NULL; +static char *includedir = NULL; +static char *libdir = NULL; +static char *datadir = NULL; enum ArgType { @@ -342,9 +352,9 @@ str = separators_to_native(qtdir); #ifdef QC_OS_WIN - str = append_free(str, "\\bin\\qmake.exe"); + str = append_free(str, "\\qmake.exe"); #else - str = append_free(str, "/bin/qmake"); + str = append_free(str, "/qmake"); #endif if(file_exists(str)) { @@ -357,19 +367,76 @@ } } +int check_qtversion(char *path, char *version) +{ + FILE *file; + int res = 0; + + if (version) + { + char command[PATH_MAX]; + int cnt = snprintf(command, sizeof(command) - 1, "%s -query QT_VERSION", path); + if (cnt > 0 && cnt < (int)sizeof(command)) + { + command[sizeof(command) - 1] = '\0'; // To be sure line has null-terminator + file = popen(command, "r"); + if (file) + { + char buf[20]; // version string output always small + if (fread(buf, 1, sizeof(buf), file) > 0) + { + buf[sizeof(buf) - 1] = '\0'; + int at = index_of(buf, '.'); + if (at > 0) + { + // Compare major version + buf[at] = '\0'; + res = !strcmp(version, buf); + if (!res && qc_verbose) + { + printf("Warning: %s not for Qt %s\n", path, qtsearchtext); + } + } + } + pclose(file); + } + } + } + else + { + res = 1; + } + + return res; +} + static char *find_qmake() { char *qtdir; char *path; - FILE *qmp; char try_syspath = 1; + if (!qc_qtselect) + { + qc_qtselect = strdup(get_envvar("QT_SELECT")); + if (qc_qtselect) + qtsearchtext = qc_qtselect; + } + + qtdir = ex_qtdir; if(qtdir) { + qtdir = append_free(strdup(qtdir), "\\bin"); path = check_qmake_path(qtdir); + free(qtdir); + if(path) + { + if (!check_qtversion(path, qc_qtselect)) + return NULL; return path; + } try_syspath = 0; } if(qc_verbose) @@ -378,9 +445,16 @@ qtdir = get_envvar("QTDIR"); if(qtdir) { + qtdir = append_free(strdup(qtdir), "\\bin"); path = check_qmake_path(qtdir); + free(qtdir); + if(path) + { + if (!check_qtversion(path, qc_qtselect)) + return NULL; return path; + } try_syspath = 0; } if(qc_verbose) @@ -388,38 +462,26 @@ /* if not set explicitly try something implicit */ if (try_syspath) { - char *dname = 0; - int len; - qmp = popen("qmake -query QT_INSTALL_BINS", "r"); - if (qmp) { - char buf[PATH_MAX]; - int cnt; - while ((cnt = fread(buf, 1, PATH_MAX - 1, qmp))) { - buf[cnt] = 0; - if (!dname) { - dname = strdup(buf); - } else { - dname = append_free(dname, buf); - } - } - pclose(qmp); - } - if (dname) { - len = strlen(dname); - while (len && dname[len - 1] < ' ') - dname[--len] = '\0'; - if (len && file_exists(dname)) { -#ifdef QC_OS_WIN - dname = append_free(dname, "/qmake.exe"); /* it coud be *.cmd but we don't care */ -#else - dname = append_free(dname, "/qmake"); -#endif - char *ndname = separators_to_native(dname); - free(dname); - return ndname; + char *paths = strdup(get_envvar("PATH")); + qtdir = paths; + while (1) + { + int at = index_of(qtdir, path_separator); + if (at > 0) + qtdir[at] = '\0'; + path = check_qmake_path(qtdir); + if (path && check_qtversion(path, qc_qtselect)) + { + free(paths); + return path; } - free(dname); + + if (at > 0) + qtdir += at + 1; + else + break; } + free(paths); } if(qc_verbose) @@ -521,13 +583,13 @@ #ifdef QC_OS_WIN str = strdup("deltree /y "); - str = append_free(str, qconftemp_path); + str = append_free(str, path); ret = run_silent_all(str); free(str); if(ret != 0) { str = strdup("rmdir /s /q "); - str = append_free(str, qconftemp_path); + str = append_free(str, path); ret = run_silent_all(str); free(str); } @@ -703,7 +765,7 @@ try_print_var(q->args[n].envvar, q->args[n].val); } - printf("Verifying Qt 4+ build environment ... "); + printf("Verifying Qt build environment ... "); fflush(stdout); if(qc_verbose) @@ -717,7 +779,7 @@ else printf("fail\n"); printf("\n"); - printf("Reason: Unable to find the 'qmake' tool for Qt 4.\n"); + printf("Reason: Unable to find the 'qmake' tool for Qt %s.\n", qtsearchtext); printf("\n"); printf("%s", q->qtinfo); return 0; @@ -859,6 +921,34 @@ qc_verbose = 1; set_envvar("QC_VERBOSE", "Y"); } + else if(strcmp(var, "prefix") == 0) + { + prefix = strdup(val); + } + else if(strcmp(var, "bindir") == 0) + { + bindir = strdup(val); + } + else if(strcmp(var, "includedir") == 0) + { + includedir = strdup(val); + } + else if(strcmp(var, "datadir") == 0) + { + datadir = strdup(val); + } + else if(strcmp(var, "libdir") == 0) + { + libdir = strdup(val); + } + else if(strcmp(var, "qtselect") == 0) + { + if (val && strlen(val)) + { + qc_qtselect = strdup(val); + qtsearchtext = qc_qtselect; + } + } else { at = find_arg(q->args, q->args_count, var); @@ -899,14 +989,82 @@ qcdata_delete(q); if(ex_qtdir) free(ex_qtdir); + + if(qc_qtselect) + free(qc_qtselect); + + if(prefix) + free(prefix); + + if(bindir) + free(bindir); + + if(includedir) + free(includedir); + + if(libdir) + free(libdir); + + if(datadir) + free(datadir); + return 1; } + if(prefix) + { + set_envvar("PREFIX", prefix); + if(!libdir) + libdir = append_str(prefix, "/lib"); + + if(!bindir) + bindir = append_str(prefix, "/bin"); + + if(!includedir) + includedir = append_str(prefix, "/include"); + + if(!datadir) + datadir = append_str(prefix, "/share"); + } + + if(libdir) + set_envvar("LIBDIR", libdir); + + if(bindir) + set_envvar("BINDIR", bindir); + + if(includedir) + set_envvar("INCLUDEDIR", includedir); + + if(datadir) + set_envvar("DATADIR", datadir); + + if(libdir) + set_envvar("LIBDIR", libdir); + n = do_conf(q, argv[0]); qcdata_delete(q); if(ex_qtdir) free(ex_qtdir); + if(qc_qtselect) + free(qc_qtselect); + + if(prefix) + free(prefix); + + if(bindir) + free(bindir); + + if(includedir) + free(includedir); + + if(libdir) + free(libdir); + + if(datadir) + free(datadir); + if(n) return 0; else Files old/qconf-20150608.4a9c329ba879/src/configexe/configexe_stub.exe and new/qconf-20160309.61a9b87f4f/src/configexe/configexe_stub.exe differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qconf-20150608.4a9c329ba879/src/qconf.cpp new/qconf-20160309.61a9b87f4f/src/qconf.cpp --- old/qconf-20150608.4a9c329ba879/src/qconf.cpp 2015-09-29 14:54:51.000000000 +0200 +++ new/qconf-20160309.61a9b87f4f/src/qconf.cpp 2016-04-21 14:39:18.000000000 +0200 @@ -26,7 +26,7 @@ #include "stringhelp.h" -#define VERSION "1.5" +#define VERSION "2.0" #define CONF_USAGE_SPACE 4 #define CONF_WRAP 78 @@ -166,11 +166,11 @@ } const char *qt4_info_str = - "Be sure you have a proper Qt 4.0 build environment set up. This means not just Qt, " + "Be sure you have a proper Qt 4.0+ build environment set up. This means not just Qt, " "but also a C++ compiler, a make tool, and any other packages necessary " "for compiling C++ programs.\n" "\n" - "If you are certain everything is installed, then it could be that Qt 4 is not being " + "If you are certain everything is installed, then it could be that Qt is not being " "recognized or that a different version of Qt is being detected by mistake (for example, " "this could happen if \\$QTDIR is pointing to a Qt 3 installation). At least one of " "the following conditions must be satisfied:\n" @@ -185,17 +185,18 @@ "\n"; const char *qt4_info_str_win = - "Be sure you have a proper Qt 4.0 build environment set up. This means not just Qt, " + "Be sure you have a proper Qt 4.0+ build environment set up. This means not just Qt, " "but also a C++ compiler, a make tool, and any other packages necessary " "for compiling C++ programs.\n" "\n" - "If you are certain everything is installed, then it could be that Qt 4 is not being " + "If you are certain everything is installed, then it could be that Qt is not being " "recognized or that a different version of Qt is being detected by mistake (for example, " "this could happen if %QTDIR% is pointing to a Qt 3 installation). At least one of " "the following conditions must be satisfied:\n" "\n" " 1) --qtdir is set to the location of Qt\n" " 2) %QTDIR% is set to the location of Qt\n" + " 3) qmake is in the %PATH%\n" "\n" "This program will use the first one it finds to be true, checked in the above order.\n" "\n"; @@ -334,7 +335,7 @@ if(libmode) mainopts += ConfOpt("static", QString(), "QC_STATIC", "Create a static library instead of shared."); - mainopts += ConfOpt("extraconf", "conf", "QC_EXTRACONF", "Extra configuration for nonstandard cases"); + mainopts += ConfOpt("extraconf", "conf", "QC_EXTRACONF", "Extra configuration for nonstandard cases."); QString str; str += genHeader(); @@ -399,14 +400,10 @@ str += "qm=$PWD/byoq/qt/bin/qmake\n\n"; } - str += "printf \"Verifying Qt 4 build environment ... \"\n\n"; + str += "printf \"Verifying Qt build environment ... \"\n\n"; if(!byoq) str += genQt4Checks(); } - else { - str += "printf \"Verifying Qt 3.x Multithreaded (MT) build environment ... \"\n\n"; - str += genQt3Checks(); - } str += genEmbeddedFiles(); @@ -437,6 +434,18 @@ mainopts.clear(); mainopts += ConfOpt("qtdir", "path", "EX_QTDIR", "Directory where Qt is installed."); + if(usePrefix) { + mainopts += ConfOpt("prefix", "path", "PREFIX", "Base path for build/install. No default."); + if(useBindir) + mainopts += ConfOpt("bindir", "path", "BINDIR", "Directory for binaries. Default: PREFIX/bin"); + if(useIncdir) + mainopts += ConfOpt("includedir", "path", "INCDIR", "Directory for headers. Default: PREFIX/include"); + if(useLibdir) + mainopts += ConfOpt("libdir", "path", "LIBDIR", "Directory for libraries. Default: PREFIX/lib"); + if(useDatadir) + mainopts += ConfOpt("datadir", "path", "DATADIR", "Directory for data. Default: PREFIX/share"); + } + if(libmode) mainopts += ConfOpt("static", QString(), "QC_STATIC", "Create a static library instead of shared."); @@ -511,8 +520,6 @@ //"else\n" if(qt4) str += "echo \"Good, your configure finished. Now run $MAKE.\"\n"; - else - str += "echo \"Good, your configure finished. Now run 'make'.\"\n"; //"fi\n" str += "echo\n"; return str; @@ -563,7 +570,7 @@ QList<ConfUsageOpt> list = optsToUsage(mainopts); list += ConfUsageOpt("verbose", "", "Show extra configure output."); - list += ConfUsageOpt("qtselect", "N", "Select major Qt verion (4 or 5)."); + list += ConfUsageOpt("qtselect", "N", "Select major Qt version (4 or 5)."); list += ConfUsageOpt("help", "", "This help text."); str += genUsageSection("Main options:", list); @@ -589,7 +596,7 @@ QList<ConfUsageOpt> list = optsToUsage(mainopts); list += ConfUsageOpt("verbose", "", "Show extra configure output."); - list += ConfUsageOpt("qtselect", "N", "Select major Qt verion (4 or 5)."); + list += ConfUsageOpt("qtselect", "N", "Select major Qt version (4 or 5)."); list += ConfUsageOpt("help", "", "This help text."); str += genUsageSection("Main options:", list); @@ -614,6 +621,12 @@ str += "# which/make detection adapted from Qt\n" "which_command() {\n" + " ALL_MATCHES=\n" + " if [ \"$1\" = \"-a\" ]; then\n" + " ALL_MATCHES=\"-a\"\n" + " shift\n" + " fi\n" + "\n" " OLD_HOME=$HOME\n" " HOME=/dev/null\n" " export HOME\n" @@ -628,39 +641,35 @@ " for a in /usr/ucb /usr/bin /bin /usr/local/bin; do\n" " if [ -x $a/which ]; then\n" " WHICH=$a/which\n" - " break;\n" + " break\n" " fi\n" " done\n" " fi\n" " fi\n" "\n" + " RET_CODE=1\n" " if [ -z \"$WHICH\" ]; then\n" " OLD_IFS=$IFS\n" " IFS=:\n" " for a in $PATH; do\n" " if [ -x $a/$1 ]; then\n" " echo \"$a/$1\"\n" - " IFS=$OLD_IFS\n" - " export IFS\n" - " HOME=$OLD_HOME\n" - " export HOME\n" - " return 0\n" + " RET_CODE=0\n" + " [ -z \"$ALL_MATCHES\" ] && break\n" " fi\n" " done\n" " IFS=$OLD_IFS\n" " export IFS\n" " else\n" - " a=`\"$WHICH\" \"$1\" 2>/dev/null`\n" + " a=`\"$WHICH\" \"$ALL_MATCHES\" \"$1\" 2>/dev/null`\n" " if [ ! -z \"$a\" -a -x \"$a\" ]; then\n" " echo \"$a\"\n" - " HOME=$OLD_HOME\n" - " export HOME\n" - " return 0\n" + " RET_CODE=0\n" " fi\n" " fi\n" " HOME=$OLD_HOME\n" " export HOME\n" - " return 1\n" + " return $RET_CODE\n" "}\n" "WHICH=which_command\n" "\n"; @@ -733,8 +742,7 @@ " QC_VERBOSE=\"Y\"\n" " shift\n" " ;;\n" - " --qtselect*)\n" - " [ \"$1\" = \"--qtselect\" ] && { shift; optarg=\"$1\"; }\n" + " --qtselect=*)\n" " QC_QTSELECT=\"${optarg}\"\n" " shift\n" " ;;\n" @@ -755,122 +763,43 @@ return str; } - QString genQt3Checks() + QString genQt4Checks() { - QStringList qtloc; - qtloc += "/usr/lib/qt"; - qtloc += "/usr/share/qt"; - qtloc += "/usr/share/qt3"; - qtloc += "/usr/local/lib/qt"; - qtloc += "/usr/local/share/qt"; - qtloc += "/usr/lib/qt3"; - qtloc += "/usr/local/lib/qt3"; - qtloc += "/usr/X11R6/share/qt"; - qtloc += "/usr/qt/3"; - - QString for_items; - for(QStringList::ConstIterator it = qtloc.begin(); it != qtloc.end(); ++it) { - for_items += (*it) + ' '; - } - QString str = - "if [ -z \"$QTDIR\" ]; then\n" - " if [ \"$QC_VERBOSE\" = \"Y\" ]; then\n" - " echo \\$QTDIR not set... trying to find Qt manually\n" - " fi\n"; - str += QString( - " for p in %1; do\n" - ).arg(for_items); - str += - " if [ -d \"$p/mkspecs\" ]; then\n" - " QTDIR=$p\n" - " break;\n" - " fi;\n" - " done\n" - " if [ -z \"$QTDIR\" ]; then\n" - " echo fail\n" - " echo\n" - " echo \"Unable to find Qt 'mkspecs'. Perhaps you need to\"\n" - " echo \"install the Qt 3 development utilities. You may download\"\n" - " echo \"them either from the vendor of your operating system\"\n" - " echo \"or from http://www.trolltech.com/\"\n" - " echo\n" - " echo \"If you're sure you have the Qt development utilities\"\n" - " echo \"installed, you might try using the --qtdir option.\"\n" - " echo\n" - " exit 1;\n" - " fi\n" - " if [ ! -x \"$QTDIR/bin/moc\" ]; then\n" - " m=`which moc 2>/dev/null`\n" - " if [ ! -x \"$m\" ]; then\n" - " echo fail\n" - " echo\n" - " echo \"We found Qt in $QTDIR, but we were unable to locate\"\n" - " echo \"the moc utility. It was not found in $QTDIR/bin\"\n" - " echo \"nor in PATH. This seems to be a very unusual setup.\"\n" - " echo \"You might try using the --qtdir option.\"\n" - " echo\n" - " exit 1;\n" - " fi\n" - " qtpre=`echo $m | awk '{ n = index($0, \"/bin/moc\"); if (!n) { exit 1; } print substr($0, 0, n-1); exit 0; }' 2>/dev/null`\n" - " ret=\"$?\"\n" - " if [ \"$ret\" != \"0\" ]; then\n" - " echo fail\n" - " echo\n" - " echo \"We found Qt in $QTDIR, but the location of moc\"\n" - " echo \"($m) is not suitable for use with this build system.\"\n" - " echo \"This is a VERY unusual and likely-broken setup. You\"\n" - " echo \"should contact the maintainer of your Qt package.\"\n" - " echo\n" - " exit 1;\n" - " fi\n" - " QTDIR=$qtpre\n" - " fi\n" + "if [ -z \"$QC_QTSELECT\" ]; then\n" + " QC_QTSELECT=\"$QT_SELECT\"\n" "fi\n" "\n" - "if [ ! -x \"$QTDIR/bin/qmake\" ]; then\n" - " if [ \"$QC_VERBOSE\" = \"Y\" ]; then\n" - " echo Warning: qmake not in \\$QTDIR/bin/qmake\n" - " echo trying to find it in \\$PATH\n" - " fi\n" - " qm=`which qmake 2>/dev/null`\n" - " if [ -x \"$qm\" ]; then\n" - " if [ \"$QC_VERBOSE\" = \"Y\" ]; then\n" - " echo qmake found in $qm\n" - " fi\n" - " else\n" - " echo fail\n" - " echo\n" - " echo Sorry, you seem to have a very unusual setup,\n" - " echo or I missdetected \\$QTDIR=$QTDIR\n" - " echo\n" - " echo Please set \\$QTDIR manually and make sure that\n" - " echo \\$QTDIR/bin/qmake exists.\n" - " echo\n" - " exit 1;\n" - " fi\n" + "if [ ! -z \"$QC_QTSELECT\" ]; then\n" + " QTSEARCHTEXT=\"$QC_QTSELECT\"\n" "else\n" - " qm=$QTDIR/bin/qmake\n" - "fi\n\n"; - return str; - } - - QString genQt4Checks() - { - QString str = - "QTSEARCHTTEXT=\"$QC_QTSELECT\"\n" - "[ -z \"$QC_QTSELECT\" ] && QTSEARCHTTEXT=\"4 or 5\"\n" + " QTSEARCHTEXT=\"4 or 5\"\n" + "fi\n" "\n" - "# run qmake -v and check version\n" - "qmake_check_v4() {\n" + "# run qmake and check version\n" + "qmake_check() {\n" " if [ -x \"$1\" ]; then\n" - " local v=`$1 -query QT_VERSION 2>&1`\n" - " vmaj=\"${v%%.*}\"\n" - " case \"${v}\" in ?.?.?) [ -z \"$QC_QTSELECT\" ] && [ \"$vmaj\" = 4 -o \"$vmaj\" = 5 ] && return 0;\n" - " [ -n \"$QC_QTSELECT\" ] && [ \"$vmaj\" = \"$QC_QTSELECT\" ] && return 0; ;;\n" + " cmd=\"\\\"$1\\\" -query QT_VERSION\"\n" + " if [ \"$QC_VERBOSE\" = \"Y\" ]; then\n" + " echo \"running: $cmd\"\n" + " fi\n" + " vout=`/bin/sh -c \"$cmd\" 2>&1`\n" + " case \"${vout}\" in\n" + " ?.?.?)\n" + " vmaj=\"${vout%%.*}\"\n" + " if [ ! -z \"$QC_QTSELECT\" ]; then\n" + " if [ \"$vmaj\" = \"$QC_QTSELECT\" ]; then\n" + " return 0\n" + " fi\n" + " else\n" + " if [ \"$vmaj\" = \"4\" ] || [ \"$vmaj\" = \"5\" ]; then\n" + " return 0\n" + " fi\n" + " fi\n" + " ;;\n" " esac\n" " if [ \"$QC_VERBOSE\" = \"Y\" ]; then\n" - " echo \"Warning: $1 not for Qt ${QTSEARCHTTEXT}\"\n" + " echo \"Warning: $1 not for Qt ${QTSEARCHTEXT}\"\n" " fi\n" " fi\n" " return 1\n" @@ -889,17 +818,20 @@ "if [ -z \"$QC_QTSELECT\" ]; then\n" " names=\"${qt5_names} ${qt4_names} $names\"\n" "else\n" - " [ \"$QC_QTSELECT\" = \"4\" ] && names=\"${qt4_names} $names\"\n" - " [ \"$QC_QTSELECT\" -ge \"5\" ] && names=\"${qt5_names} $names\"\n" + " if [ \"$QC_QTSELECT\" = \"4\" ]; then\n" + " names=\"${qt4_names} $names\"\n" + " elif [ \"$QC_QTSELECT\" -ge \"5\" ]; then\n" + " names=\"${qt5_names} $names\"\n" + " fi\n" "fi\n" "\n" "if [ -z \"$qm\" ] && [ ! -z \"$EX_QTDIR\" ]; then\n" - "# qt4 check: --qtdir\n" + " # qt4 check: --qtdir\n" " for n in $names; do\n" " qstr=$EX_QTDIR/bin/$n\n" - " if qmake_check_v4 \"$qstr\"; then\n" + " if qmake_check \"$qstr\"; then\n" " qm=$qstr\n" - " break;\n" + " break\n" " fi\n" " done\n" " if [ -z \"$qm\" ] && [ \"$QC_VERBOSE\" = \"Y\" ]; then\n" @@ -907,12 +839,12 @@ " fi\n" "\n" "elif [ -z \"$qm\" ] && [ ! -z \"$QTDIR\" ]; then\n" - "# qt4 check: QTDIR\n" + " # qt4 check: QTDIR\n" " for n in $names; do\n" " qstr=$QTDIR/bin/$n\n" - " if qmake_check_v4 \"$qstr\"; then\n" + " if qmake_check \"$qstr\"; then\n" " qm=$qstr\n" - " break;\n" + " break\n" " fi\n" " done\n" " if [ -z \"$qm\" ] && [ \"$QC_VERBOSE\" = \"Y\" ]; then\n" @@ -920,57 +852,79 @@ " fi\n" "\n" "else\n" + " # Try all other implicit checks\n" "\n" - "# Try all other implicit checks\n" + " # qtchooser\n" + " if [ -z \"$qm\" ]; then\n" + " qtchooser=$($WHICH qtchooser 2>/dev/null)\n" + " if [ ! -z \"$qtchooser\" ]; then\n" + " if [ ! -z \"$QC_QTSELECT\" ]; then\n" + " versions=\"$QC_QTSELECT\"\n" + " else\n" + " cmd=\"$qtchooser --list-versions\"\n" + " if [ \"$QC_VERBOSE\" = \"Y\" ]; then\n" + " echo \"running: $cmd\"\n" + " fi\n" + " versions=`$cmd`\n" + " fi\n" + " for version in $versions; do\n" + " cmd=\"$qtchooser -run-tool=qmake -qt=${version} -query QT_INSTALL_BINS\"\n" + " if [ \"$QC_VERBOSE\" = \"Y\" ]; then\n" + " echo \"running: $cmd\"\n" + " fi\n" + " qtbins=`$cmd 2>/dev/null`\n" + " if [ ! -z \"$qtbins\" ] && qmake_check \"$qtbins/qmake\"; then\n" + " qm=\"$qtbins/qmake\"\n" + " break\n" + " fi\n" + " done\n" + " fi\n" + " fi\n" + " if [ -z \"$qm\" ] && [ \"$QC_VERBOSE\" = \"Y\" ]; then\n" + " echo \"Warning: qmake not found via qtchooser\"\n" + " fi\n" "\n" - "# qtchooser\n" - "if [ -z \"$qm\" ]; then\n" - " qtchooser=$($WHICH qtchooser 2>/dev/null)\n" - " if [ ! -z \"$qtchooser\" ]; then\n" - " cmd=\"$qtchooser -run-tool=qmake -qt=${QC_QTSELECT}\"\n" - " qtbins=\"$($cmd -query QT_INSTALL_BINS 2>/dev/null)\"\n" - " if [ -n \"$qtbins\" ] && qmake_check_v4 \"$qtbins/qmake\"; then\n" - " qm=\"$qtbins/qmake\"\n" - " break;\n" + " # qt4: pkg-config\n" + " if [ -z \"$qm\" ]; then\n" + " cmd=\"pkg-config QtCore --variable=exec_prefix\"\n" + " if [ \"$QC_VERBOSE\" = \"Y\" ]; then\n" + " echo \"running: $cmd\"\n" + " fi\n" + " str=`$cmd 2>/dev/null`\n" + " if [ ! -z \"$str\" ]; then\n" + " for n in $names; do\n" + " qstr=$str/bin/$n\n" + " if qmake_check \"$qstr\"; then\n" + " qm=$qstr\n" + " break\n" + " fi\n" + " done\n" " fi\n" " fi\n" - "fi\n" - "if [ -z \"$qm\" ] && [ \"$QC_VERBOSE\" = \"Y\" ]; then\n" - " echo \"Warning: qmake not found via qtchooser\"\n" - "fi\n" + " if [ -z \"$qm\" ] && [ \"$QC_VERBOSE\" = \"Y\" ]; then\n" + " echo \"Warning: qmake not found via pkg-config\"\n" + " fi\n" "\n" - "# qt4 check: pkg-config\n" - "if [ -z \"$qm\" ]; then\n" - " str=`pkg-config QtCore --variable=exec_prefix 2>/dev/null`\n" - " if [ ! -z \"$str\" ]; then\n" + " # qmake in PATH\n" + " if [ -z \"$qm\" ]; then\n" " for n in $names; do\n" - " qstr=$str/bin/$n\n" - " if qmake_check_v4 \"$qstr\"; then\n" - " qm=$qstr\n" - " break;\n" + " qstr=`$WHICH -a $n 2>/dev/null`\n" + " for q in $qstr; do\n" + " if qmake_check \"$q\"; then\n" + " qm=\"$q\"\n" + " break\n" + " fi\n" + " done\n" + " if [ ! -z \"$qm\" ]; then\n" + " break\n" " fi\n" " done\n" " fi\n" - "fi\n" - "if [ -z \"$qm\" ] && [ \"$QC_VERBOSE\" = \"Y\" ]; then\n" - " echo \"Warning: qmake not found via pkg-config\"\n" - "fi\n" - "\n" - "# qt4 check: PATH\n" - "if [ -z \"$qm\" ]; then\n" - " for n in $names; do\n" - " qstr=`$WHICH $n 2>/dev/null`\n" - " if qmake_check_v4 \"$qstr\"; then\n" - " qm=$qstr\n" - " break;\n" - " fi\n" - " done\n" - "fi\n" - "if [ -z \"$qm\" ] && [ \"$QC_VERBOSE\" = \"Y\" ]; then\n" - " echo \"Warning: qmake not found via \\$PATH\"\n" - "fi\n" + " if [ -z \"$qm\" ] && [ \"$QC_VERBOSE\" = \"Y\" ]; then\n" + " echo \"Warning: qmake not found via \\$PATH\"\n" + " fi\n" "\n" - "# end of implicit checks\n" + " # end of implicit checks\n" "fi\n" "\n" "if [ -z \"$qm\" ]; then\n" @@ -982,7 +936,7 @@ str += echoBlock(1, "\n" - "Reason: Unable to find the 'qmake' tool for Qt ${QTSEARCHTTEXT}.\n" + "Reason: Unable to find the 'qmake' tool for Qt ${QTSEARCHTEXT}.\n" "\n"); str += " show_qt_info\n"; @@ -990,7 +944,7 @@ " exit 1;\n" "fi\n" "if [ \"$QC_VERBOSE\" = \"Y\" ]; then\n" - " echo qmake found in $qm\n" + " echo qmake found in \"$qm\"\n" "fi\n\n"; str += @@ -1001,7 +955,7 @@ " READLINK=`$WHICH readlink`\n" " fi\n" " if [ ! -z \"$READLINK\" ]; then\n" - " qt_mkspecsdir=`$qm -query QT_INSTALL_DATA`/mkspecs\n" + " qt_mkspecsdir=`\"$qm\" -query QT_INSTALL_DATA`/mkspecs\n" " if [ -d \"$qt_mkspecsdir\" ] && [ -h \"$qt_mkspecsdir/default\" ]; then\n" " defmakespec=`$READLINK $qt_mkspecsdir/default`\n" " fi\n" @@ -1044,19 +998,13 @@ if(qt4) { str += " if [ ! -z \"$qm_spec\" ]; then\n" - " $qm -spec $qm_spec conf4.pro >/dev/null\n" + " \"$qm\" -spec $qm_spec conf4.pro >/dev/null\n" " else\n" - " $qm conf4.pro >/dev/null\n" + " \"$qm\" conf4.pro >/dev/null\n" " fi\n" " $MAKE clean >/dev/null 2>&1\n" " $MAKE >../conf.log 2>&1\n"; } - else { - str += - " $qm conf.pro >/dev/null\n" - " QTDIR=$QTDIR make clean >/dev/null 2>&1\n" - " QTDIR=$QTDIR make >../conf.log 2>&1\n"; - } str += ")\n\n"; if(qt4) { @@ -1089,26 +1037,6 @@ " exit 1;\n" "fi\n\n"; } - else { - str += QString( - "if [ \"$?\" != \"0\" ]; then\n" - " %1\n" - " echo fail\n" - " echo\n" - " echo \"There was an error compiling 'conf'. Be sure you have a proper\"\n" - " echo \"Qt 3.x Multithreaded (MT) build environment set up. This\"\n" - " echo \"means not just Qt, but also a C++ compiler, the 'make' command,\"\n" - " echo \"and any other packages necessary to compile C++ programs.\"\n" - " echo \"See conf.log for details.\"\n" - " if [ ! -f \"$QTDIR/lib/libqt-mt.so.3\" ]; then\n" - " echo\n" - " echo \"One possible reason is that you don't have\"\n" - " echo \"libqt-mt.so.3 installed in $QTDIR/lib/.\"\n" - " fi\n" - " echo\n" - " exit 1;\n" - "fi\n\n").arg(cleanup); - } if(qt4) { str += QString("QC_COMMAND=$0\n"); @@ -1142,14 +1070,10 @@ " echo \"fail\"\n" " fi\n"; } - else - str += " echo fail\n"; str += " echo\n"; if(qt4) str += " echo \"Reason: Unexpected error launching 'conf'\"\n"; - else - str += " echo \"Unexpected error launching 'conf'\"\n"; str += " echo\n"; str += " exit 1;\n"; str += " fi\n"; @@ -1172,7 +1096,7 @@ { QString str; str += "# run qmake\n"; - str += QString("$qm %1\n").arg(profile); + str += QString("\"$qm\" %1\n").arg(profile); str += "if [ \"$?\" != \"0\" ]; then\n" " echo\n" @@ -1570,8 +1494,15 @@ QDir confdir(confdirpath); if(!confdir.exists()) { - printf("qconf: %s does not exist.\n", qPrintable(confdir.path())); - return 1; +#ifdef Q_OS_WIN + confdir = QDir(appdir + "/../share/qconf/conf"); + if(!confdir.exists()) { +#endif + printf("qconf: %s does not exist.\n", qPrintable(confdir.absolutePath())); + return 1; +#ifdef Q_OS_WIN + } +#endif } QFile f;

1 0

commit kdeedu3 for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package kdeedu3 for openSUSE:Factory checked in at 2016-04-30 23:31:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeedu3 (Old) and /work/SRC/openSUSE:Factory/.kdeedu3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdeedu3" Changes: -------- --- /work/SRC/openSUSE:Factory/kdeedu3/kdeedu3.changes 2012-04-02 11:23:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdeedu3.new/kdeedu3.changes 2016-04-30 23:31:45.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 27 11:23:40 UTC 2016 - normand(a)linux.vnet.ibm.com + +- add kdeedu3_isnan_ppc64le_cast.patch + +------------------------------------------------------------------- New: ---- kdeedu3_isnan_ppc64le_cast.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeedu3.spec ++++++ --- /var/tmp/diff_new_pack.lvM9qb/_old 2016-04-30 23:31:47.000000000 +0200 +++ /var/tmp/diff_new_pack.lvM9qb/_new 2016-04-30 23:31:47.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package kdeedu3 (Version 3.5.10) +# spec file for package kdeedu3 # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -13,19 +13,23 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + Name: kdeedu3 BuildRequires: kdelibs3-devel +Summary: Education Applications License: GPL-2.0+ Group: System/GUI/KDE -Summary: Education Applications Version: 3.5.10 -Release: 1 +Release: 0 Url: http://www.kde.org BuildRequires: fdupes -Provides: kgeo,keduca +Provides: keduca +Provides: kgeo Source0: kdeedu-%{version}.tar.bz2 Patch0: 3_5_BRANCH.diff +Patch1: kdeedu3_isnan_ppc64le_cast.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -51,6 +55,7 @@ %prep %setup -n kdeedu-%{version} -q %patch0 +%patch1 -p1 . /etc/opt/kde3/common_options update_admin ++++++ kdeedu3_isnan_ppc64le_cast.patch ++++++ From: Michel Normand <normand(a)linux.vnet.ibm.com> Subject: kdeedu3 isnan ppc64le cast Date: Wed, 27 Apr 2016 13:10:23 +0200 avoid compilation error for ppc64le === fitsviewer.cpp: In member function 'float* FITSViewer::loadData(const char*, float*)': fitsviewer.cpp:339:9: error: non-floating-point argument in call to function '__builtin_isnan' if (isnan(pixval_32)) pixval_32 = 0; ^ === Signed-off-by: Michel Normand <normand(a)linux.vnet.ibm.com> --- kstars/kstars/fitsviewer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: kdeedu-3.5.10/kstars/kstars/fitsviewer.cpp =================================================================== --- kdeedu-3.5.10.orig/kstars/kstars/fitsviewer.cpp +++ kdeedu-3.5.10/kstars/kstars/fitsviewer.cpp @@ -336,7 +336,7 @@ float * FITSViewer::loadData(const char { FITS_GETBITPIX32(tempData, pixval_32); //pixval_32 = ntohl(pixval_32); - if (isnan(pixval_32)) pixval_32 = 0; + if (isnan(float(pixval_32))) pixval_32 = 0; buffer[i] = pixval_32; tempData+=4; }

1 0

commit php7 for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package php7 for openSUSE:Factory checked in at 2016-04-30 23:31:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php7 (Old) and /work/SRC/openSUSE:Factory/.php7.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php7" Changes: -------- --- /work/SRC/openSUSE:Factory/php7/php7.changes 2016-04-22 16:24:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php7.new/php7.changes 2016-04-30 23:31:44.000000000 +0200 @@ -1,0 +2,17 @@ +Thu Apr 28 11:56:53 UTC 2016 - pgajdos(a)suse.com + +- updated to 7.0.6: This is a security release. Several security + bugs were fixed in this release. + * removed upstreamed php7-no-reentrant-crypt.patch + +------------------------------------------------------------------- +Mon Apr 25 09:47:49 UTC 2016 - schwab(a)linux-m68k.org + +- aarch64-mult.patch: fix asm constraints in aarch64 multiply macro + +------------------------------------------------------------------- +Thu Apr 7 08:19:27 UTC 2016 - pgajdos(a)suse.com + +- build for sle12 + +------------------------------------------------------------------- Old: ---- php-7.0.5.tar.xz php-7.0.5.tar.xz.asc php7-no-reentrant-crypt.patch New: ---- aarch64-mult.patch php-7.0.6.tar.xz php-7.0.6.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php7.spec ++++++ --- /var/tmp/diff_new_pack.YXBNj6/_old 2016-04-30 23:31:45.000000000 +0200 +++ /var/tmp/diff_new_pack.YXBNj6/_new 2016-04-30 23:31:45.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package php7 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -51,7 +51,7 @@ %define need_libxml2_hack %(if [ -e %{_includedir}/libxml/parser.h ]; then if grep -q XML_PARSE_OLDSAX %{_includedir}/libxml/parser.h; then echo 1; else echo 0; fi; else echo 0; fi) Name: php7 -Version: 7.0.5 +Version: 7.0.6 Release: 0 Summary: PHP7 Core Files License: PHP-3.01 @@ -91,12 +91,12 @@ # from their checking as I indicated in crypt-tests.patch yet, or php will # silently use his own implementation again Patch12: php7-crypt-tests.patch -# related to previous patch; !(defined(_REENTRANT) || defined(_THREAD_SAFE)) -Patch13: php7-no-reentrant-crypt.patch # https://bugs.php.net/bug.php?id=53007 Patch14: php7-odbc-cmp-int-cast.patch # https://bugs.php.net/bug.php?id=70461 Patch15: php7-fix_net-snmp_disable_MD5.patch +# https://bugs.php.net/bug.php?id=70015 +Patch16: aarch64-mult.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: apache-rpm-macros @@ -165,8 +165,7 @@ %if %{with firebird} BuildRequires: firebird-devel # libfbclient2-devel pkg split in 12.2 -# 'on all openSUSE from 12.1 (no sle12)', sigh -%if 0%{suse_version} > 1210 && (0%{?is_opensuse} || 0%{suse_version} != 1315) +%if 0%{suse_version} > 1210 BuildRequires: libfbclient2-devel %endif %endif @@ -645,7 +644,6 @@ PHP functions for access to firebird database servers. %endif - %package odbc Summary: PHP7 Extension Module Group: Development/Libraries/PHP @@ -765,7 +763,6 @@ functionality. %endif - %package readline Summary: PHP7 readline extension Group: Development/Libraries/PHP @@ -869,7 +866,6 @@ is compatible to 3rd party binary extension like ZendOptimizer. %endif - %package sysvmsg Summary: PHP7 Extension Module Group: Development/Libraries/PHP @@ -1041,9 +1037,9 @@ echo "*** SKIPPING LIBMXL2.7 FIX ***" %endif %patch12 -%patch13 %patch14 %patch15 +%patch16 -p1 # Safety check for API version change. vapi=`sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h` ++++++ aarch64-mult.patch ++++++ Index: php-7.0.5/Zend/zend_multiply.h =================================================================== --- php-7.0.5.orig/Zend/zend_multiply.h +++ php-7.0.5/Zend/zend_multiply.h @@ -53,8 +53,8 @@ __asm__("mul %0, %2, %3\n" \ "smulh %1, %2, %3\n" \ "sub %1, %1, %0, asr #63\n" \ - : "=X"(__tmpvar), "=X"(usedval) \ - : "X"(a), "X"(b)); \ + : "=&r"(__tmpvar), "=&r"(usedval) \ + : "r"(a), "r"(b)); \ if (usedval) (dval) = (double) (a) * (double) (b); \ else (lval) = __tmpvar; \ } while (0) ++++++ php-7.0.5.tar.xz -> php-7.0.6.tar.xz ++++++ /work/SRC/openSUSE:Factory/php7/php-7.0.5.tar.xz /work/SRC/openSUSE:Factory/.php7.new/php-7.0.6.tar.xz differ: char 26, line 1

1 0

commit chromium for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package chromium for openSUSE:Factory checked in at 2016-04-30 23:31:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromium (Old) and /work/SRC/openSUSE:Factory/.chromium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chromium" Changes: -------- --- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2016-04-22 16:24:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2016-04-30 23:31:33.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 22 14:06:30 UTC 2016 - jslaby(a)suse.com + +- _constraints: increase memory. It takes 1.2G to build some .o, and + with -j4 this results in OOM. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.fdBd9q/_old 2016-04-30 23:31:43.000000000 +0200 +++ /var/tmp/diff_new_pack.fdBd9q/_new 2016-04-30 23:31:43.000000000 +0200 @@ -6,7 +6,7 @@ <size unit="M">23000</size> </disk> <memory> - <size unit="M">4000</size> + <size unit="M">6000</size> </memory> </hardware> <overwrite> @@ -20,4 +20,4 @@ </memory> </hardware> </overwrite> -</constraints> \ No newline at end of file +</constraints>

1 0

commit mate-tweak for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package mate-tweak for openSUSE:Factory checked in at 2016-04-30 23:31:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-tweak (Old) and /work/SRC/openSUSE:Factory/.mate-tweak.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mate-tweak" Changes: -------- --- /work/SRC/openSUSE:Factory/mate-tweak/mate-tweak.changes 2016-04-15 19:11:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mate-tweak.new/mate-tweak.changes 2016-04-30 23:31:32.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 28 06:45:38 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to version 3.5.10: + * Modified composited window manager .desktop files to add a + phase delayed startup (lp#1553070). + * Update translations. + +------------------------------------------------------------------- Old: ---- mate-tweak-3.5.9.tar.gz New: ---- mate-tweak-3.5.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-tweak.spec ++++++ --- /var/tmp/diff_new_pack.nL041Q/_old 2016-04-30 23:31:33.000000000 +0200 +++ /var/tmp/diff_new_pack.nL041Q/_new 2016-04-30 23:31:33.000000000 +0200 @@ -17,9 +17,9 @@ %define _name mate_tweak -%define _rev d90d62bc967d +%define _rev 22374775981c Name: mate-tweak -Version: 3.5.9 +Version: 3.5.10 Release: 0 Summary: MATE desktop tweak tool License: GPL-2.0+ ++++++ mate-tweak-3.5.9.tar.gz -> mate-tweak-3.5.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/data/marco-compton.desktop new/ubuntu-mate-mate-tweak-22374775981c/data/marco-compton.desktop --- old/ubuntu-mate-mate-tweak-d90d62bc967d/data/marco-compton.desktop 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/data/marco-compton.desktop 2016-04-11 15:19:13.000000000 +0200 @@ -12,6 +12,7 @@ X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=marco X-MATE-Bugzilla-Component=general -X-MATE-Autostart-Phase=WindowManager +X-MATE-Autostart-Phase=Applications X-MATE-Provides=windowmanager X-MATE-Autostart-Notify=true +X-MATE-Autostart-Delay=2 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/data/metacity-compton.desktop new/ubuntu-mate-mate-tweak-22374775981c/data/metacity-compton.desktop --- old/ubuntu-mate-mate-tweak-d90d62bc967d/data/metacity-compton.desktop 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/data/metacity-compton.desktop 2016-04-11 15:19:13.000000000 +0200 @@ -12,7 +12,11 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=metacity X-GNOME-Bugzilla-Component=general -X-GNOME-Autostart-Phase=WindowManager +X-GNOME-Autostart-Phase=Applications +X-MATE-Autostart-Phase=Applications X-GNOME-Provides=windowmanager X-GNOME-Autostart-Notify=true X-Ubuntu-Gettext-Domain=metacity +X-GNOME-Autostart-Delay=2 +X-MATE-Autostart-Delay=2 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/mate-tweak new/ubuntu-mate-mate-tweak-22374775981c/mate-tweak --- old/ubuntu-mate-mate-tweak-d90d62bc967d/mate-tweak 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/mate-tweak 2016-04-11 15:19:13.000000000 +0200 @@ -56,7 +56,7 @@ # Workaround introspection bug, gnome bug 622084 signal.signal(signal.SIGINT, signal.SIG_DFL) -__VERSION__ = '3.5.9' +__VERSION__ = '3.5.10' __SYNAPSE__ = """[Desktop Entry] Name=Synapse diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/po/be.po new/ubuntu-mate-mate-tweak-22374775981c/po/be.po --- old/ubuntu-mate-mate-tweak-d90d62bc967d/po/be.po 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/po/be.po 2016-04-11 15:19:13.000000000 +0200 @@ -9,8 +9,8 @@ "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-01 16:42+0100\n" -"PO-Revision-Date: 2016-04-01 15:44+0000\n" -"Last-Translator: Martin Wimpress <code(a)flexion.org>\n" +"PO-Revision-Date: 2016-04-01 16:39+0000\n" +"Last-Translator: Mihail Varantsou <meequz(a)gmail.com>\n" "Language-Team: Belarusian (http://www.transifex.com/mate/MATE/language/be/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -54,7 +54,7 @@ msgid "" "You are currently using an unknown and unsupported window manager. Thus we " "cannot guarantee that changes made here will be effective." -msgstr "" +msgstr "Вы выкарыстоўваеце невядомы кіраўнік вокнаў. Ён не падтрымліваецца. Таму мы не можам гарантаваць, што змены, зробленыя тут, спрацуюць карэктна." #: ../mate-tweak:879 msgid "Cupertino" @@ -142,7 +142,7 @@ #: ../mate-tweak:1015 msgid "Panel Menu Features" -msgstr "" +msgstr "Магчымасці панэльнага меню" #: ../mate-tweak:1016 msgid "Icons" @@ -238,15 +238,15 @@ #: ../mate-tweak:1045 msgid "Show Applications" -msgstr "" +msgstr "Паказаць Праграмы" #: ../mate-tweak:1046 msgid "Show Places" -msgstr "" +msgstr "Паказаць Месцы" #: ../mate-tweak:1047 msgid "Show System" -msgstr "" +msgstr "Паказаць Сістэму" #: ../mate-tweak:1049 msgid "Show icons on menus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/po/da.po new/ubuntu-mate-mate-tweak-22374775981c/po/da.po --- old/ubuntu-mate-mate-tweak-d90d62bc967d/po/da.po 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/po/da.po 2016-04-11 15:19:13.000000000 +0200 @@ -10,8 +10,8 @@ "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-01 16:42+0100\n" -"PO-Revision-Date: 2016-04-01 15:44+0000\n" -"Last-Translator: Martin Wimpress <code(a)flexion.org>\n" +"PO-Revision-Date: 2016-04-03 07:11+0000\n" +"Last-Translator: Joe Hansen <joedalton2(a)yahoo.dk>\n" "Language-Team: Danish (http://www.transifex.com/mate/MATE/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +55,7 @@ msgid "" "You are currently using an unknown and unsupported window manager. Thus we " "cannot guarantee that changes made here will be effective." -msgstr "" +msgstr "Du bruger i øjeblikket en ukendt og ikke understøttet vindueshåndtering. Vi kan derfor ikke garantere, at ændringer lavet her vil træde i kraft." #: ../mate-tweak:879 msgid "Cupertino" @@ -143,7 +143,7 @@ #: ../mate-tweak:1015 msgid "Panel Menu Features" -msgstr "" +msgstr "Menufunktioner for panelet" #: ../mate-tweak:1016 msgid "Icons" @@ -239,15 +239,15 @@ #: ../mate-tweak:1045 msgid "Show Applications" -msgstr "" +msgstr "Vis programmer" #: ../mate-tweak:1046 msgid "Show Places" -msgstr "" +msgstr "Vis steder" #: ../mate-tweak:1047 msgid "Show System" -msgstr "" +msgstr "Vis system" #: ../mate-tweak:1049 msgid "Show icons on menus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/po/de.po new/ubuntu-mate-mate-tweak-22374775981c/po/de.po --- old/ubuntu-mate-mate-tweak-d90d62bc967d/po/de.po 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/po/de.po 2016-04-11 15:19:13.000000000 +0200 @@ -4,14 +4,15 @@ # # Translators: # Ettore Atalan <atalanttore(a)googlemail.com>, 2015 +# qazwsxedc <qazwsxedc(a)gmx.net>, 2016 # Tobias Bannert <tobannert(a)gmail.com>, 2015-2016 msgid "" msgstr "" "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-01 16:42+0100\n" -"PO-Revision-Date: 2016-04-01 15:44+0000\n" -"Last-Translator: Martin Wimpress <code(a)flexion.org>\n" +"PO-Revision-Date: 2016-04-03 12:04+0000\n" +"Last-Translator: qazwsxedc <qazwsxedc(a)gmx.net>\n" "Language-Team: German (http://www.transifex.com/mate/MATE/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +56,7 @@ msgid "" "You are currently using an unknown and unsupported window manager. Thus we " "cannot guarantee that changes made here will be effective." -msgstr "" +msgstr "Sie benutzen im Moment eine unbekannte und nicht unterstützte Fensterverwaltung. Deswegen können wir nicht garantieren, dass hier eingegebene Änderungen übernommen werden." #: ../mate-tweak:879 msgid "Cupertino" @@ -143,7 +144,7 @@ #: ../mate-tweak:1015 msgid "Panel Menu Features" -msgstr "" +msgstr "Leistenmenüeigenschaften" #: ../mate-tweak:1016 msgid "Icons" @@ -239,15 +240,15 @@ #: ../mate-tweak:1045 msgid "Show Applications" -msgstr "" +msgstr "Anwendungen anzeigen" #: ../mate-tweak:1046 msgid "Show Places" -msgstr "" +msgstr "Orte anzeigen" #: ../mate-tweak:1047 msgid "Show System" -msgstr "" +msgstr "System anzeigen" #: ../mate-tweak:1049 msgid "Show icons on menus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/po/fr.po new/ubuntu-mate-mate-tweak-22374775981c/po/fr.po --- old/ubuntu-mate-mate-tweak-d90d62bc967d/po/fr.po 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/po/fr.po 2016-04-11 15:19:13.000000000 +0200 @@ -13,8 +13,8 @@ "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-01 16:42+0100\n" -"PO-Revision-Date: 2016-04-01 15:44+0000\n" -"Last-Translator: Martin Wimpress <code(a)flexion.org>\n" +"PO-Revision-Date: 2016-04-03 07:13+0000\n" +"Last-Translator: mauron\n" "Language-Team: French (http://www.transifex.com/mate/MATE/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,7 +58,7 @@ msgid "" "You are currently using an unknown and unsupported window manager. Thus we " "cannot guarantee that changes made here will be effective." -msgstr "" +msgstr "Vous utilisez actuellement un gestionnaire de fenêtres inconnu et non supporté. Aussi nous ne pouvons garantir que les changements effectués ici seront effectifs." #: ../mate-tweak:879 msgid "Cupertino" @@ -146,7 +146,7 @@ #: ../mate-tweak:1015 msgid "Panel Menu Features" -msgstr "" +msgstr "Fonctionnalités du menu du tableau de bord" #: ../mate-tweak:1016 msgid "Icons" @@ -242,15 +242,15 @@ #: ../mate-tweak:1045 msgid "Show Applications" -msgstr "" +msgstr "Afficher les applications" #: ../mate-tweak:1046 msgid "Show Places" -msgstr "" +msgstr "Afficher les raccourcis" #: ../mate-tweak:1047 msgid "Show System" -msgstr "" +msgstr "Afficher le système" #: ../mate-tweak:1049 msgid "Show icons on menus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/po/hr.po new/ubuntu-mate-mate-tweak-22374775981c/po/hr.po --- old/ubuntu-mate-mate-tweak-d90d62bc967d/po/hr.po 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/po/hr.po 2016-04-11 15:19:13.000000000 +0200 @@ -11,8 +11,8 @@ "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-01 16:42+0100\n" -"PO-Revision-Date: 2016-04-01 15:44+0000\n" -"Last-Translator: Martin Wimpress <code(a)flexion.org>\n" +"PO-Revision-Date: 2016-04-04 14:52+0000\n" +"Last-Translator: Mislav E. Lukšić <meluksic(a)yahoo.com>\n" "Language-Team: Croatian (http://www.transifex.com/mate/MATE/language/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -56,7 +56,7 @@ msgid "" "You are currently using an unknown and unsupported window manager. Thus we " "cannot guarantee that changes made here will be effective." -msgstr "" +msgstr "Trenutno koristiš nepoznati i nepodržani upravitelj prozora. Stoga ne možemo jamčiti da će ovdje učinjene promjene biti učinkovite." #: ../mate-tweak:879 msgid "Cupertino" @@ -144,7 +144,7 @@ #: ../mate-tweak:1015 msgid "Panel Menu Features" -msgstr "" +msgstr "Značajke ploče izbornika" #: ../mate-tweak:1016 msgid "Icons" @@ -240,15 +240,15 @@ #: ../mate-tweak:1045 msgid "Show Applications" -msgstr "" +msgstr "Prikaži aplikacije" #: ../mate-tweak:1046 msgid "Show Places" -msgstr "" +msgstr "Prikaži mjesta" #: ../mate-tweak:1047 msgid "Show System" -msgstr "" +msgstr "Prikaži sustav" #: ../mate-tweak:1049 msgid "Show icons on menus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/po/hu.po new/ubuntu-mate-mate-tweak-22374775981c/po/hu.po --- old/ubuntu-mate-mate-tweak-d90d62bc967d/po/hu.po 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/po/hu.po 2016-04-11 15:19:13.000000000 +0200 @@ -11,8 +11,8 @@ "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-01 16:42+0100\n" -"PO-Revision-Date: 2016-04-01 15:44+0000\n" -"Last-Translator: Martin Wimpress <code(a)flexion.org>\n" +"PO-Revision-Date: 2016-04-02 05:42+0000\n" +"Last-Translator: Rezső Páder <rezso(a)rezso.net>\n" "Language-Team: Hungarian (http://www.transifex.com/mate/MATE/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -56,7 +56,7 @@ msgid "" "You are currently using an unknown and unsupported window manager. Thus we " "cannot guarantee that changes made here will be effective." -msgstr "" +msgstr "Ismeretlen, nem támogatott ablakkezelő van használatban. Nem garantált, hogy az itt beállított módosítások működni fognak." #: ../mate-tweak:879 msgid "Cupertino" @@ -144,7 +144,7 @@ #: ../mate-tweak:1015 msgid "Panel Menu Features" -msgstr "" +msgstr "Panel menü lehetőségek" #: ../mate-tweak:1016 msgid "Icons" @@ -240,15 +240,15 @@ #: ../mate-tweak:1045 msgid "Show Applications" -msgstr "" +msgstr "Alkalmazások megjelenítése" #: ../mate-tweak:1046 msgid "Show Places" -msgstr "" +msgstr "Helyek megjelenítése" #: ../mate-tweak:1047 msgid "Show System" -msgstr "" +msgstr "Rendszer megjelenítése" #: ../mate-tweak:1049 msgid "Show icons on menus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/po/it.po new/ubuntu-mate-mate-tweak-22374775981c/po/it.po --- old/ubuntu-mate-mate-tweak-d90d62bc967d/po/it.po 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/po/it.po 2016-04-11 15:19:13.000000000 +0200 @@ -13,8 +13,8 @@ "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-01 16:42+0100\n" -"PO-Revision-Date: 2016-04-01 15:44+0000\n" -"Last-Translator: Martin Wimpress <code(a)flexion.org>\n" +"PO-Revision-Date: 2016-04-01 17:59+0000\n" +"Last-Translator: Marco Giannini <giannini.marco(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/mate/MATE/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,7 +58,7 @@ msgid "" "You are currently using an unknown and unsupported window manager. Thus we " "cannot guarantee that changes made here will be effective." -msgstr "" +msgstr "Stai utilizzando un window manager sconosciuto e non supportato. Così non possiamo garantire che le modifiche apportate saranno efficaci ." #: ../mate-tweak:879 msgid "Cupertino" @@ -146,7 +146,7 @@ #: ../mate-tweak:1015 msgid "Panel Menu Features" -msgstr "" +msgstr "Caratteristiche del Pannello dei Menu" #: ../mate-tweak:1016 msgid "Icons" @@ -166,11 +166,11 @@ #: ../mate-tweak:1021 msgid "Select the Desktop Icons you want enabled:" -msgstr "" +msgstr "Seleziona le Icone del Desktop che si desidera abilitare:" #: ../mate-tweak:1022 msgid "Show Desktop Icons" -msgstr "" +msgstr "Mostra le Icone del Desktop" #: ../mate-tweak:1023 msgid "Computer" @@ -230,7 +230,7 @@ #: ../mate-tweak:1041 msgid "Enable advanced menu" -msgstr "Abilità menù avanzato" +msgstr "Abilita menù avanzato" #: ../mate-tweak:1042 msgid "Enable keyboard LED" @@ -238,19 +238,19 @@ #: ../mate-tweak:1043 msgid "Enable launcher" -msgstr "" +msgstr "Abilita lanciatore" #: ../mate-tweak:1045 msgid "Show Applications" -msgstr "" +msgstr "Mostra Applicazioni" #: ../mate-tweak:1046 msgid "Show Places" -msgstr "" +msgstr "Mostra Risorse" #: ../mate-tweak:1047 msgid "Show System" -msgstr "" +msgstr "Mostra Sistema" #: ../mate-tweak:1049 msgid "Show icons on menus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/po/ko.po new/ubuntu-mate-mate-tweak-22374775981c/po/ko.po --- old/ubuntu-mate-mate-tweak-d90d62bc967d/po/ko.po 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/po/ko.po 2016-04-11 15:19:13.000000000 +0200 @@ -11,8 +11,8 @@ "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-01 16:42+0100\n" -"PO-Revision-Date: 2016-04-01 15:44+0000\n" -"Last-Translator: Martin Wimpress <code(a)flexion.org>\n" +"PO-Revision-Date: 2016-04-01 20:14+0000\n" +"Last-Translator: 박정규(Jung-Kyu Park) <bagjunggyu(a)gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/mate/MATE/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -56,7 +56,7 @@ msgid "" "You are currently using an unknown and unsupported window manager. Thus we " "cannot guarantee that changes made here will be effective." -msgstr "" +msgstr "지금 사용하시는 창 관리자는 알려지지 않았거나 지원되지 않는 것입니다. 그러므로 우리는 적용하신 변경 사항에 대한 책임을 지지 않습니다." #: ../mate-tweak:879 msgid "Cupertino" @@ -144,7 +144,7 @@ #: ../mate-tweak:1015 msgid "Panel Menu Features" -msgstr "" +msgstr "패널 메뉴 기능" #: ../mate-tweak:1016 msgid "Icons" @@ -212,7 +212,7 @@ #: ../mate-tweak:1035 msgid "Do not auto-maximize new windows" -msgstr "새 창은 자동 - 최대화하지 않기" +msgstr "새 창을 자동으로 최대화하지 않기" #: ../mate-tweak:1037 msgid "Window control placement." @@ -240,15 +240,15 @@ #: ../mate-tweak:1045 msgid "Show Applications" -msgstr "" +msgstr "애플리케이션 표시" #: ../mate-tweak:1046 msgid "Show Places" -msgstr "" +msgstr "위치 표시" #: ../mate-tweak:1047 msgid "Show System" -msgstr "" +msgstr "시스템 표시" #: ../mate-tweak:1049 msgid "Show icons on menus" @@ -284,11 +284,11 @@ #: ../mate-tweak:1081 msgid "Traditional (Right)" -msgstr "옛 방식 (오른쪽)" +msgstr "옛날 (오른쪽)" #: ../mate-tweak:1082 msgid "Contemporary (Left)" -msgstr "최근 방식 (왼쪽)" +msgstr "요즘 (왼쪽)" #: ../mate-tweak:1088 msgid "The new window manager will be activated upon selection." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/po/lt.po new/ubuntu-mate-mate-tweak-22374775981c/po/lt.po --- old/ubuntu-mate-mate-tweak-d90d62bc967d/po/lt.po 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/po/lt.po 2016-04-11 15:19:13.000000000 +0200 @@ -10,8 +10,8 @@ "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-01 16:42+0100\n" -"PO-Revision-Date: 2016-04-01 15:44+0000\n" -"Last-Translator: Martin Wimpress <code(a)flexion.org>\n" +"PO-Revision-Date: 2016-04-02 16:34+0000\n" +"Last-Translator: Moo\n" "Language-Team: Lithuanian (http://www.transifex.com/mate/MATE/language/lt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +55,7 @@ msgid "" "You are currently using an unknown and unsupported window manager. Thus we " "cannot guarantee that changes made here will be effective." -msgstr "" +msgstr "Jūs šiuo metu naudojate nežinomą ir nepalaikomą langų tvarkytuvę. Dėl to, mes negalime garantuoti, kad čia atlikti pakeitimai ką nors įtakos." #: ../mate-tweak:879 msgid "Cupertino" @@ -143,7 +143,7 @@ #: ../mate-tweak:1015 msgid "Panel Menu Features" -msgstr "" +msgstr "Skydelio meniu ypatybės" #: ../mate-tweak:1016 msgid "Icons" @@ -239,15 +239,15 @@ #: ../mate-tweak:1045 msgid "Show Applications" -msgstr "" +msgstr "Rodyti programas" #: ../mate-tweak:1046 msgid "Show Places" -msgstr "" +msgstr "Rodyti vietas" #: ../mate-tweak:1047 msgid "Show System" -msgstr "" +msgstr "Rodyti sistemą" #: ../mate-tweak:1049 msgid "Show icons on menus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/po/ms.po new/ubuntu-mate-mate-tweak-22374775981c/po/ms.po --- old/ubuntu-mate-mate-tweak-d90d62bc967d/po/ms.po 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/po/ms.po 2016-04-11 15:19:13.000000000 +0200 @@ -10,8 +10,8 @@ "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-01 16:42+0100\n" -"PO-Revision-Date: 2016-04-01 15:44+0000\n" -"Last-Translator: Martin Wimpress <code(a)flexion.org>\n" +"PO-Revision-Date: 2016-04-04 15:41+0000\n" +"Last-Translator: abuyop <abuyop(a)gmail.com>\n" "Language-Team: Malay (http://www.transifex.com/mate/MATE/language/ms/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +55,7 @@ msgid "" "You are currently using an unknown and unsupported window manager. Thus we " "cannot guarantee that changes made here will be effective." -msgstr "" +msgstr "Anda kini menggunakan pengurus tetingkap yang tidak diketahui dan tidak disokong. Maka kami tidak dapat memberi jaminan perubahan yang telah dibuat akan berkesan." #: ../mate-tweak:879 msgid "Cupertino" @@ -99,7 +99,7 @@ #: ../mate-tweak:911 msgid "Wimpy" -msgstr "" +msgstr "Wimpy" #: ../mate-tweak:961 msgid "Desktop" @@ -143,7 +143,7 @@ #: ../mate-tweak:1015 msgid "Panel Menu Features" -msgstr "" +msgstr "Fitur Menu Panel" #: ../mate-tweak:1016 msgid "Icons" @@ -163,11 +163,11 @@ #: ../mate-tweak:1021 msgid "Select the Desktop Icons you want enabled:" -msgstr "" +msgstr "Pilih Ikon Desktop yang mahu dibenarkan:" #: ../mate-tweak:1022 msgid "Show Desktop Icons" -msgstr "" +msgstr "Tunjuk Ikon Desktop" #: ../mate-tweak:1023 msgid "Computer" @@ -235,19 +235,19 @@ #: ../mate-tweak:1043 msgid "Enable launcher" -msgstr "" +msgstr "Benarkan pelancar" #: ../mate-tweak:1045 msgid "Show Applications" -msgstr "" +msgstr "Tunjuk Aplikasi" #: ../mate-tweak:1046 msgid "Show Places" -msgstr "" +msgstr "Tunjuk Tempat" #: ../mate-tweak:1047 msgid "Show System" -msgstr "" +msgstr "Tunjuk Sistem" #: ../mate-tweak:1049 msgid "Show icons on menus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/po/nl.po new/ubuntu-mate-mate-tweak-22374775981c/po/nl.po --- old/ubuntu-mate-mate-tweak-d90d62bc967d/po/nl.po 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/po/nl.po 2016-04-11 15:19:13.000000000 +0200 @@ -16,8 +16,8 @@ "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-01 16:42+0100\n" -"PO-Revision-Date: 2016-04-01 15:44+0000\n" -"Last-Translator: Martin Wimpress <code(a)flexion.org>\n" +"PO-Revision-Date: 2016-04-04 08:54+0000\n" +"Last-Translator: Robbie Deighton <deightonrobbie(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/mate/MATE/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -245,15 +245,15 @@ #: ../mate-tweak:1045 msgid "Show Applications" -msgstr "" +msgstr "Toon Applicaties" #: ../mate-tweak:1046 msgid "Show Places" -msgstr "" +msgstr "Toon Plaatsen" #: ../mate-tweak:1047 msgid "Show System" -msgstr "" +msgstr "Toon Systeem" #: ../mate-tweak:1049 msgid "Show icons on menus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/po/pl.po new/ubuntu-mate-mate-tweak-22374775981c/po/pl.po --- old/ubuntu-mate-mate-tweak-d90d62bc967d/po/pl.po 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/po/pl.po 2016-04-11 15:19:13.000000000 +0200 @@ -13,8 +13,8 @@ "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-01 16:42+0100\n" -"PO-Revision-Date: 2016-04-01 15:44+0000\n" -"Last-Translator: Martin Wimpress <code(a)flexion.org>\n" +"PO-Revision-Date: 2016-04-08 01:08+0000\n" +"Last-Translator: Darek Witkowski\n" "Language-Team: Polish (http://www.transifex.com/mate/MATE/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,7 +58,7 @@ msgid "" "You are currently using an unknown and unsupported window manager. Thus we " "cannot guarantee that changes made here will be effective." -msgstr "" +msgstr "Aktualnie używasz nieznanego i niewspieranego menadżera okien. Z tego powodu nie gwarantujemy, że zmiany tutaj wprowadzone będą skuteczne." #: ../mate-tweak:879 msgid "Cupertino" @@ -146,7 +146,7 @@ #: ../mate-tweak:1015 msgid "Panel Menu Features" -msgstr "" +msgstr "Cechy Menu Panelu" #: ../mate-tweak:1016 msgid "Icons" @@ -242,15 +242,15 @@ #: ../mate-tweak:1045 msgid "Show Applications" -msgstr "" +msgstr "Pokaż Programy" #: ../mate-tweak:1046 msgid "Show Places" -msgstr "" +msgstr "Pokaż Miejsca" #: ../mate-tweak:1047 msgid "Show System" -msgstr "" +msgstr "Pokaż System" #: ../mate-tweak:1049 msgid "Show icons on menus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/po/pt_BR.po new/ubuntu-mate-mate-tweak-22374775981c/po/pt_BR.po --- old/ubuntu-mate-mate-tweak-d90d62bc967d/po/pt_BR.po 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/po/pt_BR.po 2016-04-11 15:19:13.000000000 +0200 @@ -14,8 +14,8 @@ "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-01 16:42+0100\n" -"PO-Revision-Date: 2016-04-01 15:44+0000\n" -"Last-Translator: Martin Wimpress <code(a)flexion.org>\n" +"PO-Revision-Date: 2016-04-01 17:56+0000\n" +"Last-Translator: Marcelo Ghelman <marcelo.ghelman(a)gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/mate/MATE/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -59,7 +59,7 @@ msgid "" "You are currently using an unknown and unsupported window manager. Thus we " "cannot guarantee that changes made here will be effective." -msgstr "" +msgstr "Você está usando um gerenciador de janelas desconhecido e não suportado. Portanto não podemos garantir que alterações feitas aqui serão efetivadas." #: ../mate-tweak:879 msgid "Cupertino" @@ -147,7 +147,7 @@ #: ../mate-tweak:1015 msgid "Panel Menu Features" -msgstr "" +msgstr "Recursos do menu do painel" #: ../mate-tweak:1016 msgid "Icons" @@ -243,15 +243,15 @@ #: ../mate-tweak:1045 msgid "Show Applications" -msgstr "" +msgstr "Exibir aplicações" #: ../mate-tweak:1046 msgid "Show Places" -msgstr "" +msgstr "Exibir locais" #: ../mate-tweak:1047 msgid "Show System" -msgstr "" +msgstr "Exibir sistema" #: ../mate-tweak:1049 msgid "Show icons on menus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/po/ru.po new/ubuntu-mate-mate-tweak-22374775981c/po/ru.po --- old/ubuntu-mate-mate-tweak-d90d62bc967d/po/ru.po 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/po/ru.po 2016-04-11 15:19:13.000000000 +0200 @@ -11,14 +11,15 @@ # Konstantin <kilolife(a)gmail.com>, 2015 # Olee boy <boyoldboyold(a)gmail.com>, 2016 # theirix <theirix(a)gmail.com>, 2016 +# Дмитрий Михирев <bizdelnick(a)gmail.com>, 2016 # Иван <pentuh(a)tut.by>, 2016 msgid "" msgstr "" "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-01 16:42+0100\n" -"PO-Revision-Date: 2016-04-01 15:44+0000\n" -"Last-Translator: Martin Wimpress <code(a)flexion.org>\n" +"PO-Revision-Date: 2016-04-01 18:55+0000\n" +"Last-Translator: Дмитрий Михирев <bizdelnick(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/mate/MATE/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -62,7 +63,7 @@ msgid "" "You are currently using an unknown and unsupported window manager. Thus we " "cannot guarantee that changes made here will be effective." -msgstr "" +msgstr "Используется неизвестный и неподдерживаемый менеджер окон. Нет гарантии, что сделанные здесь изменения будут иметь эффект." #: ../mate-tweak:879 msgid "Cupertino" @@ -150,7 +151,7 @@ #: ../mate-tweak:1015 msgid "Panel Menu Features" -msgstr "" +msgstr "Свойства меню панели" #: ../mate-tweak:1016 msgid "Icons" @@ -194,7 +195,7 @@ #: ../mate-tweak:1027 msgid "Mounted Volumes" -msgstr "Подключенные носители" +msgstr "Подключенные тома" #: ../mate-tweak:1029 msgid "Enable animations" @@ -246,15 +247,15 @@ #: ../mate-tweak:1045 msgid "Show Applications" -msgstr "" +msgstr "Показать приложения" #: ../mate-tweak:1046 msgid "Show Places" -msgstr "" +msgstr "Показать места" #: ../mate-tweak:1047 msgid "Show System" -msgstr "" +msgstr "Показать систему" #: ../mate-tweak:1049 msgid "Show icons on menus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/po/sk.po new/ubuntu-mate-mate-tweak-22374775981c/po/sk.po --- old/ubuntu-mate-mate-tweak-d90d62bc967d/po/sk.po 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/po/sk.po 2016-04-11 15:19:13.000000000 +0200 @@ -11,8 +11,8 @@ "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-01 16:42+0100\n" -"PO-Revision-Date: 2016-04-01 15:44+0000\n" -"Last-Translator: Martin Wimpress <code(a)flexion.org>\n" +"PO-Revision-Date: 2016-04-02 09:42+0000\n" +"Last-Translator: Dušan Kazik <prescott66(a)gmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/mate/MATE/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -56,7 +56,7 @@ msgid "" "You are currently using an unknown and unsupported window manager. Thus we " "cannot guarantee that changes made here will be effective." -msgstr "" +msgstr "Momentálne používate neznámeho alebo nepodporovaného správcu okien. Preto nie je zaručené, že vykonané zmeny budú uplatnené." #: ../mate-tweak:879 msgid "Cupertino" @@ -144,7 +144,7 @@ #: ../mate-tweak:1015 msgid "Panel Menu Features" -msgstr "" +msgstr "Funkcie panelu ponuky" #: ../mate-tweak:1016 msgid "Icons" @@ -240,15 +240,15 @@ #: ../mate-tweak:1045 msgid "Show Applications" -msgstr "" +msgstr "Zobraziť aplikácie" #: ../mate-tweak:1046 msgid "Show Places" -msgstr "" +msgstr "Zobraziť miesta" #: ../mate-tweak:1047 msgid "Show System" -msgstr "" +msgstr "Zobraziť systém" #: ../mate-tweak:1049 msgid "Show icons on menus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/po/sq.po new/ubuntu-mate-mate-tweak-22374775981c/po/sq.po --- old/ubuntu-mate-mate-tweak-d90d62bc967d/po/sq.po 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/po/sq.po 2016-04-11 15:19:13.000000000 +0200 @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Ardit Dani <ardit.dani(a)gmail.com>, 2016 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009 # Indrit Bashkimi <indrit.bashkimi(a)gmail.com>, 2015 msgid "" @@ -10,8 +11,8 @@ "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-01 16:42+0100\n" -"PO-Revision-Date: 2016-04-01 15:44+0000\n" -"Last-Translator: Martin Wimpress <code(a)flexion.org>\n" +"PO-Revision-Date: 2016-04-08 11:18+0000\n" +"Last-Translator: Ardit Dani <ardit.dani(a)gmail.com>\n" "Language-Team: Albanian (http://www.transifex.com/mate/MATE/language/sq/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -63,11 +64,11 @@ #: ../mate-tweak:882 msgid "Fedora" -msgstr "" +msgstr "Fedora" #: ../mate-tweak:885 msgid "GNOME2" -msgstr "" +msgstr "GNOME2" #: ../mate-tweak:888 msgid "Linux Mint" @@ -75,7 +76,7 @@ #: ../mate-tweak:891 msgid "Mageia" -msgstr "" +msgstr "Mageia" #: ../mate-tweak:896 msgid "Mutiny" @@ -135,7 +136,7 @@ #: ../mate-tweak:1013 msgid "Panels" -msgstr "" +msgstr "Panele" #: ../mate-tweak:1014 msgid "Panel Features" @@ -191,7 +192,7 @@ #: ../mate-tweak:1029 msgid "Enable animations" -msgstr "" +msgstr "Aktivizo animacionet" #: ../mate-tweak:1030 msgid "Do not show window content when moving windows" @@ -267,7 +268,7 @@ #: ../mate-tweak:1054 msgid "Style:" -msgstr "" +msgstr "Stili:" #: ../mate-tweak:1055 msgid "Icon size:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/po/sr.po new/ubuntu-mate-mate-tweak-22374775981c/po/sr.po --- old/ubuntu-mate-mate-tweak-d90d62bc967d/po/sr.po 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/po/sr.po 2016-04-11 15:19:13.000000000 +0200 @@ -11,8 +11,8 @@ "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-01 16:42+0100\n" -"PO-Revision-Date: 2016-04-01 15:44+0000\n" -"Last-Translator: Martin Wimpress <code(a)flexion.org>\n" +"PO-Revision-Date: 2016-04-03 05:48+0000\n" +"Last-Translator: Мирослав Николић <miroslavnikolic(a)rocketmail.com>\n" "Language-Team: Serbian (http://www.transifex.com/mate/MATE/language/sr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -56,7 +56,7 @@ msgid "" "You are currently using an unknown and unsupported window manager. Thus we " "cannot guarantee that changes made here will be effective." -msgstr "" +msgstr "Тренутно користите непознатог и неподржаног управника прозора. Стога вам не можемо гарантовати да ће измене које сте овде учинили бити делотворне." #: ../mate-tweak:879 msgid "Cupertino" @@ -144,7 +144,7 @@ #: ../mate-tweak:1015 msgid "Panel Menu Features" -msgstr "" +msgstr "Функције изборника панела" #: ../mate-tweak:1016 msgid "Icons" @@ -240,15 +240,15 @@ #: ../mate-tweak:1045 msgid "Show Applications" -msgstr "" +msgstr "Прикажи програме" #: ../mate-tweak:1046 msgid "Show Places" -msgstr "" +msgstr "Прикажи места" #: ../mate-tweak:1047 msgid "Show System" -msgstr "" +msgstr "Прикажи систем" #: ../mate-tweak:1049 msgid "Show icons on menus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/po/tr.po new/ubuntu-mate-mate-tweak-22374775981c/po/tr.po --- old/ubuntu-mate-mate-tweak-d90d62bc967d/po/tr.po 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/po/tr.po 2016-04-11 15:19:13.000000000 +0200 @@ -12,8 +12,8 @@ "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-01 16:42+0100\n" -"PO-Revision-Date: 2016-04-01 15:44+0000\n" -"Last-Translator: Martin Wimpress <code(a)flexion.org>\n" +"PO-Revision-Date: 2016-04-02 08:51+0000\n" +"Last-Translator: mauron\n" "Language-Team: Turkish (http://www.transifex.com/mate/MATE/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,7 +57,7 @@ msgid "" "You are currently using an unknown and unsupported window manager. Thus we " "cannot guarantee that changes made here will be effective." -msgstr "" +msgstr "Şu anda bilinmeyen ve desteklenmeyen bir pencere yöneticisi kullanmaktasınız. Bu nedenle burada yaptığınız değişikliklerin etkili olacağını garanti edemeyiz." #: ../mate-tweak:879 msgid "Cupertino" @@ -145,7 +145,7 @@ #: ../mate-tweak:1015 msgid "Panel Menu Features" -msgstr "" +msgstr "Panel Menüsü Özellikleri" #: ../mate-tweak:1016 msgid "Icons" @@ -241,15 +241,15 @@ #: ../mate-tweak:1045 msgid "Show Applications" -msgstr "" +msgstr "Uygulamaları Göster" #: ../mate-tweak:1046 msgid "Show Places" -msgstr "" +msgstr "Yerleri Göster" #: ../mate-tweak:1047 msgid "Show System" -msgstr "" +msgstr "Sistemi Göster" #: ../mate-tweak:1049 msgid "Show icons on menus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/po/uk.po new/ubuntu-mate-mate-tweak-22374775981c/po/uk.po --- old/ubuntu-mate-mate-tweak-d90d62bc967d/po/uk.po 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/po/uk.po 2016-04-11 15:19:13.000000000 +0200 @@ -11,8 +11,8 @@ "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-01 16:42+0100\n" -"PO-Revision-Date: 2016-04-01 15:44+0000\n" -"Last-Translator: Martin Wimpress <code(a)flexion.org>\n" +"PO-Revision-Date: 2016-04-02 06:00+0000\n" +"Last-Translator: Микола Ткач <Stuartlittle1970(a)gmail.com>\n" "Language-Team: Ukrainian (http://www.transifex.com/mate/MATE/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -56,7 +56,7 @@ msgid "" "You are currently using an unknown and unsupported window manager. Thus we " "cannot guarantee that changes made here will be effective." -msgstr "" +msgstr "Ви використовуєте невідомий і непідтримуваний керівник вікнами. Немає запорук, що зміни, зроблені тут, будуть мати ефект." #: ../mate-tweak:879 msgid "Cupertino" @@ -144,7 +144,7 @@ #: ../mate-tweak:1015 msgid "Panel Menu Features" -msgstr "" +msgstr "Властивости меню панелі" #: ../mate-tweak:1016 msgid "Icons" @@ -240,15 +240,15 @@ #: ../mate-tweak:1045 msgid "Show Applications" -msgstr "" +msgstr "Показати додатки" #: ../mate-tweak:1046 msgid "Show Places" -msgstr "" +msgstr "Показати місця" #: ../mate-tweak:1047 msgid "Show System" -msgstr "" +msgstr "Показати систему" #: ../mate-tweak:1049 msgid "Show icons on menus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/po/zh_CN.po new/ubuntu-mate-mate-tweak-22374775981c/po/zh_CN.po --- old/ubuntu-mate-mate-tweak-d90d62bc967d/po/zh_CN.po 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/po/zh_CN.po 2016-04-11 15:19:13.000000000 +0200 @@ -14,8 +14,8 @@ "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-01 16:42+0100\n" -"PO-Revision-Date: 2016-04-01 15:44+0000\n" -"Last-Translator: Martin Wimpress <code(a)flexion.org>\n" +"PO-Revision-Date: 2016-04-02 08:31+0000\n" +"Last-Translator: liushuyu011 <liushuyu011(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/mate/MATE/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -59,7 +59,7 @@ msgid "" "You are currently using an unknown and unsupported window manager. Thus we " "cannot guarantee that changes made here will be effective." -msgstr "" +msgstr "你现在正在使用一个未知的且不受支持的窗口管理器。因此我们不能保证你在这里作出的修改可以生效。" #: ../mate-tweak:879 msgid "Cupertino" @@ -147,7 +147,7 @@ #: ../mate-tweak:1015 msgid "Panel Menu Features" -msgstr "" +msgstr "面板菜单特性" #: ../mate-tweak:1016 msgid "Icons" @@ -243,15 +243,15 @@ #: ../mate-tweak:1045 msgid "Show Applications" -msgstr "" +msgstr "显示应用程序" #: ../mate-tweak:1046 msgid "Show Places" -msgstr "" +msgstr "显示位置" #: ../mate-tweak:1047 msgid "Show System" -msgstr "" +msgstr "显示系统" #: ../mate-tweak:1049 msgid "Show icons on menus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-tweak-d90d62bc967d/po/zh_TW.po new/ubuntu-mate-mate-tweak-22374775981c/po/zh_TW.po --- old/ubuntu-mate-mate-tweak-d90d62bc967d/po/zh_TW.po 2016-04-01 17:48:40.000000000 +0200 +++ new/ubuntu-mate-mate-tweak-22374775981c/po/zh_TW.po 2016-04-11 15:19:13.000000000 +0200 @@ -10,8 +10,8 @@ "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-01 16:42+0100\n" -"PO-Revision-Date: 2016-04-01 15:44+0000\n" -"Last-Translator: Martin Wimpress <code(a)flexion.org>\n" +"PO-Revision-Date: 2016-04-05 14:11+0000\n" +"Last-Translator: Jeff Huang <s8321414(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/mate/MATE/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +55,7 @@ msgid "" "You are currently using an unknown and unsupported window manager. Thus we " "cannot guarantee that changes made here will be effective." -msgstr "" +msgstr "您目前正在使用未知且不支援的視窗管理員。所以我們無法保證做出的變更一定會生效。" #: ../mate-tweak:879 msgid "Cupertino" @@ -143,7 +143,7 @@ #: ../mate-tweak:1015 msgid "Panel Menu Features" -msgstr "" +msgstr "面板選單功能" #: ../mate-tweak:1016 msgid "Icons" @@ -239,15 +239,15 @@ #: ../mate-tweak:1045 msgid "Show Applications" -msgstr "" +msgstr "顯示應用程式" #: ../mate-tweak:1046 msgid "Show Places" -msgstr "" +msgstr "顯示位置" #: ../mate-tweak:1047 msgid "Show System" -msgstr "" +msgstr "顯示系統" #: ../mate-tweak:1049 msgid "Show icons on menus"

1 0

commit mate-menu for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package mate-menu for openSUSE:Factory checked in at 2016-04-30 23:31:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-menu (Old) and /work/SRC/openSUSE:Factory/.mate-menu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mate-menu" Changes: -------- --- /work/SRC/openSUSE:Factory/mate-menu/mate-menu.changes 2016-04-15 19:11:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mate-menu.new/mate-menu.changes 2016-04-30 23:31:31.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Apr 28 06:45:38 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to version 5.7.1: + * Fix configuring a custom heading colour (lp#1560332). + * Display the Software Boutique as package manager if it is + available (lp#1568170). + * Ensure the menu is always drawn over existing windows + (lp#1569563) +- Rebase 0001-xterm-no-symlink-dep.patch, 0002-yast2-software.patch. + +------------------------------------------------------------------- Old: ---- mate-menu-5.7.0.tar.gz New: ---- mate-menu-5.7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-menu.spec ++++++ --- /var/tmp/diff_new_pack.9NSZz7/_old 2016-04-30 23:31:32.000000000 +0200 +++ /var/tmp/diff_new_pack.9NSZz7/_new 2016-04-30 23:31:32.000000000 +0200 @@ -17,9 +17,9 @@ %define _name mate_menu -%define _rev 77ef996a35b8 +%define _rev 6b637f9272b2 Name: mate-menu -Version: 5.7.0 +Version: 5.7.1 Release: 0 Summary: Advanced MATE menu License: GPL-2.0+ @@ -32,7 +32,7 @@ Patch1: 0002-yast2-software.patch BuildRequires: gobject-introspection-devel BuildRequires: intltool -BuildRequires: python >= 2.4 +BuildRequires: python >= 2.7 BuildRequires: python-distutils-extra BuildRequires: python-setuptools BuildRequires: update-desktop-files ++++++ 0001-xterm-no-symlink-dep.patch ++++++ --- /var/tmp/diff_new_pack.9NSZz7/_old 2016-04-30 23:31:32.000000000 +0200 +++ /var/tmp/diff_new_pack.9NSZz7/_new 2016-04-30 23:31:32.000000000 +0200 @@ -1,7 +1,6 @@ -diff -aur a/mate_menu/easybuttons.py b/mate_menu/easybuttons.py --- a/mate_menu/easybuttons.py +++ b/mate_menu/easybuttons.py -@@ -399,9 +399,11 @@ +@@ -399,9 +399,11 @@ class ApplicationLauncher( easyButton ): def execute( self, *args ): if self.appExec: if self.useTerminal: @@ -14,10 +13,9 @@ Execute(cmd, self.appPath) else: Execute(self.appExec, self.appPath) -diff -aur a/mate_menu/plugins/system_management.py b/mate_menu/plugins/system_management.py --- a/mate_menu/plugins/system_management.py +++ b/mate_menu/plugins/system_management.py -@@ -169,8 +169,10 @@ class pluginclass( object ): +@@ -166,8 +166,10 @@ class pluginclass( object ): Button4 = easyButton( "terminal", self.iconsize, [_("Terminal")], -1, -1 ) if os.path.exists("/usr/bin/mate-terminal"): Button4.connect( "clicked", self.ButtonClicked, "mate-terminal" ) ++++++ 0002-yast2-software.patch ++++++ --- /var/tmp/diff_new_pack.9NSZz7/_old 2016-04-30 23:31:32.000000000 +0200 +++ /var/tmp/diff_new_pack.9NSZz7/_new 2016-04-30 23:31:32.000000000 +0200 @@ -1,29 +1,27 @@ --- a/mate_menu/plugins/system_management.py +++ b/mate_menu/plugins/system_management.py -@@ -142,18 +142,15 @@ class pluginclass( object ): +@@ -142,15 +142,16 @@ class pluginclass( object ): def do_standard_items( self ): if ( self.showPackageManager == True ): -- if os.path.exists("/usr/bin/software-center") or \ -- os.path.exists("/usr/bin/synaptic-pkexec") or \ -- os.path.exists("/usr/share/applications/ubuntu-mate-software.desktop"): -- if os.path.exists("/usr/bin/synaptic-pkexec"): -- Button2 = easyButton("synaptic", self.iconsize, [_("Package Manager")], -1, -1 ) -- Button2.connect( "clicked", self.ButtonClicked, "/usr/bin/synaptic-pkexec" ) -- elif os.path.exists("/usr/bin/software-center"): -- Button2 = easyButton("softwarecenter", self.iconsize, [_("Package Manager")], -1, -1 ) -- Button2.connect( "clicked", self.ButtonClicked, "/usr/bin/software-center" ) -- elif os.path.exists("/usr/share/applications/ubuntu-mate-software.desktop"): -+ if os.path.exists("/usr/bin/gpk-application") or \ -+ os.path.exists("/sbin/yast2") or \ +- if os.path.exists("/usr/bin/synaptic-pkexec"): +- Button2 = easyButton("synaptic", self.iconsize, [_("Package Manager")], -1, -1 ) +- Button2.connect( "clicked", self.ButtonClicked, "/usr/bin/synaptic-pkexec" ) +- elif os.path.exists("/usr/bin/software-center"): +- Button2 = easyButton("softwarecenter", self.iconsize, [_("Package Manager")], -1, -1 ) +- Button2.connect( "clicked", self.ButtonClicked, "/usr/bin/software-center" ) +- elif os.path.exists("/usr/share/applications/ubuntu-mate-software.desktop"): ++ if os.path.exists("/sbin/yast2") or \ + os.path.exists("/usr/share/applications/YaST2/sw_single.desktop"): -+ if os.path.exists("/sbin/yast2") and os.path.exists("/usr/share/applications/YaST2/sw_single.desktop"): -+ Button2 = easyButton("yast-sw_single", self.iconsize, [_("YaST2 Software Manager")], -1, -1) -+ Button2.connect("clicked", self.ButtonClicked, "xdg-su -c '/sbin/yast2 sw_single'") -+ elif os.path.exists("/usr/bin/gpk-application"): - Button2 = easyButton("system-software-install", self.iconsize, [_("Package Manager")], -1, -1 ) -- Button2.connect("clicked", self.ButtonClicked, "/usr/bin/ubuntu-mate-welcome --software-only") -+ Button2.connect("clicked", self.ButtonClicked, "/usr/bin/gpk-application") - Button2.show() - self.systemBtnHolder.pack_start( Button2, False, False, 0 ) - self.mateMenuWin.setTooltip( Button2, _("Install, remove and upgrade software packages") ) ++ Button2 = easyButton("yast-sw_single", self.iconsize, [_("YaST2 Software Manager")], -1, -1 ) ++ Button2.connect("clicked", self.ButtonClicked, "xdg-su -c '/sbin/yast2 sw_single'") ++ elif os.path.exists("/usr/bin/gnome-software"): ++ Button2 = easyButton("org.gnome.Software", self.iconsize, [_("Software Centre")], -1, -1 ) ++ Button2.connect("clicked", self.ButtonClicked, "/usr/bin/gnome-software") ++ elif os.path.exists("/usr/bin/gpk-application"): + Button2 = easyButton("system-software-install", self.iconsize, [_("Package Manager")], -1, -1 ) +- Button2.connect("clicked", self.ButtonClicked, "/usr/bin/ubuntu-mate-welcome --software-only") ++ Button2.connect("clicked", self.ButtonClicked, "/usr/bin/gpk-application") + Button2.show() + self.systemBtnHolder.pack_start( Button2, False, False, 0 ) + self.mateMenuWin.setTooltip( Button2, _("Install, remove and upgrade software packages") ) ++++++ mate-menu-5.7.0.tar.gz -> mate-menu-5.7.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-77ef996a35b8/data/mate-menu.glade new/ubuntu-mate-mate-menu-6b637f9272b2/data/mate-menu.glade --- old/ubuntu-mate-mate-menu-77ef996a35b8/data/mate-menu.glade 2016-04-07 18:48:02.000000000 +0200 +++ new/ubuntu-mate-mate-menu-6b637f9272b2/data/mate-menu.glade 2016-04-13 13:46:25.000000000 +0200 @@ -6,7 +6,7 @@ <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK</property> <property name="resizable">False</property> - <property name="type_hint">toolbar</property> + <property name="type_hint">dock</property> <property name="skip_taskbar_hint">True</property> <property name="skip_pager_hint">True</property> <property name="decorated">False</property> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-77ef996a35b8/lib/mate-menu-config.py new/ubuntu-mate-mate-menu-6b637f9272b2/lib/mate-menu-config.py --- old/ubuntu-mate-mate-menu-77ef996a35b8/lib/mate-menu-config.py 2016-04-07 18:48:02.000000000 +0200 +++ new/ubuntu-mate-mate-menu-6b637f9272b2/lib/mate-menu-config.py 2016-04-13 13:46:25.000000000 +0200 @@ -400,10 +400,10 @@ def getHeadingColor( self ): try: - color = self.borderColor.get_color() + color = self.headingColor.get_color() except TypeError: color = Gdk.Color(0, 0, 0) - self.borderColor.get_color(color) + self.headingColor.get_color(color) return self.gdkColorToString( color ) def gdkColorToString( self, gdkColor ): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-77ef996a35b8/lib/mate-menu.py new/ubuntu-mate-mate-menu-6b637f9272b2/lib/mate-menu.py --- old/ubuntu-mate-mate-menu-77ef996a35b8/lib/mate-menu.py 2016-04-07 18:48:02.000000000 +0200 +++ new/ubuntu-mate-mate-menu-6b637f9272b2/lib/mate-menu.py 2016-04-13 13:46:25.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # Copyright (C) 2007-2014 Clement Lefebvre <root(a)linuxmint.com> -# Copyright (C) 2015 Martin Wimpress <code(a)ubuntu-mate.org> +# Copyright (C) 2015-2016 Martin Wimpress <code(a)ubuntu-mate.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__='5.7.0' +__VERSION__='5.7.1' import ctypes import gc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-77ef996a35b8/mate_menu/plugins/system_management.py new/ubuntu-mate-mate-menu-6b637f9272b2/mate_menu/plugins/system_management.py --- old/ubuntu-mate-mate-menu-77ef996a35b8/mate_menu/plugins/system_management.py 2016-04-07 18:48:02.000000000 +0200 +++ new/ubuntu-mate-mate-menu-6b637f9272b2/mate_menu/plugins/system_management.py 2016-04-13 13:46:25.000000000 +0200 @@ -142,21 +142,18 @@ def do_standard_items( self ): if ( self.showPackageManager == True ): - if os.path.exists("/usr/bin/software-center") or \ - os.path.exists("/usr/bin/synaptic-pkexec") or \ - os.path.exists("/usr/share/applications/ubuntu-mate-software.desktop"): - if os.path.exists("/usr/bin/synaptic-pkexec"): - Button2 = easyButton("synaptic", self.iconsize, [_("Package Manager")], -1, -1 ) - Button2.connect( "clicked", self.ButtonClicked, "/usr/bin/synaptic-pkexec" ) - elif os.path.exists("/usr/bin/software-center"): - Button2 = easyButton("softwarecenter", self.iconsize, [_("Package Manager")], -1, -1 ) - Button2.connect( "clicked", self.ButtonClicked, "/usr/bin/software-center" ) - elif os.path.exists("/usr/share/applications/ubuntu-mate-software.desktop"): - Button2 = easyButton("system-software-install", self.iconsize, [_("Package Manager")], -1, -1 ) - Button2.connect("clicked", self.ButtonClicked, "/usr/bin/ubuntu-mate-welcome --software-only") - Button2.show() - self.systemBtnHolder.pack_start( Button2, False, False, 0 ) - self.mateMenuWin.setTooltip( Button2, _("Install, remove and upgrade software packages") ) + if os.path.exists("/usr/bin/synaptic-pkexec"): + Button2 = easyButton("synaptic", self.iconsize, [_("Package Manager")], -1, -1 ) + Button2.connect( "clicked", self.ButtonClicked, "/usr/bin/synaptic-pkexec" ) + elif os.path.exists("/usr/bin/software-center"): + Button2 = easyButton("softwarecenter", self.iconsize, [_("Package Manager")], -1, -1 ) + Button2.connect( "clicked", self.ButtonClicked, "/usr/bin/software-center" ) + elif os.path.exists("/usr/share/applications/ubuntu-mate-software.desktop"): + Button2 = easyButton("system-software-install", self.iconsize, [_("Package Manager")], -1, -1 ) + Button2.connect("clicked", self.ButtonClicked, "/usr/bin/ubuntu-mate-welcome --software-only") + Button2.show() + self.systemBtnHolder.pack_start( Button2, False, False, 0 ) + self.mateMenuWin.setTooltip( Button2, _("Install, remove and upgrade software packages") ) if ( self.showControlCenter == True ): Button3 = easyButton( "gtk-preferences", self.iconsize, [_("Control Center")], -1, -1 )

1 0

commit xplayer for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package xplayer for openSUSE:Factory checked in at 2016-04-30 23:31:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xplayer (Old) and /work/SRC/openSUSE:Factory/.xplayer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xplayer" Changes: -------- --- /work/SRC/openSUSE:Factory/xplayer/xplayer.changes 2016-02-25 22:49:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xplayer.new/xplayer.changes 2016-04-30 23:31:29.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Apr 27 16:43:54 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to version 1.0.3: + * Improve scroll seeking in shorter videos/music. + * Fix not scrolling backwards. + * Add support for Grilo 0.3.x. + * Update translations. +- Add dependencies for Python plugins. + +------------------------------------------------------------------- Old: ---- xplayer-1.0.2.tar.gz New: ---- xplayer-1.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xplayer.spec ++++++ --- /var/tmp/diff_new_pack.PvBCuP/_old 2016-04-30 23:31:30.000000000 +0200 +++ /var/tmp/diff_new_pack.PvBCuP/_new 2016-04-30 23:31:30.000000000 +0200 @@ -18,7 +18,7 @@ %define build_zeitgeist_plugin 1 Name: xplayer -Version: 1.0.2 +Version: 1.0.3 Release: 0 Summary: Generic media player License: GPL-2.0+ and LGPL-2.1+ @@ -32,6 +32,9 @@ # For gst-inspect tool BuildRequires: gstreamer-utils >= 0.11.93 BuildRequires: lirc-devel +BuildRequires: pkg-config +BuildRequires: python3-devel +BuildRequires: python3-pylint BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: vala >= 0.14.1 @@ -42,7 +45,6 @@ BuildRequires: pkgconfig(clutter-gtk-1.0) >= 1.0.2 BuildRequires: pkgconfig(dbus-glib-1) >= 0.82 BuildRequires: pkgconfig(glib-2.0) >= 2.33.0 -BuildRequires: pkgconfig(grilo-0.2) >= 0.1.16 BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gstreamer-1.0) >= 0.11.93 BuildRequires: pkgconfig(gstreamer-plugins-bad-1.0) >= 1.0.2 @@ -69,6 +71,11 @@ Suggests: %{name}-browser-plugin Suggests: gnome-dvb-daemon %glib2_gsettings_schema_requires +%if 0%{?suse_version} > 1320 +BuildRequires: pkgconfig(grilo-0.3) +%else +BuildRequires: pkgconfig(grilo-0.2) +%endif %if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse}) BuildRequires: pkgconfig(clutter-gst-3.0) >= 2.99.2 # Required for cluttersink. @@ -221,7 +228,7 @@ %glib2_gsettings_schema_postun %files -%defattr(-, root, root) +%defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README %doc %{_datadir}/help/C/%{name}/ %{_bindir}/%{name}* @@ -251,7 +258,7 @@ %defattr(-,root,root) %files plugins -%defattr(-, root, root) +%defattr(-,root,root) # Explicitly list plugins. %{_libdir}/%{name}/plugins/apple-trailers/ %{_libdir}/%{name}/plugins/autoload-subtitles/ @@ -278,12 +285,12 @@ %if %{build_zeitgeist_plugin} %files plugin-zeitgeist -%defattr(-, root, root) +%defattr(-,root,root) %{_libdir}/%{name}/plugins/zeitgeist-dp/ %endif %files browser-plugin -%defattr(-, root, root) +%defattr(-,root,root) %doc browser-plugin/README.browser-plugin %{_libexecdir}/%{name}-plugin-viewer %{_libdir}/browser-plugins/lib%{name}-cone-plugin* @@ -291,15 +298,15 @@ %{_libdir}/browser-plugins/lib%{name}-narrowspace-plugin* %files browser-plugin-gmp -%defattr(-, root, root) +%defattr(-,root,root) %{_libdir}/browser-plugins/lib%{name}-gmp-plugin* %files browser-plugin-vegas -%defattr(-, root, root) +%defattr(-,root,root) %{_libdir}/browser-plugins/lib%{name}-vegas-plugin* %files devel -%defattr(-, root, root) +%defattr(-,root,root) %{_includedir}/%{name}/ %{_libdir}/lib%{name}.so %{_libdir}/pkgconfig/%{name}.pc ++++++ xplayer-1.0.2.tar.gz -> xplayer-1.0.3.tar.gz ++++++ ++++ 263529 lines of diff (skipped)

1 0

commit marco for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package marco for openSUSE:Factory checked in at 2016-04-30 23:31:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/marco (Old) and /work/SRC/openSUSE:Factory/.marco.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "marco" Changes: -------- --- /work/SRC/openSUSE:Factory/marco/marco.changes 2016-04-15 19:12:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.marco.new/marco.changes 2016-04-30 23:31:27.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Apr 20 14:36:54 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to version 1.14.1: + * Fix a crash on showing Alt-Tab thumbnails with compositor on. + * Update translations. +- Remove marco-1.14.0-fix-thumb-crash.patch. + +------------------------------------------------------------------- Old: ---- marco-1.14.0-fix-thumb-crash.patch marco-1.14.0.tar.xz New: ---- marco-1.14.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ marco.spec ++++++ --- /var/tmp/diff_new_pack.OlWP86/_old 2016-04-30 23:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.OlWP86/_new 2016-04-30 23:31:28.000000000 +0200 @@ -20,15 +20,13 @@ %define sover 0 %define _version 1.14 Name: marco -Version: 1.14.0 +Version: 1.14.1 Release: 0 Summary: MATE window manager License: GPL-2.0+ Group: System/GUI/Other Url: http://mate-desktop.org/ Source: http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM marco-1.14.0-fix-thumb-crash.patch -- Fix a crash on showing Alt-Tab thumbnails. -Patch0: %{name}-1.14.0-fix-thumb-crash.patch BuildRequires: fdupes BuildRequires: mate-common >= %{_version} BuildRequires: update-desktop-files @@ -92,7 +90,6 @@ %prep %setup -q -%patch0 -p1 %build NOCONFIGURE=1 mate-autogen ++++++ marco-1.14.0.tar.xz -> marco-1.14.1.tar.xz ++++++ ++++ 32060 lines of diff (skipped)

1 0

commit httperf for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package httperf for openSUSE:Factory checked in at 2016-04-30 23:31:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/httperf (Old) and /work/SRC/openSUSE:Factory/.httperf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "httperf" Changes: -------- --- /work/SRC/openSUSE:Factory/httperf/httperf.changes 2015-04-10 09:52:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.httperf.new/httperf.changes 2016-04-30 23:31:24.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Apr 27 13:24:06 UTC 2016 - mpluskal(a)suse.com + +- Update to version 0.9.0+git.20160311: + * Fix building when OpenSSL was compiled -nossl2 or -noss3 + * Style changes. + * Change --server to --servers. + * Restore the original --server and --server_name options. + * Adding idleconn manpage + * Added a contrib dir and idleconn manpage source +- Add _service and switch to version from git (stable release is + more than 8 years old) + +------------------------------------------------------------------- Old: ---- httperf-0.9.0.tar.gz New: ---- _service httperf-0.9.0+git.20160311.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ httperf.spec ++++++ --- /var/tmp/diff_new_pack.zwvzSp/_old 2016-04-30 23:31:25.000000000 +0200 +++ /var/tmp/diff_new_pack.zwvzSp/_new 2016-04-30 23:31:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package httperf # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,16 +17,20 @@ Name: httperf -Version: 0.9.0 +Version: 0.9.0+git.20160311 Release: 0 Summary: A tool for measuring web server performance License: SUSE-GPL-2.0+-with-openssl-exception Group: Productivity/Networking/Web/Utilities Url: https://github.com/httperf/httperf -Source0: ftp://ftp.hpl.hp.com/pub/httperf/httperf-%{version}.tar.gz +Source0: %{name}-%{version}.tar.xz Source1: %{name}.changes -BuildRequires: openssl-devel -BuildRequires: pkg-config +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: xz +BuildRequires: pkgconfig(openssl) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -43,19 +47,19 @@ find . -name '*.[ch]' |\ xargs sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" - %build +autoreconf -fiv %configure make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +make %{?_smp_mflags} DESTDIR=%{buildroot} install %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog NEWS README TODO +%doc %attr(644,-,-) AUTHORS ChangeLog NEWS README.md TODO %{_bindir}/httperf -%{_bindir}/idleconn -%{_mandir}/man1/httperf.1.gz +%{_mandir}/man1/httperf.1%{ext_man} +%{_mandir}/man1/idleconn.1%{ext_man} %changelog ++++++ _service ++++++ <services> <service mode="localonly" name="tar_scm"> <param name="url">git://github.com/httperf/httperf</param> <param name="scm">git</param> <param name="exclude">.git</param> <param name="changesgenerate">enable</param> <param name="filename">httperf</param> <param name="versionformat">0.9.0+git.%cd</param> </service> <service mode="localonly" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service mode="localonly" name="set_version"/> </services>

1 0