January 2016 - openSUSE Commits - openSUSE Mailing Lists

commit zypper for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at 2016-01-05 09:39:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zypper (Old) and /work/SRC/openSUSE:Factory/.zypper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zypper" Changes: -------- --- /work/SRC/openSUSE:Factory/zypper/zypper.changes 2015-12-13 09:35:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.zypper.new/zypper.changes 2016-01-05 09:40:48.000000000 +0100 @@ -1,0 +2,49 @@ +Thu Dec 24 01:13:24 CET 2015 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- +Wed Dec 23 15:13:34 CET 2015 - ma(a)suse.de + +- ref: don't return 0 if repos were skipped (bsc#959564) +- Fix '-y' command option as alias for --non-interactive global + option (bsc#957862) +- si: Mention location rpm installs source packages to in command + help and man page (bsc#710541) +- man: explain difference between 'dup' and 'dup --from' +- man: Explain meaning of 'System Packages' and '@System' shown in + search results (bsc#953458) +- BuildRequires: libzypp-devel >= 15.19.8 +- version 1.12.28 + +------------------------------------------------------------------- +Sun Dec 20 01:14:29 CET 2015 - ma(a)suse.de + +- Update sle-zypper-po.tar.bz2 + +------------------------------------------------------------------- +Sun Dec 20 01:13:19 CET 2015 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- +Thu Dec 17 01:14:11 CET 2015 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- +Thu Dec 10 01:15:00 CET 2015 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- +Thu Dec 3 01:14:45 CET 2015 - ma(a)suse.de + +- Update sle-zypper-po.tar.bz2 + +------------------------------------------------------------------- +Thu Dec 3 01:13:23 CET 2015 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- Old: ---- zypper-1.12.27.tar.bz2 New: ---- zypper-1.12.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.BFED8b/_old 2016-01-05 09:40:49.000000000 +0100 +++ /var/tmp/diff_new_pack.BFED8b/_new 2016-01-05 09:40:49.000000000 +0100 @@ -22,7 +22,7 @@ BuildRequires: cmake >= 2.4.6 BuildRequires: gcc-c++ >= 4.7 BuildRequires: gettext-devel >= 0.15 -BuildRequires: libzypp-devel >= 15.19.1 +BuildRequires: libzypp-devel >= 15.19.8 BuildRequires: readline-devel >= 5.1 Requires: procps %if 0%{?suse_version} @@ -33,7 +33,7 @@ Summary: Command line software manager using libzypp License: GPL-2.0+ Group: System/Packages -Version: 1.12.27 +Version: 1.12.28 Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ zypper-1.12.27.tar.bz2 -> zypper-1.12.28.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/zypper/zypper-1.12.27.tar.bz2 /work/SRC/openSUSE:Factory/.zypper.new/zypper-1.12.28.tar.bz2 differ: char 11, line 1

1 0

commit libzypp for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2016-01-05 09:39:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libzypp" Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2015-12-13 09:35:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2016-01-05 09:40:45.000000000 +0100 @@ -1,0 +2,24 @@ +Thu Dec 24 01:13:13 CET 2015 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Fri Dec 11 19:07:09 CET 2015 - ma(a)suse.de + +- ResPoolProxy: make begin/end pairs Iterable +- String: Format and FormatNAC classes based on boost::format +- DefaultIntegral: provide initial value +- More specific exception message if GPG binary is missing (bsc#637791) +- version 15.20.0 (19) + +------------------------------------------------------------------- +Thu Dec 10 01:14:50 CET 2015 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Dec 3 01:13:11 CET 2015 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Old: ---- libzypp-15.19.7.tar.bz2 New: ---- libzypp-15.20.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.LQTMEK/_old 2016-01-05 09:40:46.000000000 +0100 +++ /var/tmp/diff_new_pack.LQTMEK/_new 2016-01-05 09:40:46.000000000 +0100 @@ -19,7 +19,7 @@ %define force_gcc_46 0 Name: libzypp -Version: 15.19.7 +Version: 15.20.0 Release: 0 Url: git://gitorious.org/opensuse/libzypp.git Summary: Package, Patch, Pattern, and Product Management ++++++ libzypp-15.19.7.tar.bz2 -> libzypp-15.20.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/VERSION.cmake new/libzypp-15.20.0/VERSION.cmake --- old/libzypp-15.19.7/VERSION.cmake 2015-11-16 12:28:57.000000000 +0100 +++ new/libzypp-15.20.0/VERSION.cmake 2015-12-11 19:08:57.000000000 +0100 @@ -60,9 +60,9 @@ # SET(LIBZYPP_MAJOR "15") SET(LIBZYPP_COMPATMINOR "19") -SET(LIBZYPP_MINOR "19") -SET(LIBZYPP_PATCH "7") +SET(LIBZYPP_MINOR "20") +SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 15.19.7 (19) +# LAST RELEASED: 15.20.0 (19) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/package/libzypp.changes new/libzypp-15.20.0/package/libzypp.changes --- old/libzypp-15.19.7/package/libzypp.changes 2015-11-22 01:18:34.000000000 +0100 +++ new/libzypp-15.20.0/package/libzypp.changes 2015-12-24 01:18:47.000000000 +0100 @@ -1,4 +1,28 @@ ------------------------------------------------------------------- +Thu Dec 24 01:13:13 CET 2015 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Fri Dec 11 19:07:09 CET 2015 - ma(a)suse.de + +- ResPoolProxy: make begin/end pairs Iterable +- String: Format and FormatNAC classes based on boost::format +- DefaultIntegral: provide initial value +- More specific exception message if GPG binary is missing (bsc#637791) +- version 15.20.0 (19) + +------------------------------------------------------------------- +Thu Dec 10 01:14:50 CET 2015 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Dec 3 01:13:11 CET 2015 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Sun Nov 22 01:13:29 CET 2015 - ma(a)suse.de - Update zypp-po.tar.bz2 Files old/libzypp-15.19.7/po/zypp-po.tar.bz2 and new/libzypp-15.20.0/po/zypp-po.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/tools/zypp-NameReqPrv.cc new/libzypp-15.20.0/tools/zypp-NameReqPrv.cc --- old/libzypp-15.19.7/tools/zypp-NameReqPrv.cc 2015-07-06 11:06:37.000000000 +0200 +++ new/libzypp-15.20.0/tools/zypp-NameReqPrv.cc 2015-12-15 15:36:57.000000000 +0100 @@ -40,6 +40,7 @@ cerr << " -o/-O turn on/off looking for obsoletes (default off)" << endl; cerr << " -m/-M turn on/off looking for recommends (default off)" << endl; cerr << " -s/-S turn on/off looking for supplements (default off)" << endl; + cerr << " -e/-E turn on/off looking for enhan./sugg.(default off)" << endl; cerr << " -a short for -n -p -r" << endl; cerr << " -A short for -n -P -R" << endl; cerr << " -D <pkg> dump dependencies of <pkg>" << endl; @@ -197,6 +198,7 @@ bool obsoletes ( false ); bool recommends ( false ); bool supplements ( false ); + bool enhacements ( false ); for ( ; argc; --argc,++argv ) { @@ -231,6 +233,8 @@ case 'M': recommends = false; break; case 's': supplements = true; break; case 'S': supplements = false; break; + case 'e': enhacements = true; break; + case 'E': enhacements = false; break; } continue; } @@ -280,10 +284,16 @@ q.addDependency( sat::SolvAttr::recommends ); if ( supplements ) q.addDependency( sat::SolvAttr::supplements ); + if ( enhacements ) + { + q.addDependency( sat::SolvAttr::enhances ); + q.addDependency( sat::SolvAttr::suggests ); + } } message << *argv << " [" << (ignorecase?'i':'_') << (names?'n':'_') << (requires?'r':'_') << (provides?'p':'_') - << (conflicts?'c':'_') << (obsoletes?'o':'_') << (recommends?'m':'_') << (supplements?'s':'_') << "] {" << endl; + << (conflicts?'c':'_') << (obsoletes?'o':'_') << (recommends?'m':'_') << (supplements?'s':'_') << (enhacements?'e':'_') + << "] {" << endl; for_( it, q.begin(), q.end() ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/KeyRing.cc new/libzypp-15.20.0/zypp/KeyRing.cc --- old/libzypp-15.19.7/zypp/KeyRing.cc 2015-07-06 11:06:37.000000000 +0200 +++ new/libzypp-15.20.0/zypp/KeyRing.cc 2015-12-11 19:08:57.000000000 +0100 @@ -15,8 +15,6 @@ #include <cstdio> #include <unistd.h> -#include <boost/format.hpp> - #include "zypp/TmpPath.h" #include "zypp/ZYppFactory.h" #include "zypp/ZYpp.h" @@ -521,9 +519,9 @@ { if ( ! PathInfo( keyfile ).isExist() ) // TranslatorExplanation first %s is key name, second is keyring name - ZYPP_THROW(KeyRingException(boost::str(boost::format( - _("Tried to import not existent key %s into keyring %s")) - % keyfile.asString() % keyring.asString()))); + ZYPP_THROW(KeyRingException( str::Format(_("Tried to import not existent key %s into keyring %s")) + % keyfile.asString() + % keyring.asString() )); const char* argv[] = { @@ -574,8 +572,7 @@ std::string KeyRing::Impl::readSignatureKeyId( const Pathname & signature ) { if ( ! PathInfo( signature ).isFile() ) - ZYPP_THROW(Exception(boost::str(boost::format( - _("Signature file %s not found"))% signature.asString()))); + ZYPP_THROW(Exception( str::Format(_("Signature file %s not found")) % signature.asString() )); MIL << "Determining key id if signature " << signature << endl; // HACK create a tmp keyring with no keys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/Pathname.cc new/libzypp-15.20.0/zypp/Pathname.cc --- old/libzypp-15.19.7/zypp/Pathname.cc 2015-07-06 11:06:37.000000000 +0200 +++ new/libzypp-15.20.0/zypp/Pathname.cc 2015-12-11 19:08:57.000000000 +0100 @@ -73,7 +73,7 @@ } }; - for ( auto ch : name_r ) + for ( char ch : name_r ) { switch ( ch ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/PublicKey.cc new/libzypp-15.20.0/zypp/PublicKey.cc --- old/libzypp-15.19.7/zypp/PublicKey.cc 2015-10-05 12:20:31.000000000 +0200 +++ new/libzypp-15.20.0/zypp/PublicKey.cc 2015-12-11 19:08:57.000000000 +0100 @@ -378,12 +378,15 @@ { scanner.scan( line ); } - prog.close(); + int ret = prog.close(); switch ( scanner._keys.size() ) { case 0: - ZYPP_THROW( BadKeyException( "File " + _dataFile.path().asString() + " doesn't contain public key data" , _dataFile.path() ) ); + if ( ret == 129 ) + ZYPP_THROW( Exception( std::string("Can't read public key data: ") + GPG_BINARY + " is not installed!" ) ); + else + ZYPP_THROW( BadKeyException( "File " + _dataFile.path().asString() + " doesn't contain public key data" , _dataFile.path() ) ); break; case 1: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/RepoManager.cc new/libzypp-15.20.0/zypp/RepoManager.cc --- old/libzypp-15.19.7/zypp/RepoManager.cc 2015-10-21 15:53:34.000000000 +0200 +++ new/libzypp-15.20.0/zypp/RepoManager.cc 2015-12-11 19:08:57.000000000 +0100 @@ -224,7 +224,7 @@ bool nonroot( geteuid() != 0 ); if ( nonroot && ! PathInfo(dir).userMayRX() ) { - JobReport::warning( formatNAC(_("Cannot read repo directory '%1%': Permission denied")) % dir ); + JobReport::warning( str::FormatNAC(_("Cannot read repo directory '%1%': Permission denied")) % dir ); } else { @@ -242,7 +242,7 @@ { if ( nonroot && ! PathInfo(*it).userMayR() ) { - JobReport::warning( formatNAC(_("Cannot read repo file '%1%': Permission denied")) % *it ); + JobReport::warning( str::FormatNAC(_("Cannot read repo file '%1%': Permission denied")) % *it ); } else { @@ -770,13 +770,13 @@ // Cleanup orphanded service repos: if ( ! orphanedRepos.empty() ) { - for ( auto & repoInfo : orphanedRepos ) + for ( const auto & repoInfo : orphanedRepos ) { MIL << "Delete orphaned service repo " << repoInfo.alias() << endl; // translators: Cleanup a repository previously owned by a meanwhile unknown (deleted) service. // %1% = service name // %2% = repository name - JobReport::warning( formatNAC(_("Unknown service '%1%': Removing orphaned service repository '%2%'" )) + JobReport::warning( str::FormatNAC(_("Unknown service '%1%': Removing orphaned service repository '%2%'")) % repoInfo.service() % repoInfo.alias() ); try { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/ResPoolProxy.h new/libzypp-15.20.0/zypp/ResPoolProxy.h --- old/libzypp-15.19.7/zypp/ResPoolProxy.h 2015-10-05 12:20:31.000000000 +0200 +++ new/libzypp-15.20.0/zypp/ResPoolProxy.h 2015-12-11 19:08:57.000000000 +0100 @@ -118,6 +118,15 @@ template<class TRes> const_iterator byKindEnd() const { return byKindEnd( ResTraits<TRes>::kind ); } + + + Iterable<const_iterator> byKind( const ResKind & kind_r ) const + { return makeIterable( byKindBegin( kind_r ), byKindEnd( kind_r ) ); } + + template<class TRes> + Iterable<const_iterator> byKind() const + { return makeIterable( byKindBegin<TRes>(), byKindEnd<TRes>() ); } + //@} public: @@ -129,6 +138,9 @@ repository_iterator knownRepositoriesBegin() const; repository_iterator knownRepositoriesEnd() const; + + Iterable<repository_iterator> knownRepositories() const + { return makeIterable( knownRepositoriesBegin(), knownRepositoriesEnd() ); } //@} public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/ZYppCallbacks.h new/libzypp-15.20.0/zypp/ZYppCallbacks.h --- old/libzypp-15.19.7/zypp/ZYppCallbacks.h 2015-10-05 12:20:31.000000000 +0200 +++ new/libzypp-15.20.0/zypp/ZYppCallbacks.h 2015-12-11 19:08:57.000000000 +0100 @@ -806,27 +806,27 @@ static callback::SendReport<JobReport> & instance(); // impl in ZYppImpl.cc /** send debug message text */ - static bool debug( const MessageString & msg_r, const UserData & userData_r = UserData() ) + static bool debug( const std::string & msg_r, const UserData & userData_r = UserData() ) { return instance()->message( MsgType::debug, msg_r, userData_r ); } /** send message text */ - static bool info( const MessageString & msg_r, const UserData & userData_r = UserData() ) + static bool info( const std::string & msg_r, const UserData & userData_r = UserData() ) { return instance()->message( MsgType::info, msg_r, userData_r ); } /** send warning text */ - static bool warning( const MessageString & msg_r, const UserData & userData_r = UserData() ) + static bool warning( const std::string & msg_r, const UserData & userData_r = UserData() ) { return instance()->message( MsgType::warning, msg_r, userData_r ); } /** send error text */ - static bool error( const MessageString & msg_r, const UserData & userData_r = UserData() ) + static bool error( const std::string & msg_r, const UserData & userData_r = UserData() ) { return instance()->message( MsgType::error, msg_r, userData_r ); } /** send important message text */ - static bool important( const MessageString & msg_r, const UserData & userData_r = UserData() ) + static bool important( const std::string & msg_r, const UserData & userData_r = UserData() ) { return instance()->message( MsgType::important, msg_r, userData_r ); } /** send data message */ - static bool data( const MessageString & msg_r, const UserData & userData_r = UserData() ) + static bool data( const std::string & msg_r, const UserData & userData_r = UserData() ) { return instance()->message( MsgType::data, msg_r, userData_r ); } //@} }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/base/DefaultIntegral.h new/libzypp-15.20.0/zypp/base/DefaultIntegral.h --- old/libzypp-15.19.7/zypp/base/DefaultIntegral.h 2015-10-05 12:20:31.000000000 +0200 +++ new/libzypp-15.20.0/zypp/base/DefaultIntegral.h 2015-12-11 19:08:57.000000000 +0100 @@ -57,6 +57,9 @@ operator Tp () const { return get(); } //@} + /** The initial value. */ + constexpr Tp initial() const { return TInitial; } + /** Reset to the defined initial value. */ DefaultIntegral & reset() { _val = TInitial; return *this; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/base/String.h new/libzypp-15.20.0/zypp/base/String.h --- old/libzypp-15.19.7/zypp/base/String.h 2015-10-29 15:42:03.000000000 +0100 +++ new/libzypp-15.20.0/zypp/base/String.h 2015-12-11 19:08:57.000000000 +0100 @@ -31,24 +31,6 @@ /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// -namespace boost -{ - /** A formater with (N)o (A)rgument (C)heck. - * It won't complain about missing or excess arguments. Sometimes - * usefull when dealing with translations or classes providing a - * default formater. - */ - inline format formatNAC( const std::string & string_r ) { - using namespace boost::io; - format fmter( string_r ); - fmter.exceptions( all_error_bits ^ ( too_many_args_bit | too_few_args_bit ) ); - return fmter; - } -} // namespace boost -namespace zypp { using boost::formatNAC; } -/////////////////////////////////////////////////////////////////// - -/////////////////////////////////////////////////////////////////// namespace zypp { /** Request a human readable (translated) string representation of Tp [Tp.asUserString()] @@ -65,16 +47,6 @@ namespace zypp { ///////////////////////////////////////////////////////////////// - struct MessageString : public std::string - { - MessageString() {} - MessageString( const char * str_r ) : std::string( str_r ? str_r : "" ) {} - MessageString( const std::string & str_r ) : std::string( str_r ) {} - // boost::format, std::ostringstream, str::Str ... - template<class TStr> - MessageString( const TStr & str_r ) : std::string( str_r.str() ) {} - }; - /** Convenience \c char* constructible from \c std::string and \c char*, * it maps \c (char*)0 to an empty string. * @@ -224,44 +196,98 @@ }; /////////////////////////////////////////////////////////////////// - /** Convenient building of std::string via std::ostream::operator<<. - * Basically this is an \ref ostringstream which is autocenvertible - * into a \ref string. - * \code - * void fnc( const std::string & txt_r ); - * fnc( str::Str() << "Hello " << 13 ); - * - * std::string txt( str::Str() << 45 ); - * \endcode - */ + /// \class Str + /// \brief Convenient building of std::string via \ref std::ostringstream + /// Basically a \ref std::ostringstream autoconvertible to \ref std::string + /// for building string arguments. + /// \code + /// void fnc( const std::string & txt_r ); + /// fnc( str::Str() << "Hello " << 13 ); + /// + /// std::string txt( str::Str() << 45 ); + /// \endcode + /////////////////////////////////////////////////////////////////// struct Str { template<class Tp> - Str & operator<<( const Tp & val ) - { _str << val; return *this; } + Str & operator<<( Tp && val ) + { _str << std::forward<Tp>(val); return *this; } Str & operator<<( std::ostream& (*iomanip)( std::ostream& ) ) { _str << iomanip; return *this; } - operator std::string() const - { return _str.str(); } + operator std::string() const { return _str.str(); } + std::string str() const { return _str.str(); } - std::string str() const - { return _str.str(); } + const std::ostream & stream() const { return _str; } + std::ostream & stream() { return _str; } - std::ostream & stream() - { return _str; } - - void clear() - { _str.str( std::string() ); } + void clear() { _str.str( std::string() ); } + private: std::ostringstream _str; }; + /** \relates Str Stream output */ inline std::ostream & operator<<( std::ostream & str, const Str & obj ) - { return str << (std::string)obj; } + { return str << obj.str(); } /////////////////////////////////////////////////////////////////// + /// \class Format + /// \brief Convenient building of std::string with \ref boost::format. + /// Basically a \ref boost::format autoconvertible to \ref std::string + /// for building string arguments. + /// \code + /// void fnc( const std::string & txt_r ); + /// fnc( str::Format("Hello %1%") % 13 ); + /// + /// std::string txt( str::Format("Hello %1%") % 13 ); + /// \endcode + /////////////////////////////////////////////////////////////////// + struct Format + { + Format() {} + Format( const std::string & format_r ) : _fmter( format_r ) {} + + template<class Tp> + Format & operator%( Tp && arg ) + { _fmter % std::forward<Tp>(arg); return *this; } + + operator std::string() const { return _fmter.str(); } + std::string asString() const { return _fmter.str(); } + std::string str() const { return _fmter.str(); } + + const boost::format & fmter() const { return _fmter; } + boost::format & fmter() { return _fmter; } + + protected: + boost::format _fmter; + }; + + /** \relates Format Stream output */ + inline std::ostream & operator<<( std::ostream & str, const Format & obj ) + { return str << obj.fmter(); } + + /////////////////////////////////////////////////////////////////// + /// \class FormatNAC + /// \brief \ref Format with (N)o (A)rgument (C)heck. + /// It won't complain about missing or excess arguments. Sometimes + /// usefull when dealing with translations or classes providing a + /// default formater. + /////////////////////////////////////////////////////////////////// + struct FormatNAC : public Format + { + FormatNAC() { relax(); } + FormatNAC( const std::string & format_r ) : Format( format_r ) { relax(); } + + private: + void relax() + { + using namespace boost::io; + _fmter.exceptions( all_error_bits ^ ( too_many_args_bit | too_few_args_bit ) ); + } + }; + /////////////////////////////////////////////////////////////////// /** \name String representation of number. * * Optional second argument sets the minimal string width (' ' padded). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/base/Sysconfig.cc new/libzypp-15.20.0/zypp/base/Sysconfig.cc --- old/libzypp-15.19.7/zypp/base/Sysconfig.cc 2015-07-06 11:06:37.000000000 +0200 +++ new/libzypp-15.20.0/zypp/base/Sysconfig.cc 2015-12-11 19:08:57.000000000 +0100 @@ -120,7 +120,7 @@ std::vector<std::string> lines; str::split( newcomment_r, std::back_inserter(lines), "\r\n" ); o << endl; - for ( auto line : lines ) + for ( const std::string & line : lines ) { if ( line[0] != '#' ) o << "# "; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/media/MediaCurl.cc new/libzypp-15.20.0/zypp/media/MediaCurl.cc --- old/libzypp-15.19.7/zypp/media/MediaCurl.cc 2015-07-06 11:06:37.000000000 +0200 +++ new/libzypp-15.20.0/zypp/media/MediaCurl.cc 2015-12-11 19:08:57.000000000 +0100 @@ -37,7 +37,6 @@ #include <errno.h> #include <dirent.h> #include <unistd.h> -#include <boost/format.hpp> #define DETECT_DIR_INDEX 0 #define CONNECT_TIMEOUT 60 @@ -1687,9 +1686,7 @@ // indicate we have no good credentials from CM cmcred.reset(); - string prompt_msg = boost::str(boost::format( - //!\todo add comma to the message for the next release - _("Authentication required for '%s'")) % _url.asString()); + string prompt_msg = str::Format(_("Authentication required for '%s'")) % _url.asString(); // set available authentication types from the exception // might be needed in prompt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/media/MediaUserAuth.cc new/libzypp-15.20.0/zypp/media/MediaUserAuth.cc --- old/libzypp-15.19.7/zypp/media/MediaUserAuth.cc 2015-07-06 11:06:37.000000000 +0200 +++ new/libzypp-15.20.0/zypp/media/MediaUserAuth.cc 2015-12-11 19:08:57.000000000 +0100 @@ -13,8 +13,6 @@ #include <list> #include <curl/curl.h> -#include <boost/format.hpp> - #include "zypp/base/Gettext.h" #include "zypp/base/String.h" @@ -132,10 +130,7 @@ } else { - std::string msg = boost::str( - boost::format (_("Unsupported HTTP authentication method '%s'")) % *it); - - ZYPP_THROW(MediaException(msg)); + ZYPP_THROW(MediaException(str::Format(_("Unsupported HTTP authentication method '%s'")) % *it)); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/sat/FileConflicts.cc new/libzypp-15.20.0/zypp/sat/FileConflicts.cc --- old/libzypp-15.19.7/zypp/sat/FileConflicts.cc 2015-07-06 11:06:37.000000000 +0200 +++ new/libzypp-15.20.0/zypp/sat/FileConflicts.cc 2015-12-11 19:08:57.000000000 +0100 @@ -56,11 +56,10 @@ " conflicts with file from install of\n" " %3%" ) }}; - return( boost::formatNAC( text[lhsSolvable().isSystem()?0:1][rhsSolvable().isSystem()?0:1] ) - % lhsFilename() - % lhsSolvable().asUserString() - % rhsSolvable().asUserString() - ).str(); + return str::FormatNAC( text[lhsSolvable().isSystem()?0:1][rhsSolvable().isSystem()?0:1] ) + % lhsFilename() + % lhsSolvable().asUserString() + % rhsSolvable().asUserString(); } else { @@ -99,12 +98,11 @@ " from install of\n" " %4%" ) }}; - return( boost::formatNAC( text[lhsSolvable().isSystem()?0:1][rhsSolvable().isSystem()?0:1] ) - % lhsFilename() - % lhsSolvable().asUserString() - % rhsFilename() - % rhsSolvable().asUserString() - ).str(); + return str::FormatNAC( text[lhsSolvable().isSystem()?0:1][rhsSolvable().isSystem()?0:1] ) + % lhsFilename() + % lhsSolvable().asUserString() + % rhsFilename() + % rhsSolvable().asUserString(); } } @@ -114,20 +112,20 @@ std::ostream & operator<<( std::ostream & str, const FileConflicts::Conflict & obj ) { if ( obj.lhsFilename() == obj.rhsFilename() ) - return str << boost::format( "%s:\n %s[%s]\n %s[%s]" ) - % obj.lhsFilename() - % obj.lhsSolvable() - % obj.lhsFilemd5() - % obj.rhsSolvable() - % obj.rhsFilemd5(); + return str << str::Format( "%s:\n %s[%s]\n %s[%s]" ) + % obj.lhsFilename() + % obj.lhsSolvable() + % obj.lhsFilemd5() + % obj.rhsSolvable() + % obj.rhsFilemd5(); - return str << boost::format( "%s - %s:\n %s[%s]\n %s[%s]" ) - % obj.lhsFilename() - % obj.rhsFilename() - % obj.lhsSolvable() - % obj.lhsFilemd5() - % obj.rhsSolvable() - % obj.rhsFilemd5(); + return str << str::Format( "%s - %s:\n %s[%s]\n %s[%s]" ) + % obj.lhsFilename() + % obj.rhsFilename() + % obj.lhsSolvable() + % obj.lhsFilemd5() + % obj.rhsSolvable() + % obj.rhsFilemd5(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/target/RpmPostTransCollector.cc new/libzypp-15.20.0/zypp/target/RpmPostTransCollector.cc --- old/libzypp-15.19.7/zypp/target/RpmPostTransCollector.cc 2015-07-06 11:06:37.000000000 +0200 +++ new/libzypp-15.20.0/zypp/target/RpmPostTransCollector.cc 2015-12-11 19:08:57.000000000 +0100 @@ -83,7 +83,7 @@ Pathname noRootScriptDir( ZConfig::instance().update_scriptsPath() / tmpDir().basename() ); - for ( auto && script : _scripts ) + for ( const auto & script : _scripts ) { MIL << "EXECUTE posttrans: " << script << endl; ExternalProgram prog( (noRootScriptDir/script).asString(), ExternalProgram::Stderr_To_Stdout, false, -1, true, _root ); @@ -132,7 +132,7 @@ str::Str msg; msg << "%posttrans scripts skipped while aborting:\n"; - for ( auto && script : _scripts ) + for ( const auto & script : _scripts ) { const std::string & pkgident( script.substr( 0, script.size()-6 ) ); // strip tmp file suffix WAR << "UNEXECUTED posttrans: " << script << endl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/target/rpm/RpmDb.cc new/libzypp-15.20.0/zypp/target/rpm/RpmDb.cc --- old/libzypp-15.19.7/zypp/target/rpm/RpmDb.cc 2015-10-05 12:20:31.000000000 +0200 +++ new/libzypp-15.20.0/zypp/target/rpm/RpmDb.cc 2015-12-11 19:08:57.000000000 +0100 @@ -29,8 +29,6 @@ #include <vector> #include <algorithm> -#include <boost/format.hpp> - #include "zypp/base/Logger.h" #include "zypp/base/String.h" #include "zypp/base/Gettext.h" @@ -1123,9 +1121,9 @@ if ( systemStatus() != 0 ) { //TranslatorExplanation first %s is file name, second is error message - ZYPP_THROW(RpmSubprocessException(boost::str(boost::format( - _("Failed to import public key from file %s: %s")) - % pubkey_r.asString() % error_message))); + ZYPP_THROW(RpmSubprocessException( str::Format(_("Failed to import public key from file %s: %s")) + % pubkey_r.asString() + % error_message )); } else { @@ -1194,9 +1192,9 @@ if ( rpm_status != 0 ) { //TranslatorExplanation first %s is key name, second is error message - ZYPP_THROW(RpmSubprocessException(boost::str(boost::format( - _("Failed to remove public key %s: %s")) % pubkey_r.asString() - % error_message))); + ZYPP_THROW(RpmSubprocessException( str::Format(_("Failed to remove public key %s: %s")) + % pubkey_r.asString() + % error_message )); } else {

1 0

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2016-01-05 09:39:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2015-12-03 13:26:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2016-01-05 09:40:35.000000000 +0100 @@ -1,0 +2,367 @@ +Wed Dec 23 10:46:28 CET 2015 - ms(a)suse.de + +- v7.03.48 released + +------------------------------------------------------------------- +Wed Dec 23 10:39:31 CET 2015 - ms(a)suse.de + +- Fixed import of kernel parameters including spaces + + Kernel parameters like PRODUCT_TYPE=âPRODUCT BANANAâ breaks + the code in includeKernelParameters. This patch allows spaces + for values in a way that it replaces the embedded whitespace + with \030 before parsing and then reverting after parsing. + Thanks to Jay Nitikman for providing the patch + +------------------------------------------------------------------- +Wed Dec 23 10:35:02 CET 2015 - ms(a)suse.de + +- Fixed uninstall target for buildroot use case + +------------------------------------------------------------------- +Wed Dec 23 10:29:11 CET 2015 - ms(a)suse.de + +- v7.03.47 released + +------------------------------------------------------------------- +Wed Dec 23 10:27:13 CET 2015 - ms(a)suse.de + +- Fixed LUKS setup for dracut + + The system image has to provide /etc/crypttab to allow dracut + to create a working initrd for reboot. In addition the name + of the luks map must be 'luks' to make dracut happy. + +------------------------------------------------------------------- +Wed Dec 23 10:14:45 CET 2015 - ms(a)suse.de + +- Fixed installation of documentation + +------------------------------------------------------------------- +Wed Dec 23 10:02:58 CET 2015 - ms(a)suse.de + +- Update documentation + + Also put each doc target into its own directory + +------------------------------------------------------------------- +Wed Dec 23 09:34:48 CET 2015 - ms(a)suse.de + +- Delete binary picture data + +------------------------------------------------------------------- +Wed Dec 23 09:31:36 CET 2015 - ms(a)suse.de + +- Delete unmaintained documentation sources + +------------------------------------------------------------------- +Tue Dec 22 22:46:59 CET 2015 - fs(a)suse.de + +- Stylecheck + +------------------------------------------------------------------- +Tue Dec 22 16:08:02 CET 2015 - fs(a)suse.de + +- Specllchecked + +------------------------------------------------------------------- +Tue Dec 22 14:51:55 CET 2015 - fs(a)suse.de + +- Kiwi Doc Revision Pt. 13: Appliance and Migration + +------------------------------------------------------------------- +Tue Dec 22 11:34:13 CET 2015 - fs(a)suse.de + +- Kiwi Doc Revision Pt. 12: XEN chapter + +------------------------------------------------------------------- +Tue Dec 22 01:08:32 CET 2015 - afaerber(a)suse.de + +- Handle /boot/vc files for Raspberry Pi + + openSUSE Tumbleweed raspberrypi-firmware[-branding-openSUSE] packages + have been updated to install files to /boot/vc rather than /boot. + + Ensure that all files in /boot/vc find their way into the vboot partition + and on the boot partition prepare vc as potential mount point. + + Signed-off-by: Andreas FÃ¤rber <afaerber(a)suse.de> + +------------------------------------------------------------------- +Mon Dec 21 17:30:24 CET 2015 - fs(a)suse.de + +- Kiwi Doc Revision Pt. 11: OEM chapter + +------------------------------------------------------------------- +Mon Dec 21 17:29:38 CET 2015 - fs(a)suse.de + +- Kiwi Doc Revision Pt. 10 (final): PXE chapter + +------------------------------------------------------------------- +Mon Dec 21 16:13:14 CET 2015 - ms(a)suse.de + +- Fixed JeOS templates configured for efi boot + + in case of efi the efi modules should be installed to the system. + Even though it's not a problem for kiwi because it takes the modules + from the self build initrd it could become a problem when grub2 + is used for reconfiguration on the system later. It is also + questionable whether it is a good idea from kiwi to install + the efi modules as part of the initrd just for the purpose to + take them from there at build time when they are not really needed + in the initrd at boot time. The new (next generation) kiwi version + will lookup modules from the system if possible and will not + keep them inside of the initrd + +------------------------------------------------------------------- +Mon Dec 21 12:19:45 CET 2015 - ms(a)suse.de + +- Fixed suse-SLE12-community-JeOS description + + kernel-debug is not installed, no need to have it in the + delete section + +------------------------------------------------------------------- +Sat Dec 19 18:56:13 CET 2015 - martin.koegler(a)suse.de + +- Honor RW filesystem type + +------------------------------------------------------------------- +Sat Dec 19 18:13:43 CET 2015 - martin.koegler(a)suse.de + +- Refactor file system check + +------------------------------------------------------------------- +Thu Dec 17 09:41:32 CET 2015 - ms(a)suse.de + +- v7.03.46 released + +------------------------------------------------------------------- +Thu Dec 17 09:40:10 CET 2015 - ms(a)suse.de + +- Update manual page info about targetdevice option + + This is related to (bnc#956484) + +------------------------------------------------------------------- +Thu Dec 17 09:35:59 CET 2015 - ms(a)suse.de + +- use sudo for kiwi when running from git source + +------------------------------------------------------------------- +Thu Dec 17 09:30:01 CET 2015 - ms(a)suse.de + +- Improve validation of targetDevice + + If called with --targetdevice the target must be a device block + special and nothing else, no symlink, no other node type + This fixes (bnc#956484) + +------------------------------------------------------------------- +Wed Dec 16 08:46:31 CET 2015 - martin.koegler(a)suse.de + +- Add label support for xfs + +------------------------------------------------------------------- +Tue Dec 15 16:35:33 CET 2015 - ms(a)suse.de + +- v7.03.45 released + +------------------------------------------------------------------- +Tue Dec 15 15:52:08 CET 2015 - ms(a)suse.de + +- Inform user if dracut is called in background mode + +------------------------------------------------------------------- +Tue Dec 15 15:47:20 CET 2015 - ms(a)suse.de + +- Fixed validation of updates/weak-updates modules + + suseStripKernel took the update and weak-update modules only + into account if they are mentioned in the drivers list. But + these modules are considered p1 and should always be included + and also checked against its dependencies + +------------------------------------------------------------------- +Tue Dec 15 09:12:59 CET 2015 - martin.koegler(a)suse.de + +- Allow xfs as hybrid RW file system + +------------------------------------------------------------------- +Thu Dec 10 15:26:25 CET 2015 - ms(a)suse.de + +- v7.03.44 released + +------------------------------------------------------------------- +Thu Dec 10 15:12:29 CET 2015 - ms(a)suse.de + ++++ 295 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kiwi/kiwi.changes ++++ and /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.TvTbMF/_old 2016-01-05 09:40:37.000000000 +0100 +++ /var/tmp/diff_new_pack.TvTbMF/_new 2016-01-05 09:40:37.000000000 +0100 @@ -27,7 +27,7 @@ Name: kiwi License: GPL-2.0 Group: System/Management -Version: 7.03.37 +Version: 7.03.48 Provides: kiwi-schema = 6.2 Provides: kiwi-image:aci Provides: kiwi-image:lxc @@ -93,7 +93,11 @@ Requires: tar Requires: psmisc Requires: util-linux +%if 0%{?suse_version} == 1110 +Requires: sysvinit +%else Requires: sysvinit-tools +%endif %if 0%{?suse_version} # SUSE specific requires %if 0%{?suse_version} >= 1210 @@ -104,7 +108,7 @@ Requires: satsolver-tools Requires: perl-satsolver >= 0.42 %endif -%if %suse_version == 1110 +%if 0%{?suse_version} == 1110 Requires: virt-utils %else Requires: qemu-tools @@ -134,52 +138,43 @@ # find out about the name scheme of the local system for # the buildservice needed -requires packages. In terms of # problems with this magic ask adrian(a)suse.de for details + %if 0%{?suse_version} %define mysystems %(echo `export VER=%{suse_version}; echo "suse-${VER:0:2}.${VER:2:1}"`) # redefine for the SLES case if no sles_version exists # SLE12: -%if %suse_version == 1315 && !0%{?is_opensuse} -%define mysystems suse-SLES12 -%endif -# SLE12-SP1: -%if %suse_version == 1316 && !0%{?is_opensuse} +%if 0%{?suse_version} == 1315 && !0%{?is_opensuse} %define mysystems suse-SLES12 %endif # Leap 42.1: -%if %suse_version == 1315 && 0%{?is_opensuse} +%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} %define mysystems suse-leap42.1 %endif # Tumbleweed: # Current Tumbleweed version, moving target -%if %suse_version == 1330 +%if 0%{?suse_version} == 1330 %define mysystems suse-tumbleweed %endif # redefine for the SLE11 case if no sles_version exists # SLE11: NOTE: this works only because openSUSE 11.1 is out of scope -%if %suse_version == 1110 +%if 0%{?suse_version} == 1110 %define mysystems suse-SLES11 %endif %endif + # SLES with sles_version macro %if 0%{?sles_version} -%ifarch %ix86 x86_64 -%define mysystems suse-SLES%{sles_version} -%else %define mysystems suse-SLES%{sles_version} %endif -%endif -# RHEL -%if 0%{?rhel_version} == 600 + +# RHEL // CentOS +# use the rhel templates for CentOS, too +%if 0%{?rhel_version} == 600 || 0%{?centos_version} == 600 %define mysystems rhel-06.0 %endif -%if 0%{?rhel_version} == 700 +%if 0%{?rhel_version} == 700 || 0%{?centos_version} == 700 %define mysystems rhel-07.0 %endif -# CentOS -%if 0%{?centos_version} == 600 -# use the rhel templates for CentOS 6 -%define mysystems rhel-06.0 -%endif # find out about my arch name, could be done also via symlinks %define myarch %{_target_cpu} @@ -211,18 +206,20 @@ Provides: kiwi-filesystem:ext3 Provides: kiwi-filesystem:ext4 Provides: kiwi-filesystem:squashfs -Provides: kiwi-packagemanager:zypper Provides: kiwi-image:docker Requires: btrfsprogs Requires: e2fsprogs Requires: kiwi = %{version} -Requires: zypper License: GPL-2.0 Group: System/Management %if 0%{?rhel_version} || 0%{?centos_version} +Provides: kiwi-packagemanager:yum +Requires: yum Requires: squashfs-tools %endif %if 0%{?suse_version} +Provides: kiwi-packagemanager:zypper +Requires: zypper Requires: squashfs %endif %if 0%{?suse_version} > 1120 @@ -371,7 +368,8 @@ Requires: s390-tools %endif %ifarch %ix86 x86_64 -%if 0%{?suse_version} < 1315 +# rhel7 has no grub, only grub2 +%if 0%{?suse_version} < 1315 && 0%{?rhel_version} < 700 && 0%{?centos_version} < 700 Requires: grub %endif %endif @@ -405,7 +403,7 @@ %endif %ifarch %ix86 x86_64 Requires: syslinux -%if 0%{?suse_version} >= 1220 +%if 0%{?suse_version} >= 1220 || 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700 Requires: grub2 %else Requires: grub @@ -443,10 +441,10 @@ Requires: s390-tools %endif %ifarch %ix86 x86_64 -%if 0%{?suse_version} < 1315 +%if 0%{?suse_version} < 1315 && 0%{?rhel_version} < 700 && 0%{?centos_version} < 700 Requires: grub %endif -%if 0%{?suse_version} >= 1220 +%if 0%{?suse_version} >= 1220 || 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700 Requires: grub2 %ifarch x86_64 Requires: grub2-x86_64-efi @@ -519,7 +517,7 @@ %endif %ifarch %ix86 x86_64 Requires: syslinux -%if 0%{?suse_version} >= 1220 +%if 0%{?suse_version} >= 1220 || 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700 Requires: grub2 %else Requires: grub @@ -560,10 +558,10 @@ Requires: s390-tools %endif %ifarch %ix86 x86_64 -%if 0%{?suse_version} < 1315 +%if 0%{?suse_version} < 1315 && 0%{?rhel_version} < 700 && 0%{?centos_version} < 700 Requires: grub %endif -%if 0%{?suse_version} >= 1220 +%if 0%{?suse_version} >= 1220 || 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700 Requires: grub2 %ifarch x86_64 Requires: grub2-x86_64-efi @@ -665,6 +663,7 @@ %setup -q -n %name -a2 -a3 %build +echo "mysystems set to: %{mysystems}" # empty because of rpmlint warning rpm-buildroot-usage %if 0%{?suse_version} > 1140 @@ -832,10 +831,8 @@ %dir %{_defaultdocdir}/kiwi %{_defaultdocdir}/kiwi/COPYING %{_defaultdocdir}/kiwi/examples -%{_defaultdocdir}/kiwi/images -%{_defaultdocdir}/kiwi/kiwi.pdf -%{_defaultdocdir}/kiwi/kiwi.html -%{_defaultdocdir}/kiwi/susebooks.css +%{_defaultdocdir}/kiwi/html +%{_defaultdocdir}/kiwi/pdf %{_defaultdocdir}/kiwi/schema #================================================= # KIWI instsource... ++++++ kiwi-docu.tar.bz2 ++++++ ++++ 72626 lines of diff (skipped) ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.gitignore new/kiwi/.gitignore --- old/kiwi/.gitignore 2015-09-21 16:23:18.000000000 +0200 +++ new/kiwi/.gitignore 2015-12-23 09:26:48.000000000 +0100 @@ -2,6 +2,8 @@ *.ts tests/.timestamps # emacs backup files +\#*# +.#* *~ # localization files *.mo @@ -14,3 +16,7 @@ .revision # d3 css data packed into a tarball metadata/KIWIAnalyse.tgz +# doc build specific stuff +doc/docbook/build/ +# emacs schema definition +doc/docbook/xml/schemas.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2015-09-14 11:57:46.000000000 +0200 +++ new/kiwi/.revision 2015-12-17 09:28:28.000000000 +0100 @@ -1 +1 @@ -75ba66ddd43a689dd5b7d1d0cc71c704b5d42344 +e7ef2da84a78034424ae14ba4e6b2ebb14592dff diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/Makefile new/kiwi/Makefile --- old/kiwi/Makefile 2015-09-21 16:23:18.000000000 +0200 +++ new/kiwi/Makefile 2015-12-23 10:32:18.000000000 +0100 @@ -107,20 +107,22 @@ # kiwi documentation and examples #-------------------------------------------- cp -a doc/examples/ ${PACKDOCVZ} - cp -a doc/images/ ${PACKDOCVZ} cp -a doc/schema/ ${PACKDOCVZ} - cp -a doc/kiwi.pdf ${PACKDOCVZ} - cp -a doc/kiwi.html ${PACKDOCVZ} - cp -a doc/*.css ${PACKDOCVZ} + cp -a doc/pdf/ ${PACKDOCVZ} + cp -a doc/html/ ${PACKDOCVZ} cp -a doc/COPYING ${PACKDOCVZ} - test -e doc/ChangeLog && cp -a doc/ChangeLog ${PACKDOCVZ} || true + + rm -rf ${PACKDOCVZ}/html/images + mkdir -p ${PACKDOCVZ}/html/images + cp -a doc/docbook/images/*.png ${PACKDOCVZ}/html/images + cp -a doc/docbook/images/callouts ${PACKDOCVZ}/html/images + rm -f ${PACKDOCVZ}/schema/Makefile - rm -f ${PACKDOCVZ}/schema/susesync #============================================ # kiwi manual pages #-------------------------------------------- - for i in $(shell ls -1 ./doc/*.1);do \ + for i in $(shell ls -1 ./doc/man/*.1);do \ install -m 644 $$i ${MANVZ} ;\ done @@ -278,11 +280,11 @@ uninstall: @echo Uninstalling... - rm -rf /usr/share/kiwi - rm -rf /usr/share/doc/packages/kiwi - rm -f /usr/sbin/kiwi - rm -f /usr/share/emacs/site-lisp/suse-start-kiwi-mode.el - rm -f /etc/bash_completion.d/kiwi.sh + rm -rf ${buildroot}/usr/share/kiwi + rm -rf ${buildroot}/usr/share/doc/packages/kiwi + rm -f ${buildroot}/usr/sbin/kiwi + rm -f ${buildroot}/usr/share/emacs/site-lisp/suse-start-kiwi-mode.el + rm -f ${buildroot}/etc/bash_completion.d/kiwi.sh build: clean ./.doit -p --local diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi new/kiwi/kiwi --- old/kiwi/kiwi 2015-09-10 15:20:51.000000000 +0200 +++ new/kiwi/kiwi 2015-12-17 09:35:08.000000000 +0100 @@ -6,7 +6,7 @@ pushd $callpath &>/dev/null if [ ! -f "metadata/KIWIAnalyse.tgz" ];then - su $USER -c "tar -C metadata -czf metadata/KIWIAnalyse.tgz d3" + sudo su $USER -c "tar -C metadata -czf metadata/KIWIAnalyse.tgz d3" fi if [ ! -s ".revision" ];then ./.version > .revision diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2015-09-14 11:57:46.000000000 +0200 +++ new/kiwi/kiwi.pl 2015-12-17 09:28:28.000000000 +0100 @@ -1483,10 +1483,20 @@ $kiwi -> failed (); kiwiExit (1); } - if (($targetDevice) && (! -b $targetDevice)) { - $kiwi -> error ("Target device $targetDevice doesn't exist"); - $kiwi -> failed (); - kiwiExit (1); + if ($targetDevice) { + if (! -e $targetDevice) { + $kiwi -> error ( + "Target device $targetDevice doesn't exist" + ); + $kiwi -> failed (); + kiwiExit (1); + } elsif ((-l $targetDevice) || (! -b $targetDevice)) { + $kiwi -> error ( + "Target device $targetDevice is not a block device" + ); + $kiwi -> failed (); + kiwiExit (1); + } } if ((defined $IgnoreRepos) && (defined $SetRepository)) { $kiwi -> error ("Can't use ignore repos together with set repos"); @@ -2184,7 +2194,7 @@ $kiwi -> failed (); kiwiExit (1); } - my $cmd = "find -L -type f | grep -v .svn | grep -v .checksum.md5"; + my $cmd = "find -L -type f ! -wholename '*.svn*' ! -name .checksum.md5 | sort"; my $status = KIWIQX::qxx ( "cd $idesc && $cmd | xargs md5sum > .checksum.md5" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/sv/LC_MESSAGES/kiwi.po new/kiwi/locale/sv/LC_MESSAGES/kiwi.po --- old/kiwi/locale/sv/LC_MESSAGES/kiwi.po 2015-10-13 18:14:52.000000000 +0200 +++ new/kiwi/locale/sv/LC_MESSAGES/kiwi.po 2015-12-11 10:09:28.000000000 +0100 @@ -9,15 +9,15 @@ "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-05-18 10:26+0200\n" -"PO-Revision-Date: 2005-09-18 19:09+0200\n" -"Last-Translator: Mattias Newzella <newzella(a)linux.se>\n" -"Language-Team: Swedish <sv(a)li.org>\n" +"PO-Revision-Date: 2015-12-06 01:08+0200\n" +"Last-Translator: Jonas Svensson <jonas(a)ekhorva.se>\n" +"Language-Team: Swedish <http://l10n.opensuse.org/projects/kiwi/master/sv/>\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.10.1\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 2.3\n" #. /.../ #. Copyright (c) 2005 SuSE GmbH Nuernberg, Germany. All rights reserved. @@ -25,47 +25,42 @@ #. boot code for KIWI #. msgid "Boot continues in 10 sec" -msgstr "" +msgstr "Uppstarten fortsätter om 10 sekunder" msgid "Enter LUKS passphrase" -msgstr "" +msgstr "Skriv in LUKS-lösenord" msgid "Do you accept the license agreement ?" -msgstr "" +msgstr "Accepterar du licensavtalet?" # power-off message -#, fuzzy msgid "Do you want to start the System-Recovery ?" -msgstr "Vill du stänga av datorn nu?" +msgstr "Vill du påbörja systemåterställningen?" # power-off message -#, fuzzy msgid "Do you want to start the System-Restore ?" -msgstr "Vill du stänga av datorn nu?" +msgstr "Vill du starta systemåterställningen?" -#, fuzzy msgid "Restoring base operating system..." -msgstr "Starta om och starta ett annat operativsystem" +msgstr "Återställer grundoperativsystemet..." msgid "Destroying ALL data on %1, continue ?" -msgstr "" +msgstr "ALL data på %1 kommer att förstöras. Vill du fortsätta?" msgid "Clean sweep..." -msgstr "" +msgstr "Raderar..." msgid "%1 files from %2 restored..." -msgstr "" +msgstr "%1 filer från %2 återställda..." msgid "backing up: %1..." -msgstr "" +msgstr "säkerhetskopierar %1..." -#, fuzzy msgid "archiving: %1..." -msgstr "Filen är för stor: %1." +msgstr "arkiverar: %1." -#, fuzzy msgid "restoring: %1..." -msgstr "Filen är för stor: %1." +msgstr "återställer: %1." msgid "Yes" msgstr "Ja" @@ -82,45 +77,44 @@ msgstr "Avbryt" msgid "Exit" -msgstr "" +msgstr "Avsluta" msgid "Bootloader installation has failed" -msgstr "" +msgstr "Installationen av bootloadern misslyckades" msgid "" "The system will not be able to reboot. Please make sure to fixup and install " "the bootloader before next reboot. Check /var/log/boot.kiwi for details" msgstr "" +"Systemet kommer inte att kunna starta. Du måste reparera och installera " +"bootloadern innan nästa omstart. Se /var/log/boot.kiwi för mer information" msgid "Please remove the CD/DVD before reboot" -msgstr "" +msgstr "Avlägsna alla CD/DVD-skivor innan datorn startas om" msgid "Please unplug the USB stick before reboot" -msgstr "" +msgstr "Avlägsna USB-stickan innan omstart" -#, fuzzy msgid "Installation..." -msgstr "Installation" +msgstr "Installation..." -#, fuzzy msgid "Loading %1" -msgstr "Fel vid laddning av %1" +msgstr "Laddar %1" msgid "Verifying %1" -msgstr "" +msgstr "Verifierar %1" # dialog title for hard disk installation -#, fuzzy msgid "Select disk for installation:" -msgstr "Hårddiskinstallation" +msgstr "Välj installationsdisk:" # dialog title for hard disk installation -#, fuzzy msgid "Select %1 partition for installation:" -msgstr "Hårddiskinstallation" +msgstr "Välj %1 partition för installation:" msgid "System will be shutdown. Remove USB stick before power on" msgstr "" +"Systemet kommer att stängas av. Avlägsna USB-stickan innan du slår på datorn" msgid "Please remove the CD/DVD before shutdown" -msgstr "" +msgstr "Avlägsna CD/DVD-skivan innan du stänger av" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2015-10-20 16:02:48.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2015-12-22 09:39:43.000000000 +0100 @@ -3894,6 +3894,7 @@ my $core= "$tmpdir/EFI/BOOT/$fo_bin"; my $core_opts; $core_opts = "-O $fo -o $core -c $earlyboot "; + $core_opts.= "-p /boot/grub2 "; $core_opts.= "-d $tmpdir/$stages{efi}{stageSRC}"; $status = KIWIQX::qxx ( "$grub2_mkimage $core_opts @modules 2>&1" @@ -3997,6 +3998,7 @@ my $core = "$tmpdir/boot/grub2/$format/core.elf"; my $core_opts; $core_opts = "-O $format -o $core -c $earlyboot "; + $core_opts.= "-p /boot/grub2 "; $core_opts.= "-d $tmpdir/$stages{ofw}{stageSRC}"; my $status = KIWIQX::qxx ( "$grub2_mkimage $core_opts @modules 2>&1" @@ -4028,6 +4030,7 @@ my $cdcore = "$tmpdir/boot/grub2/$format/cdboot.img"; my $core_opts; $core_opts = "-O $format -o $core -c $earlyboot "; + $core_opts.= "-p /boot/grub2 "; $core_opts.= "-d $tmpdir/$stages{bios}{stageSRC}"; my $status = KIWIQX::qxx ( "$grub2_mkimage $core_opts @modules 2>&1" @@ -5562,7 +5565,7 @@ my $target = $dest; KIWIQX::qxx ("mv $dest/boot/boot.scr $target &>/dev/null"); KIWIQX::qxx ("mv $dest/boot/*.dtb $target &>/dev/null"); - KIWIQX::qxx ("mv $dest/boot/dtb/ $target &>/dev/null"); + KIWIQX::qxx ("mv $dest/boot/dtb* $target &>/dev/null"); if (-f "$dest/boot/MLO") { $status = KIWIQX::qxx ("mv $dest/boot/MLO $target"); $result = $? >> 8; @@ -5588,6 +5591,11 @@ KIWIQX::qxx ("mv $dest/boot/*.img $target &>/dev/null"); KIWIQX::qxx ("mv $dest/boot/*.imx $target &>/dev/null"); KIWIQX::qxx ("mv $dest/boot/*.elf $target &>/dev/null"); + if (-d "$dest/boot/vc") { + # Raspberry Pi VideoCore files + KIWIQX::qxx ("mv $dest/boot/vc/* $target &>/dev/null"); + KIWIQX::qxx ("mv $dest/boot/vc $dest &>/dev/null"); + } } #========================================== # YaBoot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfig.sh new/kiwi/modules/KIWIConfig.sh --- old/kiwi/modules/KIWIConfig.sh 2015-11-17 12:53:24.000000000 +0100 +++ new/kiwi/modules/KIWIConfig.sh 2015-12-22 09:39:43.000000000 +0100 @@ -1200,12 +1200,15 @@ if [ -f /boot/MLO ];then mv /boot/MLO /image/loader fi + if [ -d /boot/vc ];then + mv /boot/vc /image/loader + fi mv /boot/*.dat /image/loader &>/dev/null mv /boot/*.bin /image/loader &>/dev/null mv /boot/*.img /image/loader &>/dev/null mv /boot/*.imx /image/loader &>/dev/null mv /boot/*.dtb /image/loader &>/dev/null - mv /boot/dtb/ /image/loader &>/dev/null + mv /boot/dtb* /image/loader &>/dev/null mv /boot/*.elf /image/loader &>/dev/null else # boot loader binaries @@ -1474,17 +1477,22 @@ #========================================== # check for weak-/updates and backup them #------------------------------------------ + stripdir=/tmp/stripped_modules if [ -d $kversion/weak-updates ];then - mv $kversion/weak-updates /tmp + mkdir -pv $stripdir$kversion + mv $kversion/weak-updates $stripdir$kversion + fi + if [ -d $kversion/updates ];then + mkdir -pv $stripdir$kversion + mv $kversion/updates $stripdir$kversion fi #========================================== # strip the modules but take care for deps #------------------------------------------ - stripdir=/tmp/stripped_modules for mod in $(echo $kiwi_drivers | tr , ' '); do - local path=`/usr/bin/dirname $mod` - local base=`/usr/bin/basename $mod` - for d in "." kernel updates;do + local path=$(/usr/bin/dirname $mod) + local base=$(/usr/bin/basename $mod) + for d in "." kernel;do if [ "$base" = "*" ];then if test -d $kversion/$d/$path ; then mkdir -pv $stripdir$kversion/$d/$path @@ -1537,9 +1545,6 @@ if [ -f /tmp/modules.order ];then mv /tmp/modules.order $kversion fi - if [ -d /tmp/weak-updates ];then - mv /tmp/weak-updates $kversion - fi #========================================== # run depmod #------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfigure.pm new/kiwi/modules/KIWIConfigure.pm --- old/kiwi/modules/KIWIConfigure.pm 2015-09-21 16:23:18.000000000 +0200 +++ new/kiwi/modules/KIWIConfigure.pm 2015-12-11 10:09:28.000000000 +0100 @@ -736,24 +736,25 @@ my $root = $this->{root}; my $xml = $this->{xml}; my $users = $xml -> getUsers(); - my $adduser = $locator -> getExecPath('useradd', $root); my $chown = $locator -> getExecPath('chown', $root); my $grep = $locator -> getExecPath('grep', $root); - my $moduser = $locator -> getExecPath('usermod', $root); my $numUsers = scalar @{$users}; - if ($numUsers) { - if (! $adduser) { - $kiwi -> error ("Missing useradd command"); - $kiwi -> failed (); - return; - } - if (! $moduser) { - $kiwi -> error ("Missing usermod command"); - $kiwi -> failed (); - return; - } - } + for my $user (@{$users}) { + my $adduser = $locator -> getExecPath('useradd', $root); + my $moduser = $locator -> getExecPath('usermod', $root); + if ($numUsers) { + if (! $adduser) { + $kiwi -> error ("Missing useradd command"); + $kiwi -> failed (); + return; + } + if (! $moduser) { + $kiwi -> error ("Missing usermod command"); + $kiwi -> failed (); + return; + } + } my $group = $user -> getGroupName(); my $gid = $user -> getGroupID(); my $logShell = $user -> getLoginShell(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2015-11-26 09:59:25.000000000 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2015-12-23 10:50:16.000000000 +0100 @@ -1933,7 +1933,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.03.37"; + $data{Version} = "7.03.48"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi"; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImage.pm new/kiwi/modules/KIWIImage.pm --- old/kiwi/modules/KIWIImage.pm 2015-10-19 16:09:59.000000000 +0200 +++ new/kiwi/modules/KIWIImage.pm 2015-11-30 12:44:35.000000000 +0100 @@ -2205,7 +2205,7 @@ } elsif ($gzip =~ /^seed/) { print $CFD "UNIONFS_CONFIG='/dev/ram1,loop,seed'\n"; } elsif ($gzip =~ /^overlay/) { - print $CFD "UNIONFS_CONFIG='/dev/ram1,loop,overlay'\n"; + print $CFD "UNIONFS_CONFIG='tmpfs,loop,overlay'\n"; } else { print $CFD "COMBINED_IMAGE=yes\n"; } @@ -4194,6 +4194,11 @@ } KIWIQX::qxx ("rm -rf $imageTree/boot/*"); } + else { + $kiwi -> warning ("--> Can't find kernel for extraction: " . + "did you call suseStripKernel?"); + $kiwi -> skipped (); + } return $name; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2015-10-19 11:50:56.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2015-12-23 10:50:16.000000000 +0100 @@ -1593,12 +1593,22 @@ #-------------------------------------- if [ -x "$dracutExec" ]; then # 1. dracut - Echo "Creating dracut based initrd" params=" -f /boot/initrd-$kernel_version $kernel_version" - if ! $dracutExec -H $params;then - Echo "Can't create initrd with dracut" - systemIntegrity=unknown - bootLoaderOK=0 + if [[ $kiwi_initrdname =~ vmxboot ]];then + Echo "Creating dracut based initrd (background process)" + # run dracut in the background to speed up the boot. + # We loose the status check of the call and reboot is + # only safe after the call has finished. Therefore this + # is only done for simple vmx type images which are + # mostly used in cloud frameworks + $dracutExec -H $params &>/dev/null </dev/null & + else + Echo "Creating dracut based initrd" + if ! $dracutExec -H $params;then + Echo "Can't create initrd with dracut" + systemIntegrity=unknown + bootLoaderOK=0 + fi fi elif [ -x "$mkinitrdExec" ]; then # 2. mkinitrd @@ -1741,6 +1751,22 @@ "reboot" esac setupBootThemes "/config" + if [ "$haveLuks" = "yes" ]; then + setupCryptTab + fi +} +#====================================== +# setupCryptTab +#-------------------------------------- +function setupCryptTab { + local IFS=$IFS_ORIG + local rootdevice=$(ddn $imageDiskDevice $kiwi_RootPart) + local fsuuid=$(blkid $rootdevice -s UUID -o value) + local prefix=$1 + if [ -z "$prefix" ];then + prefix=/mnt + fi + echo "luks UUID=$fsuuid" > $prefix/etc/crypttab } #====================================== # setupBootThemes @@ -3736,13 +3762,10 @@ #====================================== # update config file #-------------------------------------- - for key in INITRD_MODULES DOMU_INITRD_MODULES;do + for key in INITRD_MODULES;do if [ $key = "INITRD_MODULES" ];then val=$INITRD_MODULES fi - if [ $key = "DOMU_INITRD_MODULES" ];then - val=$DOMURD_MODULES - fi if [ -z "$val" ];then continue fi @@ -6209,18 +6232,22 @@ if [ -z "$file" ];then file=/proc/cmdline fi - for i in $(cat $file);do + local cmdline=$( + awk -F\" '{OFS="\"";for(i=2;i<NF;i+=2)gsub(/ /,"\030",$i);print}' <$file + ) + for i in $cmdline;do if ! echo $i | grep -q "=";then continue fi - kernelKey=`echo $i | cut -f1 -d=` + kernelKey=$(echo $i | cut -f1 -d=) #====================================== # convert parameters to lowercase if required #-------------------------------------- if [ "$translate" = "lowercase" ];then kernelKey=`echo $kernelKey | tr [:upper:] [:lower:]` fi - kernelVal=`echo $i | cut -f2 -d=` + kernelVal=$(echo $i | cut -f2 -d=) + kernelVal=$(echo $kernelVal | sed -e 's/\o30/ /g') eval export $kernelKey=$kernelVal done if [ ! -z "$kiwikernelmodule" ];then @@ -6399,35 +6426,23 @@ if [ "$RELOAD_IMAGE" = "yes" ] || \ ! mount -o ro $rwDevice $rwDir &>/dev/null then - #====================================== - # store old FSTYPE value - #-------------------------------------- - if [ ! -z "$FSTYPE" ];then - FSTYPE_SAVE=$FSTYPE - fi - #====================================== - # probe filesystem - #-------------------------------------- - probeFileSystem $rwDevice - if [ ! "$FSTYPE" = "unknown" ];then - Echo "Checking filesystem for RW data on $rwDevice..." - e2fsck -p $rwDevice - fi - #====================================== - # restore FSTYPE - #-------------------------------------- - if [ ! -z "$FSTYPE_SAVE" ];then - FSTYPE=$FSTYPE_SAVE + local hybrid_fs=$HYBRID_PERSISTENT_FS + if [ ! -z "$kiwi_hybridpersistent_filesystem" ];then + hybrid_fs=$kiwi_hybridpersistent_filesystem fi + Echo "Checking filesystem for RW data on $rwDevice..." + checkFilesystem $rwDevice + if [ "$RELOAD_IMAGE" = "yes" ] || \ ! mount -o ro $rwDevice $rwDir &>/dev/null then Echo "Creating filesystem for RW data on $rwDevice..." - if ! mkfs.ext3 -F $rwDevice >/dev/null;then + local exception_handling="false" + if ! createFilesystem $rwDevice "" "" "hybrid" $exception_handling $hybrid_fs; then Echo "Failed to create ext3 filesystem" return 1 fi - e2fsck -p $rwDevice >/dev/null + checkFilesystem $rwDevice >/dev/null fi else umount $rwDevice @@ -8611,7 +8626,7 @@ # no map name set, build it from device #-------------------------------------- if [ -z "$name" ];then - name=luks_$(basename "$ldev") + name=luks fi #====================================== # luks map already exists, return @@ -9705,6 +9720,35 @@ exec kexec -e } #====================================== +# checkFilesystem +#-------------------------------------- +function checkFilesystem { + local device=$1 + local FSTYPE_SAVE=$FS_TYPE + if [ -z "$FSTYPE" ];then + probeFileSystem $device + fi + if [ "$FSTYPE" = "reiserfs" ];then + reiserfsck -y $device + elif [ "$FSTYPE" = "ext2" ];then + e2fsck -p $device + elif [ "$FSTYPE" = "ext3" ];then + e2fsck -p $device + elif [ "$FSTYPE" = "ext4" ];then + e2fsck -p $device + elif [ "$FSTYPE" = "btrfs" ];then + btrfsck $device + elif [ "$FSTYPE" = "xfs" ];then + xfs_repair -n $device + else + FSTYPE=$FSTYPE_SAVE + # don't know how to check this filesystem + Echo "Don't know how to check ${FSTYPE}... skip it" + return + fi + FSTYPE=$FSTYPE_SAVE +} +#====================================== # resizeFilesystem #-------------------------------------- function resizeFilesystem { @@ -9725,22 +9769,18 @@ fi if [ "$FSTYPE" = "reiserfs" ];then resize_fs="resize_reiserfs -q $deviceResize" - check="reiserfsck -y $deviceResize" elif [ "$FSTYPE" = "ext2" ];then resize_fs="resize2fs -f -F -p $deviceResize" - check="e2fsck -p $deviceResize" if [ $ramdisk -eq 1 ];then resize_fs="resize2fs -f $deviceResize" fi elif [ "$FSTYPE" = "ext3" ];then resize_fs="resize2fs -f -F -p $deviceResize" - check="e2fsck -p $deviceResize" if [ $ramdisk -eq 1 ];then resize_fs="resize2fs -f $deviceResize" fi elif [ "$FSTYPE" = "ext4" ];then resize_fs="resize2fs -f -F -p $deviceResize" - check="e2fsck -p $deviceResize" if [ $ramdisk -eq 1 ];then resize_fs="resize2fs -f $deviceResize" fi @@ -9752,11 +9792,9 @@ else resize_fs="$resize_fs btrfsctl -r max $mpoint;umount $mpoint" fi - check="btrfsck $deviceResize" elif [ "$FSTYPE" = "xfs" ];then resize_fs="mount $deviceResize $mpoint &&" resize_fs="$resize_fs xfs_growfs $mpoint;umount $mpoint" - check="xfs_repair -n $deviceResize" elif [ "$FSTYPE" = "zfs" ];then local device=$(getDiskID $deviceResize) resize_fs="zpool import kiwipool && udevPending &&" @@ -9768,9 +9806,9 @@ return fi if [ -z "$callme" ];then - if [ $ramdisk -eq 0 ] && [ ! -z "$check" ];then + if [ $ramdisk -eq 0 ]; then Echo "Checking $FSTYPE filesystem on ${deviceResize}..." - eval $check + checkFilesystem $check fi Echo "Resizing $FSTYPE filesystem on ${deviceResize}..." eval $resize_fs @@ -9864,6 +9902,10 @@ if [ ! -z "$label" ];then opts="$opts -n $label" fi + elif [ "$filesystem" = "xfs" ];then + if [ ! -z "$label" ];then + opts="$opts -L $label" + fi elif [ "$filesystem" = "ntfs" ];then if [ ! -z "$label" ];then opts="$opts -L $label" @@ -9884,8 +9926,10 @@ dd if=/dev/zero of=$deviceCreate bs=1M count=1 conv=notrunc mkfs.btrfs $opts $deviceCreate elif [ "$filesystem" = "xfs" ];then - mkfs.xfs -f $deviceCreate - xfs_admin -U $uuid $deviceCreate + mkfs.xfs $opts -f $deviceCreate + if [ ! -z "$uuid" ];then + xfs_admin -U $uuid $deviceCreate + fi elif [ "$filesystem" = "fat" ];then mkfs.fat $opts $deviceCreate $blocks 1>&2 elif [ "$filesystem" = "ntfs" ];then @@ -11449,6 +11493,7 @@ if [ ! -z "$kiwi_bootloader" ];then export loader=$kiwi_bootloader fi + export kiwi_initrdname=$kiwi_iname fi #====================================== # Check partitioner capabilities diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIRoot.pm new/kiwi/modules/KIWIRoot.pm --- old/kiwi/modules/KIWIRoot.pm 2015-09-21 16:23:18.000000000 +0200 +++ new/kiwi/modules/KIWIRoot.pm 2015-12-11 10:09:28.000000000 +0100 @@ -482,6 +482,9 @@ #---------------------------------- $kiwi -> info ("Creating default template files for new root system"); if (! defined $this->{cacheRoot}) { + my $type = $xml -> getImageType(); + my $boot_description = $type -> getBootImageDescript(); + KIWIQX::qxx ("mkdir -p $root/dev"); KIWIQX::qxx ("chown root:root $root/dev"); KIWIQX::qxx ("mkdir -m 755 -p $root/proc"); @@ -505,9 +508,28 @@ KIWIQX::qxx ("mkdir -p $root/etc/sysconfig"); KIWIQX::qxx ("mkdir -m 755 -p $root/var"); KIWIQX::qxx ("chown root:root $root/var"); - KIWIQX::qxx ("mkdir -m 755 -p $root/run"); - KIWIQX::qxx ("chown root:root $root/run"); - KIWIQX::qxx ("ln -s /run $root/var/run"); + + # this is a bad hack to check which system var/run vs. /run structure + # we need. Unfortunately the suse packages does not handle this + # correctly because it depends on the order of the packages + # if the setup is correct or not. We have no influence on the order + # because we pass the package installation to the package manager + # Thus there is at the moment no other way to pro actively create + # filesystem structures which really should not be kiwi's task + # to this extend + if (($boot_description) && ($boot_description =~ /SLES11|rhel-06/)) { + KIWIQX::qxx ("mkdir -m 755 -p $root/var/run"); + KIWIQX::qxx ("chown root:root $root/var/run"); + KIWIQX::qxx ("mkdir -m 755 -p $root/var/run/dbus"); + KIWIQX::qxx ("chown root:root $root/var/run/dbus"); + } else { + KIWIQX::qxx ("mkdir -m 755 -p $root/run"); + KIWIQX::qxx ("chown root:root $root/run"); + KIWIQX::qxx ("mkdir -m 755 -p $root/run/dbus"); + KIWIQX::qxx ("chown root:root $root/run/dbus"); + KIWIQX::qxx ("ln -s ../run $root/var/run"); + } + # for zypper we need a yast log dir if ($packager eq "zypper") { KIWIQX::qxx ("mkdir -p $root/var/log/YaST2"); @@ -1758,11 +1780,13 @@ $kiwi -> skipped (); } } - if (($prefix) && ($item =~ /^$prefix/)) { + if (($prefix) && ($item =~ /^$prefix/) && ($item =~ /base-system/)) { KIWIQX::qxx ("rmdir -p \"$item\" 2>&1"); + } elsif (($prefix) && ($item =~ /^$prefix/)) { + KIWIQX::qxx ("rmdir \"$item\" 2>&1"); } if ($item =~ /^\/tmp\/kiwimount/) { - KIWIQX::qxx ("rmdir -p \"$item\" 2>&1"); + KIWIQX::qxx ("rmdir \"$item\" 2>&1"); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rnc new/kiwi/modules/KIWISchema.rnc --- old/kiwi/modules/KIWISchema.rnc 2015-11-26 09:08:16.000000000 +0100 +++ new/kiwi/modules/KIWISchema.rnc 2015-12-23 09:12:14.000000000 +0100 @@ -1783,7 +1783,7 @@ ## hybrid ISO is used as disk on e.g a USB Stick. By default ## the btrfs filesystem is used attribute hybridpersistent_filesystem { - "btrfs" | "fat" | "ext4" + "btrfs" | "fat" | "ext4" | "xfs" } k.type.image.attribute = ## Specifies the image type diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rng new/kiwi/modules/KIWISchema.rng --- old/kiwi/modules/KIWISchema.rng 2015-11-26 09:08:25.000000000 +0100 +++ new/kiwi/modules/KIWISchema.rng 2015-12-23 09:12:14.000000000 +0100 @@ -2404,6 +2404,7 @@ <value>btrfs</value> <value>fat</value> <value>ext4</value> + <value>xfs</value> </choice> </attribute> </define> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/.md5 new/kiwi/system/boot/armv7l/.md5 --- old/kiwi/system/boot/armv7l/.md5 2015-09-10 15:20:52.000000000 +0200 +++ new/kiwi/system/boot/armv7l/.md5 2015-11-30 10:11:39.000000000 +0100 @@ -3,7 +3,7 @@ for dir in `find -type d`;do if [ -f $dir/config.xml ];then pushd $dir &>/dev/null - find -L -type f | grep -v .svn | grep -v .checksum.md5 |\ + find -L -type f ! -wholename '*.svn*' ! -name .checksum.md5 | sort |\ xargs md5sum > .checksum.md5 popd &>/dev/null fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-linuxrc new/kiwi/system/boot/armv7l/oemboot/suse-linuxrc --- old/kiwi/system/boot/armv7l/oemboot/suse-linuxrc 2015-10-08 10:34:41.000000000 +0200 +++ new/kiwi/system/boot/armv7l/oemboot/suse-linuxrc 2015-12-11 10:09:28.000000000 +0100 @@ -27,7 +27,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="" export LOCAL_BOOT=no export systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/vmxboot/suse-linuxrc new/kiwi/system/boot/armv7l/vmxboot/suse-linuxrc --- old/kiwi/system/boot/armv7l/vmxboot/suse-linuxrc 2015-10-08 10:34:55.000000000 +0200 +++ new/kiwi/system/boot/armv7l/vmxboot/suse-linuxrc 2015-12-11 10:09:28.000000000 +0100 @@ -27,7 +27,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="" export LOCAL_BOOT="no" export systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ia64/.md5 new/kiwi/system/boot/ia64/.md5 --- old/kiwi/system/boot/ia64/.md5 2015-09-10 15:20:53.000000000 +0200 +++ new/kiwi/system/boot/ia64/.md5 2015-11-30 10:11:39.000000000 +0100 @@ -3,7 +3,7 @@ for dir in `find -type d`;do if [ -f $dir/config.xml ];then pushd $dir &>/dev/null - find -L -type f | grep -v .svn | grep -v .checksum.md5 |\ + find -L -type f ! -wholename '*.svn*' ! -name .checksum.md5 | sort |\ xargs md5sum > .checksum.md5 popd &>/dev/null fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/.md5 new/kiwi/system/boot/ix86/.md5 --- old/kiwi/system/boot/ix86/.md5 2015-09-10 15:20:53.000000000 +0200 +++ new/kiwi/system/boot/ix86/.md5 2015-11-30 10:11:39.000000000 +0100 @@ -3,7 +3,7 @@ for dir in `find -type d`;do if [ -f $dir/config.xml ];then pushd $dir &>/dev/null - find -L -type f | grep -v .svn | grep -v .checksum.md5 |\ + find -L -type f ! -wholename '*.svn*' ! -name .checksum.md5 | sort |\ xargs md5sum > .checksum.md5 popd &>/dev/null fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/rhel-linuxrc new/kiwi/system/boot/ix86/isoboot/rhel-linuxrc --- old/kiwi/system/boot/ix86/isoboot/rhel-linuxrc 2015-09-22 13:06:53.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/rhel-linuxrc 2015-11-30 15:09:37.000000000 +0100 @@ -109,7 +109,10 @@ importFile < $LIVECD_CONFIG if [ ! -z "$HYBRID_RW" ];then if [ ! -z "$UNIONFS_CONFIG" ];then - UNIONFS_CONFIG=$(echo $UNIONFS_CONFIG | sed -e s@/dev/ram1@$HYBRID_RW@) + tmp_rwDevice=$(echo $UNIONFS_CONFIG | cut -d , -f 1) + UNIONFS_CONFIG=$( + echo $UNIONFS_CONFIG | sed -e s@$tmp_rwDevice@$HYBRID_RW@ + ) else IMAGE=$(echo $IMAGE | sed -e s@/dev/ram1@$HYBRID_RW@) fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-linuxrc new/kiwi/system/boot/ix86/isoboot/suse-linuxrc --- old/kiwi/system/boot/ix86/isoboot/suse-linuxrc 2015-09-22 13:07:01.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/suse-linuxrc 2015-11-30 14:58:51.000000000 +0100 @@ -109,7 +109,10 @@ importFile < $LIVECD_CONFIG if [ ! -z "$HYBRID_RW" ];then if [ ! -z "$UNIONFS_CONFIG" ];then - UNIONFS_CONFIG=$(echo $UNIONFS_CONFIG | sed -e s@/dev/ram1@$HYBRID_RW@) + tmp_rwDevice=$(echo $UNIONFS_CONFIG | cut -d , -f 1) + UNIONFS_CONFIG=$( + echo $UNIONFS_CONFIG | sed -e s@$tmp_rwDevice@$HYBRID_RW@ + ) else IMAGE=$(echo $IMAGE | sed -e s@/dev/ram1@$HYBRID_RW@) fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-linuxrc new/kiwi/system/boot/ix86/netboot/suse-linuxrc --- old/kiwi/system/boot/ix86/netboot/suse-linuxrc 2015-09-10 15:20:53.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-linuxrc 2015-12-11 10:09:29.000000000 +0100 @@ -28,7 +28,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="" export LOCAL_BOOT="no" export KERNEL_LIST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/rhel-linuxrc new/kiwi/system/boot/ix86/oemboot/rhel-linuxrc --- old/kiwi/system/boot/ix86/oemboot/rhel-linuxrc 2015-09-21 16:23:19.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/rhel-linuxrc 2015-12-11 10:09:29.000000000 +0100 @@ -27,7 +27,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="" export LOCAL_BOOT=no export systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-linuxrc new/kiwi/system/boot/ix86/oemboot/suse-linuxrc --- old/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2015-10-08 10:30:50.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2015-12-11 10:09:29.000000000 +0100 @@ -27,7 +27,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="" export LOCAL_BOOT=no export systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc new/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc --- old/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc 2015-09-10 15:20:54.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc 2015-12-11 10:09:29.000000000 +0100 @@ -27,7 +27,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="" export LOCAL_BOOT="no" export systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-linuxrc new/kiwi/system/boot/ix86/vmxboot/suse-linuxrc --- old/kiwi/system/boot/ix86/vmxboot/suse-linuxrc 2015-10-08 10:31:21.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/suse-linuxrc 2015-12-11 10:09:29.000000000 +0100 @@ -27,7 +27,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="" export LOCAL_BOOT="no" export systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/m68k/.md5 new/kiwi/system/boot/m68k/.md5 --- old/kiwi/system/boot/m68k/.md5 2015-09-10 15:20:54.000000000 +0200 +++ new/kiwi/system/boot/m68k/.md5 2015-11-30 10:11:39.000000000 +0100 @@ -3,7 +3,7 @@ for dir in `find -type d`;do if [ -f $dir/config.xml ];then pushd $dir &>/dev/null - find -L -type f | grep -v .svn | grep -v .checksum.md5 |\ + find -L -type f ! -wholename '*.svn*' ! -name .checksum.md5 | sort |\ xargs md5sum > .checksum.md5 popd &>/dev/null fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/.md5 new/kiwi/system/boot/ppc/.md5 --- old/kiwi/system/boot/ppc/.md5 2015-09-10 15:20:54.000000000 +0200 +++ new/kiwi/system/boot/ppc/.md5 2015-11-30 10:11:39.000000000 +0100 @@ -3,7 +3,7 @@ for dir in `find -type d`;do if [ -f $dir/config.xml ];then pushd $dir &>/dev/null - find -L -type f | grep -v .svn | grep -v .checksum.md5 |\ + find -L -type f ! -wholename '*.svn*' ! -name .checksum.md5 | sort |\ xargs md5sum > .checksum.md5 popd &>/dev/null fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/netboot/suse-linuxrc new/kiwi/system/boot/ppc/netboot/suse-linuxrc --- old/kiwi/system/boot/ppc/netboot/suse-linuxrc 2015-09-10 15:20:54.000000000 +0200 +++ new/kiwi/system/boot/ppc/netboot/suse-linuxrc 2015-12-11 10:09:29.000000000 +0100 @@ -28,7 +28,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="ipr lpfc ibmvscsic" export LOCAL_BOOT="no" export KERNEL_LIST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-linuxrc new/kiwi/system/boot/ppc/oemboot/suse-linuxrc --- old/kiwi/system/boot/ppc/oemboot/suse-linuxrc 2015-10-08 10:32:15.000000000 +0200 +++ new/kiwi/system/boot/ppc/oemboot/suse-linuxrc 2015-12-11 10:09:29.000000000 +0100 @@ -27,7 +27,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="ipr lpfc ibmvscsic" export LOCAL_BOOT=no export systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/vmxboot/suse-linuxrc new/kiwi/system/boot/ppc/vmxboot/suse-linuxrc --- old/kiwi/system/boot/ppc/vmxboot/suse-linuxrc 2015-10-08 10:33:09.000000000 +0200 +++ new/kiwi/system/boot/ppc/vmxboot/suse-linuxrc 2015-12-11 10:09:29.000000000 +0100 @@ -27,7 +27,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="ipr lpfc ibmvscsic" export LOCAL_BOOT="no" export systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/.md5 new/kiwi/system/boot/s390/.md5 --- old/kiwi/system/boot/s390/.md5 2015-09-10 15:20:54.000000000 +0200 +++ new/kiwi/system/boot/s390/.md5 2015-11-30 10:11:39.000000000 +0100 @@ -3,7 +3,7 @@ for dir in `find -type d`;do if [ -f $dir/config.xml ];then pushd $dir &>/dev/null - find -L -type f | grep -v .svn | grep -v .checksum.md5 |\ + find -L -type f ! -wholename '*.svn*' ! -name .checksum.md5 | sort |\ xargs md5sum > .checksum.md5 popd &>/dev/null fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-linuxrc new/kiwi/system/boot/s390/oemboot/suse-linuxrc --- old/kiwi/system/boot/s390/oemboot/suse-linuxrc 2015-10-08 10:34:10.000000000 +0200 +++ new/kiwi/system/boot/s390/oemboot/suse-linuxrc 2015-12-11 10:09:29.000000000 +0100 @@ -27,7 +27,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="" export LOCAL_BOOT=no export systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/vmxboot/suse-linuxrc new/kiwi/system/boot/s390/vmxboot/suse-linuxrc --- old/kiwi/system/boot/s390/vmxboot/suse-linuxrc 2015-10-08 10:34:23.000000000 +0200 +++ new/kiwi/system/boot/s390/vmxboot/suse-linuxrc 2015-12-11 10:09:29.000000000 +0100 @@ -27,7 +27,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="" export LOCAL_BOOT="no" export systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-13.2-JeOS/config.xml new/kiwi/template/ix86/suse-13.2-JeOS/config.xml --- old/kiwi/template/ix86/suse-13.2-JeOS/config.xml 2015-10-13 11:42:26.000000000 +0200 +++ new/kiwi/template/ix86/suse-13.2-JeOS/config.xml 2015-12-21 16:12:56.000000000 +0100 @@ -86,6 +86,7 @@ <package name="iputils"/> <package name="vim"/> <package name="grub2"/> + <package name="grub2-x86_64-efi"/> <package name="syslinux"/> <package name="lvm2"/> <package name="plymouth"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-SLE12-community-JeOS/config.xml new/kiwi/template/ix86/suse-SLE12-community-JeOS/config.xml --- old/kiwi/template/ix86/suse-SLE12-community-JeOS/config.xml 2015-10-19 12:44:32.000000000 +0200 +++ new/kiwi/template/ix86/suse-SLE12-community-JeOS/config.xml 2015-12-21 16:13:10.000000000 +0100 @@ -113,6 +113,7 @@ <package name="iputils"/> <package name="vim"/> <package name="grub2"/> + <package name="grub2-x86_64-efi"/> <package name="syslinux"/> <package name="lvm2"/> <package name="plymouth"/> @@ -186,7 +187,4 @@ --> <package name="sles-release"/> </packages> - <packages type="delete"> - <package name="kernel-debug"/> - </packages> </image>

1 0

commit libsolv for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package libsolv for openSUSE:Factory checked in at 2016-01-05 09:39:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsolv (Old) and /work/SRC/openSUSE:Factory/.libsolv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libsolv" Changes: -------- --- /work/SRC/openSUSE:Factory/libsolv/libsolv.changes 2015-10-19 22:15:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libsolv.new/libsolv.changes 2016-01-05 09:40:31.000000000 +0100 @@ -1,0 +2,23 @@ +Tue Dec 22 11:49:02 CET 2015 - mls(a)suse.de + +- fix update handling of multiversion packages [bnc#957606] +- bump version to 0.6.17 + +------------------------------------------------------------------- +Mon Dec 21 12:59:19 CET 2015 - mls(a)suse.de + +- fix orphan handling for dup with keeporphans set [bnc#957606] +- bump version to 0.6.16 + +------------------------------------------------------------------- +Mon Dec 14 15:48:01 CET 2015 - mls(a)suse.de + +- change product links to also look at timestamps [bnc#956443] +- rework multiversion orphaned handling [bnc#957606] +- support key type changes in repodata_internalize() +- allow serialization of REPOKEY_TYPE_DELETED +- improve appdata handling of installed packages +- improve performance when run under xen +- bump version to 0.6.15 + +------------------------------------------------------------------- Old: ---- libsolv-0.6.14.tar.bz2 New: ---- libsolv-0.6.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsolv.spec ++++++ --- /var/tmp/diff_new_pack.1o4cYV/_old 2016-01-05 09:40:34.000000000 +0100 +++ /var/tmp/diff_new_pack.1o4cYV/_new 2016-01-05 09:40:34.000000000 +0100 @@ -17,7 +17,7 @@ Name: libsolv -Version: 0.6.14 +Version: 0.6.17 Release: 0 Url: https://github.com/openSUSE/libsolv Source: libsolv-%{version}.tar.bz2 ++++++ libsolv-0.6.14.tar.bz2 -> libsolv-0.6.17.tar.bz2 ++++++ ++++ 3321 lines of diff (skipped)

1 0

commit google-noto-fonts for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package google-noto-fonts for openSUSE:Factory checked in at 2016-01-05 09:39:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/google-noto-fonts (Old) and /work/SRC/openSUSE:Factory/.google-noto-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "google-noto-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/google-noto-fonts/google-noto-fonts.changes 2015-12-16 17:41:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.google-noto-fonts.new/google-noto-fonts.changes 2016-01-05 09:40:10.000000000 +0100 @@ -1,0 +2,17 @@ +Tue Dec 22 14:13:56 UTC 2015 - fcrozat(a)suse.com + +- Update to version 20151215: + * Color Emoji are now available in a subpackage. + * Update TaiTham to v1.03 + * Update Coptic to v1.03 + * Update Tifinagh to v1.05 + * Update Thaana to v1.02 + * Update Arimo and Tinos to v1.32 + * Update Khmer to v1.03 + * Update Javanese to v1.05 + * Update Lepcha to v1.03 + * Update Lao to v1.02 + * Update KufiArabic to v1.04 +- Update source url. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ google-noto-fonts.spec ++++++ --- /var/tmp/diff_new_pack.TkR0AJ/_old 2016-01-05 09:40:26.000000000 +0100 +++ /var/tmp/diff_new_pack.TkR0AJ/_new 2016-01-05 09:40:26.000000000 +0100 @@ -17,8 +17,8 @@ %define hyear 2015 -%define hmonth 10 -%define hday 02 +%define hmonth 12 +%define hday 15 %define src_name NotoFonts # DO NOT EDIT THIS SPECFILE DIRECTLY, edit google-noto-fonts.spec.in and run generate-specfile.sh scriptZZ @@ -30,7 +30,7 @@ License: OFL-1.1 Group: System/X11/Fonts Url: https://github.com/googlei18n/noto-fonts -Source0: http://www.google.com/get/noto/pkgs/Noto-hinted.zip +Source0: https://noto-website-2.storage.googleapis.com/pkgs/Noto-hinted.zip Source2: generate-specfile.sh BuildRequires: fontpackages-devel BuildRequires: unzip @@ -49,6 +49,18 @@ %description doc License for Google's Noto fonts. +%package -n noto-coloremoji-fonts +Summary: Noto Font +Group: System/X11/Fonts +Requires: google-noto-fonts-doc +Obsoletes: noto-coloremoji +Provides: noto-coloremoji + +%description -n noto-coloremoji-fonts +Noto's design goal is to achieve visual harmonization (e.g., compatible +heights and stroke thicknesses) across languages. This package contains + font, hinted. + %package -n noto-emoji-fonts Summary: Noto Font Group: System/X11/Fonts @@ -1322,6 +1334,8 @@ cp *.ttf %{buildroot}%{_ttfontsdir}/ cp *.otf %{buildroot}%{_ttfontsdir}/ +%reconfigure_fonts_scriptlets -n noto-coloremoji-fonts + %reconfigure_fonts_scriptlets -n noto-emoji-fonts %reconfigure_fonts_scriptlets -n noto-kufiarabic-fonts @@ -1536,6 +1550,11 @@ %defattr(0644,root,root,755) %doc LICENSE*.txt +%files -n noto-coloremoji-fonts +%defattr(-,root,root) +%dir %{_ttfontsdir} +%{_ttfontsdir}/NotoColorEmoji*.?tf + %files -n noto-emoji-fonts %defattr(-,root,root) %dir %{_ttfontsdir} ++++++ Noto-hinted.zip ++++++ Files /var/tmp/diff_new_pack.TkR0AJ/_old and /var/tmp/diff_new_pack.TkR0AJ/_new differ ++++++ generate-specfile.sh ++++++ --- /var/tmp/diff_new_pack.TkR0AJ/_old 2016-01-05 09:40:30.000000000 +0100 +++ /var/tmp/diff_new_pack.TkR0AJ/_new 2016-01-05 09:40:30.000000000 +0100 @@ -49,7 +49,11 @@ sed -i "s/@SUBPACKAGE_FILELISTS@/%files -n $packagename\n@SUBPACKAGE_FILELISTS@/" $pkg_name.spec sed -i "s/@SUBPACKAGE_FILELISTS@/%defattr(-,root,root)\n@SUBPACKAGE_FILELISTS@/" $pkg_name.spec sed -i "s/@SUBPACKAGE_FILELISTS@/%dir %{_ttfontsdir}\n@SUBPACKAGE_FILELISTS@/" $pkg_name.spec - sed -i "s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/Noto$serif$script$ui-\*.?tf\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec + if [ $serif != "ColorEmoji" ]; then + sed -i "s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/Noto$serif$script$ui-\*.?tf\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec + else + sed -i "s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/Noto$serif$script$ui\*.?tf\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec + fi sed -i "s/@SUBPACKAGE_FILELISTS@/\n@SUBPACKAGE_FILELISTS@/" $pkg_name.spec done done ++++++ google-noto-fonts.spec.in ++++++ --- /var/tmp/diff_new_pack.TkR0AJ/_old 2016-01-05 09:40:30.000000000 +0100 +++ /var/tmp/diff_new_pack.TkR0AJ/_new 2016-01-05 09:40:30.000000000 +0100 @@ -16,8 +16,8 @@ # %define hyear 2015 -%define hmonth 10 -%define hday 02 +%define hmonth 12 +%define hday 15 %define src_name NotoFonts # DO NOT EDIT THIS SPECFILE DIRECTLY, edit google-noto-fonts.spec.in and run generate-specfile.sh scriptZZ @@ -29,7 +29,7 @@ License: OFL-1.1 Group: System/X11/Fonts Url: https://github.com/googlei18n/noto-fonts -Source0: http://www.google.com/get/noto/pkgs/Noto-hinted.zip +Source0: https://noto-website-2.storage.googleapis.com/pkgs/Noto-hinted.zip Source2: generate-specfile.sh BuildRequires: fontpackages-devel BuildRequires: unzip

1 0

commit cantarell-fonts for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package cantarell-fonts for openSUSE:Factory checked in at 2016-01-05 09:39:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cantarell-fonts (Old) and /work/SRC/openSUSE:Factory/.cantarell-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cantarell-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/cantarell-fonts/cantarell-fonts.changes 2015-11-22 10:59:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cantarell-fonts.new/cantarell-fonts.changes 2016-01-05 09:39:54.000000000 +0100 @@ -1,0 +2,9 @@ +Sun Dec 20 21:27:34 UTC 2015 - damjanovic.ivo(a)gmail.com + +- Update to version 0.0.19: + + Generate oblique version. + + More diacritics work; full Latin 4 coverage. + + Tabular figures. + + Fold over work done on Cambay. + +------------------------------------------------------------------- Old: ---- cantarell-fonts-0.0.18.1.tar.xz New: ---- cantarell-fonts-0.0.19.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cantarell-fonts.spec ++++++ --- /var/tmp/diff_new_pack.cgiT5m/_old 2016-01-05 09:39:55.000000000 +0100 +++ /var/tmp/diff_new_pack.cgiT5m/_new 2016-01-05 09:39:55.000000000 +0100 @@ -17,7 +17,7 @@ Name: cantarell-fonts -Version: 0.0.18.1 +Version: 0.0.19 Release: 0 Summary: Contemporary Humanist Sans Serif Font License: OFL-1.1 @@ -59,5 +59,7 @@ %dir %{_ttfontsdir} %{_ttfontsdir}/Cantarell-Bold.otf %{_ttfontsdir}/Cantarell-Regular.otf +%{_ttfontsdir}/Cantarell-Bold-Oblique.otf +%{_ttfontsdir}/Cantarell-Oblique.otf %changelog ++++++ cantarell-fonts-0.0.18.1.tar.xz -> cantarell-fonts-0.0.19.tar.xz ++++++ ++++ 68688 lines of diff (skipped)

1 0

commit wireless-regdb for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package wireless-regdb for openSUSE:Factory checked in at 2016-01-05 09:39:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wireless-regdb (Old) and /work/SRC/openSUSE:Factory/.wireless-regdb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wireless-regdb" Changes: -------- --- /work/SRC/openSUSE:Factory/wireless-regdb/wireless-regdb.changes 2015-11-17 14:21:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wireless-regdb.new/wireless-regdb.changes 2016-01-05 09:39:49.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 22 13:11:55 UTC 2015 - mpluskal(a)suse.com + +- Update to 2015.12.14 + +------------------------------------------------------------------- Old: ---- wireless-regdb-2015.10.22.tar.xz New: ---- wireless-regdb-2015.12.14.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wireless-regdb.spec ++++++ --- /var/tmp/diff_new_pack.Cw7avp/_old 2016-01-05 09:39:50.000000000 +0100 +++ /var/tmp/diff_new_pack.Cw7avp/_new 2016-01-05 09:39:50.000000000 +0100 @@ -17,7 +17,7 @@ Name: wireless-regdb -Version: 2015.10.22 +Version: 2015.12.14 Release: 0 Summary: 802.11 regulatory domain database License: ISC ++++++ wireless-regdb-2015.10.22.tar.xz -> wireless-regdb-2015.12.14.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wireless-regdb-2015.10.22/db.txt new/wireless-regdb-2015.12.14/db.txt --- old/wireless-regdb-2015.10.22/db.txt 2015-10-22 17:11:01.000000000 +0200 +++ new/wireless-regdb-2015.12.14/db.txt 2015-12-14 17:52:47.000000000 +0100 @@ -2,7 +2,7 @@ country 00: (2402 - 2472 @ 40), (20) # Channel 12 - 13. - (2457 - 2482 @ 40), (20), NO-IR + (2457 - 2482 @ 20), (20), NO-IR, AUTO-BW # Channel 14. Only JP enables this and for 802.11b only (2474 - 2494 @ 20), (20), NO-IR, NO-OFDM # Channel 36 - 48 @@ -396,10 +396,10 @@ (5490 - 5710 @ 160), (27), DFS country FI: DFS-ETSI - (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 80), (20), AUTO-BW - (5250 - 5330 @ 80), (20), DFS, AUTO-BW - (5490 - 5710 @ 160), (27), DFS + (2400 - 2483.5 @ 40), (20) + (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW + (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW + (5470 - 5725 @ 160), (27), DFS # 60 GHz band channels 1-4, ref: Etsi En 302 567 (57000 - 66000 @ 2160), (40) Files old/wireless-regdb-2015.10.22/regulatory.bin and new/wireless-regdb-2015.12.14/regulatory.bin differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wireless-regdb-2015.10.22/sha1sum.txt new/wireless-regdb-2015.12.14/sha1sum.txt --- old/wireless-regdb-2015.10.22/sha1sum.txt 2015-10-22 17:11:01.000000000 +0200 +++ new/wireless-regdb-2015.12.14/sha1sum.txt 2015-12-14 17:52:47.000000000 +0100 @@ -1 +1 @@ -e3fcf518261fca6aa38b03e376c751e627a2b71f db.txt +d2121f4f06170545810265c8ba1088cf6ed9ad4d db.txt

1 0

commit appstream-glib for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package appstream-glib for openSUSE:Factory checked in at 2016-01-05 09:39:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/appstream-glib (Old) and /work/SRC/openSUSE:Factory/.appstream-glib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "appstream-glib" Changes: -------- --- /work/SRC/openSUSE:Factory/appstream-glib/appstream-glib.changes 2015-12-09 22:12:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.appstream-glib.new/appstream-glib.changes 2016-01-05 09:39:45.000000000 +0100 @@ -1,0 +2,15 @@ +Sun Dec 20 16:36:23 UTC 2015 - zaitor(a)opensuse.org + +- Update to version 0.5.5: + + Add a AS_APP_STATE_UPDATABLE_LIVE constant so we can support + live updates. + + Allow update_contact to be output in very limited conditions. + + Log when we auto-add kudos or keywords. + + Add the package name as another application search token. + + Add as_utils_license_to_spdx(). + + Only use the package license when not provided by the AppData + file. + + trivial: Fix a compiler warning. + + Fix a crash when tokenizing a NULL string. + +------------------------------------------------------------------- Old: ---- appstream-glib-0.5.4.tar.xz New: ---- appstream-glib-0.5.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ appstream-glib.spec ++++++ --- /var/tmp/diff_new_pack.qu1AjU/_old 2016-01-05 09:39:46.000000000 +0100 +++ /var/tmp/diff_new_pack.qu1AjU/_new 2016-01-05 09:39:46.000000000 +0100 @@ -20,7 +20,7 @@ %define _build_from_vcs 1 Name: appstream-glib -Version: 0.5.4 +Version: 0.5.5 Release: 0 Summary: AppStream Abstraction Library License: LGPL-2.1+ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.qu1AjU/_old 2016-01-05 09:39:46.000000000 +0100 +++ /var/tmp/diff_new_pack.qu1AjU/_new 2016-01-05 09:39:46.000000000 +0100 @@ -2,9 +2,9 @@ <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/hughsie/appstream-glib.git</param> <param name="scm">git</param> - <param name="versionformat">0.5.4</param> + <param name="versionformat">0.5.5</param> <param name="changesgenerate">enable</param> - <param name="revision">refs/tags/appstream_glib_0_5_4</param> + <param name="revision">refs/tags/appstream_glib_0_5_5</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.qu1AjU/_old 2016-01-05 09:39:46.000000000 +0100 +++ /var/tmp/diff_new_pack.qu1AjU/_new 2016-01-05 09:39:46.000000000 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/hughsie/appstream-glib.git</param> - <param name="changesrevision">33f99b7c8591c4c663facc6c7a1ce0fc97a2d7a4</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">fe3a3d15e8619ea5e59788973508853c6dc76804</param></service></servicedata> \ No newline at end of file ++++++ appstream-glib-0.5.4.tar.xz -> appstream-glib-0.5.5.tar.xz ++++++ ++++ 85149 lines of diff (skipped)

1 0

commit yast2-network for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2016-01-05 09:39:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-network (Old) and /work/SRC/openSUSE:Factory/.yast2-network.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2015-10-20 16:22:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2016-01-05 09:39:40.000000000 +0100 @@ -1,0 +2,59 @@ +Wed Dec 2 13:26:12 UTC 2015 - mfilka(a)suse.com + +- bnc#957377 + - When exporting AutoYaST profile, it contains dns configuration + even when this config was provided via linuxrc. +- 3.1.140 + +------------------------------------------------------------------- +Mon Nov 30 09:05:24 UTC 2015 - mfilka(a)suse.com + +- bnc#951330 + - drop record from /etc/hosts when deleting nic configuration +- bsc#954412 (igonzalezsosa(a)suse.com) + - Fix validation of AutoYaST profiles +- 3.1.139 + +------------------------------------------------------------------- +Wed Nov 25 21:01:49 UTC 2015 - mfilka(a)suse.com + +- bnc#956605 + - Write udev rules for renamed devices for non ssh / vnc AutoYaST + installations +- 3.1.138 + +------------------------------------------------------------------- +Mon Nov 23 09:54:34 UTC 2015 - mfilka(a)suse.com + +- bnc#956012 + - When exporting AutoYaST profile, it contains route definitions + even when these routes were configured using linuxrc. +- 3.1.137 + +------------------------------------------------------------------- +Mon Nov 16 21:33:18 UTC 2015 - mfilka(a)suse.com + +- bnc#955217 + - do not raise internal error during AY installation with profile + containing device renaming rule for unconfigured interface +- 3.1.136 + +------------------------------------------------------------------- +Mon Nov 16 05:52:07 UTC 2015 - mfilka(a)suse.com + +- bnc#944349 + - do not set links down when running AY installation over vnc. + VNC installation do not freeze. + - renaming network devices during ssh/vnc installation is + supported +-3.1.135 + +------------------------------------------------------------------- +Sun Nov 8 20:55:53 UTC 2015 - mfilka(a)suse.com + +- bnc#944349 + - do not set links down when running AY installation over ssh. + SSH installation do not freeze. +- 3.1.134 + +------------------------------------------------------------------- Old: ---- yast2-network-3.1.133.tar.bz2 New: ---- yast2-network-3.1.140.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.eskwP8/_old 2016-01-05 09:39:42.000000000 +0100 +++ /var/tmp/diff_new_pack.eskwP8/_new 2016-01-05 09:39:42.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.133 +Version: 3.1.140 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.133.tar.bz2 -> yast2-network-3.1.140.tar.bz2 ++++++ ++++ 2636 lines of diff (skipped)

1 0

commit zutils for openSUSE:Factory
by root＠hilbert.suse.de 04 Jan '16

04 Jan '16

Hello community, here is the log from the commit of package zutils for openSUSE:Factory checked in at 2016-01-04 09:22:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zutils (Old) and /work/SRC/openSUSE:Factory/.zutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zutils" Changes: -------- --- /work/SRC/openSUSE:Factory/zutils/zutils.changes 2015-04-21 10:52:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.zutils.new/zutils.changes 2016-01-04 09:22:30.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Jan 3 13:57:23 UTC 2016 - p.drouand(a)gmail.com + +- Update to version 1.4 + * Option '--format' has been renamed to '-O, --force-format'. + * Added new option '-M, --format=<list>' to all utilities. + +------------------------------------------------------------------- Old: ---- zutils-1.3.tar.lz zutils-1.3.tar.lz.sig New: ---- zutils-1.4.tar.lz zutils-1.4.tar.lz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zutils.spec ++++++ --- /var/tmp/diff_new_pack.7pRnag/_old 2016-01-04 09:22:31.000000000 +0100 +++ /var/tmp/diff_new_pack.7pRnag/_new 2016-01-04 09:22:31.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package zutils # -# 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,7 +17,7 @@ Name: zutils -Version: 1.3 +Version: 1.4 Release: 0 Summary: Collection of utilities for dealing with compressed files License: GPL-2.0+

1 0

commit zpaq for openSUSE:Factory
by root＠hilbert.suse.de 04 Jan '16

04 Jan '16

Hello community, here is the log from the commit of package zpaq for openSUSE:Factory checked in at 2016-01-04 09:22:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zpaq (Old) and /work/SRC/openSUSE:Factory/.zpaq.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zpaq" Changes: -------- --- /work/SRC/openSUSE:Factory/zpaq/zpaq.changes 2015-04-21 10:51:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.zpaq.new/zpaq.changes 2016-01-04 09:22:29.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Jan 3 14:03:56 UTC 2016 - p.drouand(a)gmail.com + +- Update to version 7.05 + * Fixed -method 111 + * fixes a valgrind warning (LZ77 read past end of input). + +------------------------------------------------------------------- Old: ---- zpaq704.zip New: ---- zpaq705.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zpaq.spec ++++++ --- /var/tmp/diff_new_pack.E4ejsi/_old 2016-01-04 09:22:30.000000000 +0100 +++ /var/tmp/diff_new_pack.E4ejsi/_new 2016-01-04 09:22:30.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package zpaq # -# 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,13 +17,13 @@ Name: zpaq -Version: 7.04 +Version: 7.05 Release: 0 Summary: A journaling, incremental, deduplicating archiver for Windows and Linux License: SUSE-Public-Domain and MIT Group: Productivity/Archiving/Compression Url: http://mattmahoney.net/dc/zpaq.html -Source0: http://mattmahoney.net/dc/zpaq704.zip +Source0: http://mattmahoney.net/dc/zpaq705.zip Source1: %{name}.changes BuildRequires: dos2unix BuildRequires: gcc-c++

1 0

commit zopfli for openSUSE:Factory
by root＠hilbert.suse.de 04 Jan '16

04 Jan '16

Hello community, here is the log from the commit of package zopfli for openSUSE:Factory checked in at 2016-01-04 09:22:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zopfli (Old) and /work/SRC/openSUSE:Factory/.zopfli.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zopfli" Changes: -------- --- /work/SRC/openSUSE:Factory/zopfli/zopfli.changes 2015-04-21 10:51:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.zopfli.new/zopfli.changes 2016-01-04 09:22:29.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Jan 3 14:09:42 UTC 2016 - p.drouand(a)gmail.com + +- Update to version 1.0.1 + * No changelog available + +------------------------------------------------------------------- Old: ---- zopfli-1.0.0.tar.gz New: ---- zopfli-1.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zopfli.spec ++++++ --- /var/tmp/diff_new_pack.W9aHgy/_old 2016-01-04 09:22:29.000000000 +0100 +++ /var/tmp/diff_new_pack.W9aHgy/_new 2016-01-04 09:22:29.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package zopfli # -# 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,7 +17,7 @@ Name: zopfli -Version: 1.0.0 +Version: 1.0.1 Release: 0 Summary: Zlib compression library License: Apache-2.0 ++++++ zopfli-1.0.0.tar.gz -> zopfli-1.0.1.tar.gz ++++++ ++++ 10809 lines of diff (skipped)

1 0

commit qmmp for openSUSE:Factory
by root＠hilbert.suse.de 04 Jan '16

04 Jan '16

Hello community, here is the log from the commit of package qmmp for openSUSE:Factory checked in at 2016-01-04 09:21:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qmmp (Old) and /work/SRC/openSUSE:Factory/.qmmp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qmmp" Changes: -------- --- /work/SRC/openSUSE:Factory/qmmp/qmmp.changes 2015-12-23 08:50:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qmmp.new/qmmp.changes 2016-01-04 09:22:25.000000000 +0100 @@ -1,0 +2,13 @@ +Sat Jan 2 15:54:25 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to 1.0.5: + * Add GNOME Shell support. + * Fix url dialog size. + * Fix memory leak in the qsui plugin. + * Fix LADSPA plugin. + * Fix CPU usage in the vorbis plugins. + * Fix UTF-8 support in the scrobbler plugin. + * Fix Greek translation. + * Update French translation. + +------------------------------------------------------------------- Old: ---- qmmp-1.0.4.tar.bz2 New: ---- qmmp-1.0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qmmp.spec ++++++ --- /var/tmp/diff_new_pack.MlI6ZK/_old 2016-01-04 09:22:26.000000000 +0100 +++ /var/tmp/diff_new_pack.MlI6ZK/_new 2016-01-04 09:22:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package qmmp # -# 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 @@ -19,7 +19,7 @@ %define sover 1 %bcond_with restricted Name: qmmp -Version: 1.0.4 +Version: 1.0.5 Release: 0 Summary: Qt-based Multimedia Player License: GPL-2.0+ ++++++ qmmp-1.0.4.tar.bz2 -> qmmp-1.0.5.tar.bz2 ++++++ ++++ 3230 lines of diff (skipped)

1 0

commit python3-curtsies for openSUSE:Factory
by root＠hilbert.suse.de 04 Jan '16

04 Jan '16

Hello community, here is the log from the commit of package python3-curtsies for openSUSE:Factory checked in at 2016-01-04 09:22:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-curtsies (Old) and /work/SRC/openSUSE:Factory/.python3-curtsies.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-curtsies" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-curtsies/python3-curtsies.changes 2015-03-19 21:11:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-curtsies.new/python3-curtsies.changes 2016-01-04 09:22:28.000000000 +0100 @@ -1,0 +2,14 @@ +Sat Jan 2 19:11:51 UTC 2016 - arun(a)gmx.de + +- update to version 0.2.4: + * bump version for FmtStr equality fix + * fix #84 equality of FmtStr objects and nonstrings + * fix #76 + * added keys, fixes #78 + * Fix arguments given to split + * fix example broken in main example + * disable ctrl-y (dsusp) on OSX + * Allow empty reads when interrupted + * fix travis irc announce link + +------------------------------------------------------------------- Old: ---- curtsies-0.2.3.tar.gz New: ---- curtsies-0.2.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-curtsies.spec ++++++ --- /var/tmp/diff_new_pack.iQhJKI/_old 2016-01-04 09:22:28.000000000 +0100 +++ /var/tmp/diff_new_pack.iQhJKI/_new 2016-01-04 09:22:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3-curtsies # -# Copyright (c) 2015 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 @@ -17,7 +17,7 @@ Name: python3-curtsies -Version: 0.2.3 +Version: 0.2.4 Release: 0 Summary: Curses-like terminal wrapper, with colored strings! License: MIT @@ -25,11 +25,11 @@ Url: https://github.com/thomasballinger/curtsies Source: https://pypi.python.org/packages/source/c/curtsies/curtsies-%{version}.tar.… BuildRequires: fdupes +BuildRequires: python3-blessings BuildRequires: python3-devel BuildRequires: python3-mock BuildRequires: python3-pyte BuildRequires: python3-setuptools -BuildRequires: python3-blessings Requires: python3-blessings BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ curtsies-0.2.3.tar.gz -> curtsies-0.2.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/curtsies-0.2.3/PKG-INFO new/curtsies-0.2.4/PKG-INFO --- old/curtsies-0.2.3/PKG-INFO 2015-02-26 14:40:03.000000000 +0100 +++ new/curtsies-0.2.4/PKG-INFO 2015-12-16 14:48:21.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: curtsies -Version: 0.2.3 +Version: 0.2.4 Summary: Curses-like terminal wrapper, with colored strings! Home-page: https://github.com/thomasballinger/curtsies Author: Thomas Ballinger diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/curtsies-0.2.3/curtsies/__init__.py new/curtsies-0.2.4/curtsies/__init__.py --- old/curtsies-0.2.3/curtsies/__init__.py 2015-02-26 14:37:36.000000000 +0100 +++ new/curtsies-0.2.4/curtsies/__init__.py 2015-12-16 14:47:50.000000000 +0100 @@ -1,5 +1,5 @@ """Terminal-formatted strings""" -__version__='0.2.3' +__version__='0.2.4' from .window import FullscreenWindow, CursorAwareWindow from .input import Input diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/curtsies-0.2.3/curtsies/curtsieskeys.py new/curtsies-0.2.4/curtsies/curtsieskeys.py --- old/curtsies-0.2.3/curtsies/curtsieskeys.py 2015-02-26 14:35:09.000000000 +0100 +++ new/curtsies-0.2.4/curtsies/curtsieskeys.py 2015-12-16 14:47:31.000000000 +0100 @@ -67,14 +67,33 @@ (b'\x1b\x1b[D', u'<Esc+LEFT>'), (b'\x1b', u'<ESC>'), (b'\x1b[1~', u'<HOME>'), - (b'\x1b[2~', u'<PADENTER>'), #TODO untested - (b'\x1b[3~', u'<PADDELETE>'), #TODO check this name (b'\x1b[4~', u'<END>'), - (b'\x1b[5~', u'<PAGEUP>'), - (b'\x1b[6~', u'<PAGEDOWN>'), (b'\x1b\x1b[5~',u'<Esc+PAGEUP>'), (b'\x1b\x1b[6~',u'<Esc+PAGEDOWN>'), (b'\x1b[H', u'<HOME>'), # reported by amorozov in bpython #490 (b'\x1b[F', u'<END>'), # reported by amorozov in bpython #490 + + # see curtsies #78 - taken from https://github.com/jquast/blessed/blob/e9ad7b85dfcbbba49010ab8c13e3a5920d81… + + # not fixing for back compat. + # (b"\x1b[1~", u'<FIND>'), # find + + (b"\x1b[2~", u'<INSERT>'), # insert (0) + (b"\x1b[3~", u'<DELETE>'), # delete (.), "Execute" + + # not fixing for back compat. + # (b"\x1b[4~", u'<SELECT>'), # select + + (b"\x1b[5~", u'<PAGEUP>'), # pgup (9) + (b"\x1b[6~", u'<PAGEDOWN>'), # pgdown (3) + (b"\x1b[7~", u'<HOME>'), # home + (b"\x1b[8~", u'<END>'), # end + (b"\x1b[OA", u'<UP>'), # up (8) + (b"\x1b[OB", u'<DOWN>'), # down (2) + (b"\x1b[OC", u'<RIGHT>'), # right (6) + (b"\x1b[OD", u'<LEFT>'), # left (4) + (b"\x1b[OF", u'<END>'), # end (1) + (b"\x1b[OH", u'<HOME>'), # home (7) + ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/curtsies-0.2.3/curtsies/escseqparse.py new/curtsies-0.2.4/curtsies/escseqparse.py --- old/curtsies-0.2.3/curtsies/escseqparse.py 2015-02-18 01:02:23.000000000 +0100 +++ new/curtsies-0.2.4/curtsies/escseqparse.py 2015-12-16 14:47:31.000000000 +0100 @@ -29,7 +29,9 @@ stuff.append(front) if token: try: - stuff.append(token_type(token)) + tok = token_type(token) + if tok: + stuff.append(tok) except ValueError: raise ValueError("Can't parse escape sequence: %r %r %r %r" % (s, repr(front), token, repr(rest))) if not rest: @@ -66,7 +68,7 @@ del d['front'] del d['rest'] if 'numbers' in d and d['numbers'].split(';'): - d['numbers'] = [int(x) for x in d['numbers'].split()] + d['numbers'] = [int(x) for x in d['numbers'].split(';')] return m.groupdict()['front'], d, m.groupdict()['rest'] else: @@ -83,6 +85,10 @@ if value == RESET_ALL: return dict(dict((k, None) for k in STYLES), **{'fg':None, 'bg':None}) if value == RESET_FG: return {'fg':None} if value == RESET_BG: return {'bg':None} + + elif info['command'] == 'H': # fix for bpython #76 + return {} + raise ValueError("Can't parse escape seq %r" % info) if __name__ == '__main__': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/curtsies-0.2.3/curtsies/events.py new/curtsies-0.2.4/curtsies/events.py --- old/curtsies-0.2.3/curtsies/events.py 2015-02-18 01:02:23.000000000 +0100 +++ new/curtsies-0.2.4/curtsies/events.py 2015-12-16 14:47:31.000000000 +0100 @@ -46,11 +46,23 @@ CURSES_NAMES[b'\x1b[C'] = u'KEY_RIGHT' CURSES_NAMES[b'\x1b[D'] = u'KEY_LEFT' CURSES_NAMES[b'\x08'] = u'KEY_BACKSPACE' -CURSES_NAMES[b'\x1b[3~'] = u'KEY_DC' -CURSES_NAMES[b'\x1b[5~'] = u'KEY_PPAGE' -CURSES_NAMES[b'\x1b[6~'] = u'KEY_NPAGE' CURSES_NAMES[b'\x1b[Z'] = u'KEY_BTAB' -#TODO add home and end? and everything else + +# see curtsies #78 - taken from https://github.com/jquast/blessed/blob/e9ad7b85dfcbbba49010ab8c13e3a5920d81… +CURSES_NAMES[b'\x1b[1~'] = u'KEY_FIND' # find +CURSES_NAMES[b'\x1b[2~'] = u'KEY_IC' # insert (0) +CURSES_NAMES[b'\x1b[3~'] = u'KEY_DC' # delete (.), "Execute" +CURSES_NAMES[b'\x1b[4~'] = u'KEY_SELECT' # select +CURSES_NAMES[b'\x1b[5~'] = u'KEY_PPAGE' # pgup (9) +CURSES_NAMES[b'\x1b[6~'] = u'KEY_NPAGE' # pgdown (3) +CURSES_NAMES[b'\x1b[7~'] = u'KEY_HOME' # home +CURSES_NAMES[b'\x1b[8~'] = u'KEY_END' # end +CURSES_NAMES[b'\x1b[OA'] = u'KEY_UP' # up (8) +CURSES_NAMES[b'\x1b[OB'] = u'KEY_DOWN' # down (2) +CURSES_NAMES[b'\x1b[OC'] = u'KEY_RIGHT' # right (6) +CURSES_NAMES[b'\x1b[OD'] = u'KEY_LEFT' # left (4) +CURSES_NAMES[b'\x1b[OF'] = u'KEY_END' # end (1) +CURSES_NAMES[b'\x1b[OH'] = u'KEY_HOME' # home (7) KEYMAP_PREFIXES = set() for table in (CURSES_NAMES, CURTSIES_NAMES): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/curtsies-0.2.3/curtsies/formatstring.py new/curtsies-0.2.4/curtsies/formatstring.py --- old/curtsies-0.2.3/curtsies/formatstring.py 2015-02-23 20:25:03.000000000 +0100 +++ new/curtsies-0.2.4/curtsies/formatstring.py 2015-12-16 14:47:31.000000000 +0100 @@ -352,7 +352,9 @@ return '+'.join(repr(fs) for fs in self.basefmtstrs) def __eq__(self, other): - return str(self) == str(other) + if isinstance(other, (unicode, bytes, FmtStr)): + return str(self) == str(other) + return False # TODO corresponding hash method def __add__(self, other): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/curtsies-0.2.3/curtsies/input.py new/curtsies-0.2.4/curtsies/input.py --- old/curtsies-0.2.3/curtsies/input.py 2015-02-25 20:00:23.000000000 +0100 +++ new/curtsies-0.2.4/curtsies/input.py 2015-12-16 14:47:31.000000000 +0100 @@ -72,6 +72,13 @@ def __enter__(self): self.original_stty = termios.tcgetattr(self.in_stream) tty.setcbreak(self.in_stream, termios.TCSANOW) + + if sys.platform == 'darwin': + attrs = termios.tcgetattr(self.in_stream) + VDSUSP = termios.VSUSP + 1 + attrs[-1][VDSUSP] = 0 + termios.tcsetattr(self.in_stream, termios.TCSANOW, attrs) + if self.sigint_event: self.orig_sigint_handler = signal.getsignal(signal.SIGINT) signal.signal(signal.SIGINT, self.sigint_handler) @@ -103,10 +110,12 @@ for i in range(len(string))) def _wait_for_read_ready_or_timeout(self, timeout): - """Returns tuple of whether stdin has bytes to read and an event. + """Returns tuple of whether stdin is ready to read and an event. If an event is returned, that event is more pressing than reading - bytes on stdin to create a keyboard input event.""" + bytes on stdin to create a keyboard input event. + If stdin is ready, either there are bytes to read or a SIGTSTP + triggered by dsusp has been received""" remaining_timeout = timeout t0 = time.time() while True: @@ -184,7 +193,7 @@ if e is not None: return e - stdin_has_bytes, event = self._wait_for_read_ready_or_timeout(time_until_check) + stdin_ready_for_read, event = self._wait_for_read_ready_or_timeout(time_until_check) if event: return event if self.queued_scheduled_events and when < time.time(): # when should always be defined @@ -192,11 +201,15 @@ logger.warning('popping an event! %r %r', self.queued_scheduled_events[0], self.queued_scheduled_events[1:]) return self.queued_scheduled_events.pop(0)[1] - if not stdin_has_bytes: + if not stdin_ready_for_read: return None num_bytes = self._nonblocking_read() - assert num_bytes > 0, num_bytes + if num_bytes == 0: + # thought stdin was ready, but not bytes to read is triggered + # when SIGTSTP was send by dsusp + return None + if self.paste_threshold is not None and num_bytes > self.paste_threshold: paste = events.PasteEvent() while True: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/curtsies-0.2.3/curtsies/window.py new/curtsies-0.2.4/curtsies/window.py --- old/curtsies-0.2.3/curtsies/window.py 2015-02-25 22:58:31.000000000 +0100 +++ new/curtsies-0.2.4/curtsies/window.py 2015-12-16 14:47:31.000000000 +0100 @@ -1,6 +1,8 @@ # All windows write only unicode to the terminal - # that's what blessings does, so we match it. +from __future__ import unicode_literals + import locale import logging import re diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/curtsies-0.2.3/curtsies.egg-info/PKG-INFO new/curtsies-0.2.4/curtsies.egg-info/PKG-INFO --- old/curtsies-0.2.3/curtsies.egg-info/PKG-INFO 2015-02-26 14:40:02.000000000 +0100 +++ new/curtsies-0.2.4/curtsies.egg-info/PKG-INFO 2015-12-16 14:48:21.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: curtsies -Version: 0.2.3 +Version: 0.2.4 Summary: Curses-like terminal wrapper, with colored strings! Home-page: https://github.com/thomasballinger/curtsies Author: Thomas Ballinger diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/curtsies-0.2.3/curtsies.egg-info/requires.txt new/curtsies-0.2.4/curtsies.egg-info/requires.txt --- old/curtsies-0.2.3/curtsies.egg-info/requires.txt 2015-02-26 14:40:02.000000000 +0100 +++ new/curtsies-0.2.4/curtsies.egg-info/requires.txt 2015-12-16 14:48:21.000000000 +0100 @@ -1,2 +1,2 @@ blessings>=1.5 -wcwidth>=0.1.4 \ No newline at end of file +wcwidth>=0.1.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/curtsies-0.2.3/examples/quickstart.py new/curtsies-0.2.4/examples/quickstart.py --- old/curtsies-0.2.3/examples/quickstart.py 2015-02-18 01:02:23.000000000 +0100 +++ new/curtsies-0.2.4/examples/quickstart.py 2015-12-16 14:47:31.000000000 +0100 @@ -17,7 +17,7 @@ elif c == '<SPACE>': a = FSArray(window.height, window.width) else: - s = repr(c).decode() + s = repr(c) row = random.choice(range(window.height)) column = random.choice(range(window.width-len(s))) color = random.choice([red, green, on_blue, yellow])

1 0

commit librelp for openSUSE:Factory
by root＠hilbert.suse.de 04 Jan '16

04 Jan '16

Hello community, here is the log from the commit of package librelp for openSUSE:Factory checked in at 2016-01-04 09:21:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/librelp (Old) and /work/SRC/openSUSE:Factory/.librelp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "librelp" Changes: -------- --- /work/SRC/openSUSE:Factory/librelp/librelp.changes 2015-09-09 20:21:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.librelp.new/librelp.changes 2016-01-04 09:22:24.000000000 +0100 @@ -1,0 +2,8 @@ +Sat Jan 2 15:17:45 UTC 2016 - astieger(a)suse.com + +- librelp 1.2.9: + * Ignoring return status when handling syslog frames now. + Otherwise valid messages in the frame buffer will get lost when + the remote connection is closed during meantime. + +------------------------------------------------------------------- Old: ---- librelp-1.2.8.tar.gz New: ---- librelp-1.2.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librelp.spec ++++++ --- /var/tmp/diff_new_pack.Tlpf26/_old 2016-01-04 09:22:25.000000000 +0100 +++ /var/tmp/diff_new_pack.Tlpf26/_new 2016-01-04 09:22:25.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package librelp # -# 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 @@ -18,7 +18,7 @@ %define library_name librelp0 Name: librelp -Version: 1.2.8 +Version: 1.2.9 Release: 0 Summary: A reliable logging library License: GPL-3.0+ ++++++ librelp-1.2.8.tar.gz -> librelp-1.2.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.8/ChangeLog new/librelp-1.2.9/ChangeLog --- old/librelp-1.2.8/ChangeLog 2015-09-04 12:25:06.000000000 +0200 +++ new/librelp-1.2.9/ChangeLog 2015-12-15 15:35:38.000000000 +0100 @@ -1,4 +1,12 @@ ---------------------------------------------------------------------- +Version 1.2.9 - 2015-12-15 +- bugfix: Ignoring return status when handling syslog frames now. + Otherwise valid messages in the frame buffer will get lost when the + remote connection is closed during meantime. +- build bugfix: GnuTLS header was required even if TLS was turned off + Thanks to Pedro Alvarez Piedehierro for the patch. +- bugfix: correct wrong assert() calls [debug mode only affected] +---------------------------------------------------------------------- Version 1.2.8 - 2014-09-07 - bugfix: segfault if KEEPALIVE is used Thanks to Tomas Heinrich for the patch. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.8/configure new/librelp-1.2.9/configure --- old/librelp-1.2.8/configure 2015-09-04 12:25:38.000000000 +0200 +++ new/librelp-1.2.9/configure 2015-12-15 15:35:50.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for librelp 1.2.8. +# Generated by GNU Autoconf 2.69 for librelp 1.2.9. # # Report bugs to <rgerhards(a)adiscon.com>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='librelp' PACKAGE_TARNAME='librelp' -PACKAGE_VERSION='1.2.8' -PACKAGE_STRING='librelp 1.2.8' +PACKAGE_VERSION='1.2.9' +PACKAGE_STRING='librelp 1.2.9' PACKAGE_BUGREPORT='rgerhards(a)adiscon.com' PACKAGE_URL='' @@ -1323,7 +1323,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures librelp 1.2.8 to adapt to many kinds of systems. +\`configure' configures librelp 1.2.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1393,7 +1393,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of librelp 1.2.8:";; + short | recursive ) echo "Configuration of librelp 1.2.9:";; esac cat <<\_ACEOF @@ -1508,7 +1508,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -librelp configure 1.2.8 +librelp configure 1.2.9 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2034,7 +2034,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by librelp $as_me 1.2.8, which was +It was created by librelp $as_me 1.2.9, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2897,7 +2897,7 @@ # Define the identity of the package. PACKAGE='librelp' - VERSION='1.2.8' + VERSION='1.2.9' cat >>confdefs.h <<_ACEOF @@ -3011,7 +3011,7 @@ # Define the identity of the package. PACKAGE='librelp' - VERSION='1.2.8' + VERSION='1.2.9' cat >>confdefs.h <<_ACEOF @@ -13342,7 +13342,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by librelp $as_me 1.2.8, which was +This file was extended by librelp $as_me 1.2.9, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13408,7 +13408,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -librelp config.status 1.2.8 +librelp config.status 1.2.9 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.8/configure.ac new/librelp-1.2.9/configure.ac --- old/librelp-1.2.8/configure.ac 2015-09-04 12:25:31.000000000 +0200 +++ new/librelp-1.2.9/configure.ac 2015-12-15 15:35:38.000000000 +0100 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([librelp], [1.2.8], [rgerhards(a)adiscon.com] +AC_INIT([librelp], [1.2.9], [rgerhards(a)adiscon.com] AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.8/src/relp.c new/librelp-1.2.9/src/relp.c --- old/librelp-1.2.8/src/relp.c 2015-04-27 09:23:57.000000000 +0200 +++ new/librelp-1.2.9/src/relp.c 2015-12-15 08:15:51.000000000 +0100 @@ -990,7 +990,12 @@ * at the top of the list! */ if(!strcmp((char*)pFrame->cmd, "syslog")) { - CHKRet(relpSCSyslog(pFrame, pSess)); + /* When processing Syslog frames, we ignore return code. + * Otherwise valid messages in the frame buffer will be + * discarded. And it's better to have duplicated messages + * instead of losing them. + */ + relpSCSyslog(pFrame, pSess); } else if(!strcmp((char*)pFrame->cmd, "rsp")) { CHKRet(relpSCRsp(pFrame, pSess)); } else if(!strcmp((char*)pFrame->cmd, "open")) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.8/src/relpsess.c new/librelp-1.2.9/src/relpsess.c --- old/librelp-1.2.8/src/relpsess.c 2015-04-27 09:27:16.000000000 +0200 +++ new/librelp-1.2.9/src/relpsess.c 2015-12-15 08:20:14.000000000 +0100 @@ -299,7 +299,9 @@ ENTER_RELPFUNC; RELPOBJ_assert(pThis, Sess); - CHKRet(relpSendqSend(pThis->pSendq, pThis->pTcp)); + if (pThis->sessState != eRelpSessState_BROKEN) { + CHKRet(relpSendqSend(pThis->pSendq, pThis->pTcp)); + } finalize_it: LEAVE_RELPFUNC; @@ -536,8 +538,17 @@ "fd %d, timeout %d.%d\n", sock, (int) tvSelect.tv_sec, (int) tvSelect.tv_usec); nfds = select(sock+1, (fd_set *) &readfds, NULL, NULL, &tvSelect); - pThis->pEngine->dbgprint("relpSessWaitRsp select returns, " - "nfds %d, errno %d\n", nfds, errno); + if(nfds == -1) { + if(errno == EINTR) { + pThis->pEngine->dbgprint("relpSessWaitRsp select interrupted, continue\n"); + } else { + pThis->pEngine->dbgprint("relpSessWaitRsp select returned error %d\n", errno); + ABORT_FINALIZE(RELP_RET_SESSION_BROKEN); + } + } + else + pThis->pEngine->dbgprint("relpSessWaitRsp select returns, " + "nfds %d, errno %d\n", nfds, errno); if(relpEngineShouldStop(pThis->pEngine)) break; /* we don't check if we had a timeout-we give it one last chance*/ @@ -553,7 +564,9 @@ finalize_it: pThis->pEngine->dbgprint("relpSessWaitState returns %d\n", iRet); - if(iRet == RELP_RET_TIMED_OUT || relpEngineShouldStop(pThis->pEngine)) { + if( iRet == RELP_RET_TIMED_OUT || + iRet == RELP_RET_SESSION_BROKEN || + relpEngineShouldStop(pThis->pEngine)) { /* the session is broken! */ pThis->sessState = eRelpSessState_BROKEN; } @@ -994,7 +1007,7 @@ relpSessSetGnuTLSPriString(relpSess_t *pThis, char *pristr) { ENTER_RELPFUNC; - RELPOBJ_assert(pThis, Tcp); + RELPOBJ_assert(pThis, Sess); free(pThis->pristring); if(pristr == NULL) { @@ -1011,7 +1024,7 @@ relpSessSetCACert(relpSess_t *pThis, char *cert) { ENTER_RELPFUNC; - RELPOBJ_assert(pThis, Tcp); + RELPOBJ_assert(pThis, Sess); free(pThis->caCertFile); if(cert == NULL) { @@ -1028,7 +1041,7 @@ relpSessSetOwnCert(relpSess_t *pThis, char *cert) { ENTER_RELPFUNC; - RELPOBJ_assert(pThis, Tcp); + RELPOBJ_assert(pThis, Sess); free(pThis->ownCertFile); if(cert == NULL) { @@ -1045,7 +1058,7 @@ relpSessSetPrivKey(relpSess_t *pThis, char *cert) { ENTER_RELPFUNC; - RELPOBJ_assert(pThis, Tcp); + RELPOBJ_assert(pThis, Sess); free(pThis->privKeyFile); if(cert == NULL) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.8/src/tcp.c new/librelp-1.2.9/src/tcp.c --- old/librelp-1.2.8/src/tcp.c 2015-04-27 09:23:57.000000000 +0200 +++ new/librelp-1.2.9/src/tcp.c 2015-12-15 08:20:14.000000000 +0100 @@ -316,17 +316,16 @@ pEngine = pThis->pEngine; assert(pAddr != NULL); - error = getnameinfo(pAddr, SALEN(pAddr), (char*)szIP, sizeof(szIP), NULL, 0, NI_NUMERICHOST); - - if(error) { - pThis->pEngine->dbgprint("Malformed from address %s\n", gai_strerror(error)); + error = getnameinfo(pAddr, SALEN(pAddr), (char*)szIP, sizeof(szIP), NULL, 0, NI_NUMERICHOST); + if(error) { + pThis->pEngine->dbgprint("Malformed from address %s\n", gai_strerror(error)); strcpy((char*)szHname, "???"); strcpy((char*)szIP, "???"); ABORT_FINALIZE(RELP_RET_INVALID_HNAME); } if(pEngine->bEnableDns) { - error = getnameinfo(pAddr, SALEN(pAddr), (char*)szHname, NI_MAXHOST, NULL, 0, NI_NAMEREQD); + error = getnameinfo(pAddr, SALEN(pAddr), (char*)szHname, sizeof(szHname), NULL, 0, NI_NAMEREQD); if(error == 0) { memset (&hints, 0, sizeof (struct addrinfo)); hints.ai_flags = AI_NUMERICHOST; @@ -685,7 +684,7 @@ RELP_RET_WRN_NO_KEEPALIVE); } - pThis->pEngine->dbgprint("KEEPALIVE enabled for socket %d\n", sock); + // pThis->pEngine->dbgprint("KEEPALIVE enabled for socket %d\n", sock); done: return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.8/src/tcp.h new/librelp-1.2.9/src/tcp.h --- old/librelp-1.2.8/src/tcp.h 2015-04-27 09:23:57.000000000 +0200 +++ new/librelp-1.2.9/src/tcp.h 2015-12-15 08:17:51.000000000 +0100 @@ -34,7 +34,9 @@ #define RELPTCP_H_INCLUDED #include <stdint.h> -#include <gnutls/gnutls.h> +#ifdef ENABLE_TLS +# include <gnutls/gnutls.h> +#endif #include "relp.h" typedef enum { relpTCP_RETRY_none = 0, @@ -102,16 +104,22 @@ int dhBits; /**< number of bits for Diffie-Hellman key */ char *pristring; /**< priority string for GnuTLS */ relpAuthMode_t authmode; +#ifdef ENABLE_TLS gnutls_anon_client_credentials_t anoncred; /**< client anon credentials */ gnutls_anon_server_credentials_t anoncredSrv; /**< server anon credentials */ +#endif tcpPermittedPeers_t permittedPeers; /* GnuTLS certificat support */ +#ifdef ENABLE_TLS gnutls_certificate_credentials_t xcred; /**< certificate credentials */ +#endif char *caCertFile; char *ownCertFile; char *privKeyFile; +#ifdef ENABLE_TLS gnutls_session_t session; gnutls_dh_params_t dh_params; /**< server DH parameters for anon mode */ +#endif relpTcpRtryState_t rtryOp; } relpTcp_t;

1 0

commit mate-themes for openSUSE:Factory
by root＠hilbert.suse.de 04 Jan '16

04 Jan '16

Hello community, here is the log from the commit of package mate-themes for openSUSE:Factory checked in at 2016-01-04 09:21:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-themes (Old) and /work/SRC/openSUSE:Factory/.mate-themes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mate-themes" Changes: -------- --- /work/SRC/openSUSE:Factory/mate-themes/mate-themes.changes 2015-12-06 07:43:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mate-themes.new/mate-themes.changes 2016-01-04 09:22:20.000000000 +0100 @@ -1,0 +2,32 @@ +Sat Jan 2 13:01:47 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to 1.12.2: + * Gtk3 BlackMate, GreenLaguna, Submarine themes: Fix padding + osd-toolbar volume button. + * Gtk-3.14/16 BlackMate, Submarine themes: Fix padding of + .app-notification .button:hover. + * Gtk3 Submarine themes: Re-work Caja styling. + * GTK3 BlackMate, GreenLaguna: Adjust notebook tabs. + * Gtk3 Submarine themes: Reduce hight of notebook tabs. + * Gtk3 Submarine themes: Adjust notebook tabs in Pluma text area. + * Gtk3 Submarine themes: Change border colour in GtkNotebook. + * Gtk3 Submarine themes: Fix padding for + GtkToggleButton.button:hover. + * Gtk3 BlackMate, GreenLaguna: Button size fix for gnome-mplayer. + * Gtk3 Submarine themes: Adjustments for some media players + + vitual-manager. + * Gtk-3.18 Menta themes: Improve previous GtkFileChooser pathbar + commit. + * Gtk3 Menta themes: Adjust Nemo toolbar again. + * Gtk-3.18 most themes: Workaround for broken first/last-child + logic with linked buttons in GtkFileChooser pathbar. + * Gtk3 Menta themes: Use a border-image for Nemo statusbar + buttons. + * Gtk3 Menta themes: Reduce vertical size of Nemo primary toolbar. + * Gtk-3.18 most themes: Workaround for broken first/last-child + logic with linked buttons in pathbar with Gtk-3.18. + * Gtk3: Menta themes: Fix mate-panel separator background. + * Gtk3: BlackMATE, GreenLaguna: Fix Nautilus desktop window + background transparency. + +------------------------------------------------------------------- Old: ---- mate-themes-gtk3.18-1.12.1.tar.xz New: ---- mate-themes-gtk3.18-1.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-themes.spec ++++++ --- /var/tmp/diff_new_pack.inXWtc/_old 2016-01-04 09:22:21.000000000 +0100 +++ /var/tmp/diff_new_pack.inXWtc/_new 2016-01-04 09:22:21.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mate-themes # -# 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 @@ -22,7 +22,7 @@ %define _gtk_ver 3.18 %define _version 1.12 Name: mate-themes -Version: 1.12.1 +Version: 1.12.2 Release: 0 Summary: Themes for the MATE desktop License: LGPL-2.1+ @@ -87,7 +87,7 @@ # Icon sets. %{_datadir}/icons/ContrastHigh/ %ghost %{_datadir}/icons/ContrastHigh/icon-theme.cache -# Pointer themes. +# Cursor themes. %dir %{_datadir}/icons/mate/ %{_datadir}/icons/mate/cursors/ ++++++ mate-themes-gtk3.18-1.12.1.tar.xz -> mate-themes-gtk3.18-1.12.2.tar.xz ++++++ ++++ 2706 lines of diff (skipped)

1 0

commit plasma5-workspace-wallpapers for openSUSE:Factory
by root＠hilbert.suse.de 04 Jan '16

04 Jan '16

Hello community, here is the log from the commit of package plasma5-workspace-wallpapers for openSUSE:Factory checked in at 2016-01-04 09:21:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-workspace-wallpapers (Old) and /work/SRC/openSUSE:Factory/.plasma5-workspace-wallpapers.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasma5-workspace-wallpapers" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-workspace-wallpapers/plasma5-workspace-wallpapers.changes 2015-11-24 22:27:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plasma5-workspace-wallpapers.new/plasma5-workspace-wallpapers.changes 2016-01-04 09:22:17.000000000 +0100 @@ -1,0 +2,29 @@ +Wed Dec 30 16:57:33 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Remove Autumn wallpaper, still present in kdebase4-wallpapers + +------------------------------------------------------------------- +Tue Dec 22 22:35:16 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.2: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.2.php + +------------------------------------------------------------------- +Tue Dec 15 17:50:02 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.1: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.1.php + +------------------------------------------------------------------- +Sat Dec 12 17:32:56 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.0: + * For more details please see: + https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork +- Move to cmake(...) BuildRequires where possible + +------------------------------------------------------------------- Old: ---- plasma-workspace-wallpapers-5.4.3.tar.xz New: ---- plasma-workspace-wallpapers-5.5.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-workspace-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.clJM62/_old 2016-01-04 09:22:20.000000000 +0100 +++ /var/tmp/diff_new_pack.clJM62/_new 2016-01-04 09:22:20.000000000 +0100 @@ -17,7 +17,7 @@ Name: plasma5-workspace-wallpapers -Version: 5.4.3 +Version: 5.5.2 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 0.0.12 @@ -44,6 +44,10 @@ %install %kf5_makeinstall -C build + #found conflict of kdebase4-wallpapers-15.08.3-1.1.noarch with plasma5-workspace-wallpapers-5.5.2-50.1.noarch: + #- /usr/share/wallpapers/Autumn/metadata.desktop + rm -rf %{buildroot}%{_kf5_sharedir}/wallpapers/Autumn + %files %defattr(-,root,root) %doc COPYING* ++++++ plasma-workspace-wallpapers-5.4.3.tar.xz -> plasma-workspace-wallpapers-5.5.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/plasma5-workspace-wallpapers/plasma-workspace-wallpapers-5.4.3.tar.xz /work/SRC/openSUSE:Factory/.plasma5-workspace-wallpapers.new/plasma-workspace-wallpapers-5.5.2.tar.xz differ: char 26, line 1

1 0

commit plasma5-sdk for openSUSE:Factory
by root＠hilbert.suse.de 04 Jan '16

04 Jan '16

Hello community, here is the log from the commit of package plasma5-sdk for openSUSE:Factory checked in at 2016-01-04 09:21:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-sdk (Old) and /work/SRC/openSUSE:Factory/.plasma5-sdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasma5-sdk" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-sdk/plasma5-sdk.changes 2015-11-24 22:27:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plasma5-sdk.new/plasma5-sdk.changes 2016-01-04 09:22:13.000000000 +0100 @@ -1,0 +2,31 @@ +Tue Dec 22 22:35:15 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.2: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.2.php + +------------------------------------------------------------------- +Tue Dec 15 17:50:00 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.1: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.1.php + +------------------------------------------------------------------- +Sat Dec 12 17:32:43 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.0: + * For more details please see: + https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork +- Move to cmake(...) BuildRequires where possible + +------------------------------------------------------------------- +Fri Dec 4 09:56:45 UTC 2015 - alarrosa(a)suse.com + +- Rebase desktop.diff in preparation of the 5.5.0 release +- Added bash requirement, as themeexplorer executes it directly + to run a script + +------------------------------------------------------------------- Old: ---- plasma-sdk-5.4.3.tar.xz New: ---- plasma-sdk-5.5.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-sdk.spec ++++++ --- /var/tmp/diff_new_pack.dG5wBf/_old 2016-01-04 09:22:14.000000000 +0100 +++ /var/tmp/diff_new_pack.dG5wBf/_new 2016-01-04 09:22:14.000000000 +0100 @@ -18,7 +18,7 @@ %bcond_without lang Name: plasma5-sdk -Version: 5.4.3 +Version: 5.5.2 Release: 0 Summary: Plasma SDK License: LGPL-2.0+ @@ -26,62 +26,47 @@ Url: https://projects.kde.org/projects/extragear/sdk/plasmate Source: plasma-sdk-%{version}.tar.xz Patch0: desktop.diff -BuildRequires: attica-qt5-devel BuildRequires: breeze5-icons -BuildRequires: extra-cmake-modules -BuildRequires: frameworkintegration-devel -BuildRequires: karchive-devel -BuildRequires: kauth-devel -BuildRequires: kbookmarks-devel -BuildRequires: kcodecs-devel -BuildRequires: kcompletion-devel -BuildRequires: kconfig-devel -BuildRequires: kconfigwidgets-devel -BuildRequires: kcoreaddons-devel -BuildRequires: kcrash-devel -BuildRequires: kdbusaddons-devel -BuildRequires: kdeclarative-devel > 5.7.0 +BuildRequires: extra-cmake-modules >= 1.8.0 BuildRequires: kf5-filesystem -BuildRequires: kglobalaccel-devel -BuildRequires: kguiaddons-devel -BuildRequires: ki18n-devel -BuildRequires: kiconthemes-devel -BuildRequires: kidletime-devel -BuildRequires: kio-devel -BuildRequires: kitemmodels-devel -BuildRequires: kitemviews-devel -BuildRequires: kjobwidgets-devel -BuildRequires: kjs-devel -BuildRequires: knewstuff-devel -BuildRequires: knotifications-devel -BuildRequires: kparts-devel -BuildRequires: kross-devel -BuildRequires: kservice-devel -BuildRequires: ktexteditor-devel -BuildRequires: ktextwidgets-devel -BuildRequires: kunitconversion-devel -BuildRequires: kwallet-framework-devel -BuildRequires: kwidgetsaddons-devel -BuildRequires: kwindowsystem-devel -BuildRequires: kxmlgui-devel -BuildRequires: plasma-framework-devel -BuildRequires: solid-devel -BuildRequires: sonnet-devel -BuildRequires: threadweaver-devel BuildRequires: xz -BuildRequires: pkgconfig(Qt5Core) >= 5.4.0 -BuildRequires: pkgconfig(Qt5PrintSupport) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Quick) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Svg) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.4.0 -BuildRequires: pkgconfig(Qt5WebKitWidgets) >= 5.4.0 -BuildRequires: pkgconfig(Qt5X11Extras) >= 5.4.0 +BuildRequires: cmake(KF5Archive) +BuildRequires: cmake(KF5Completion) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5ConfigWidgets) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5DBusAddons) +BuildRequires: cmake(KF5Declarative) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5IconThemes) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5NewStuff) +BuildRequires: cmake(KF5Parts) +BuildRequires: cmake(KF5Plasma) +BuildRequires: cmake(KF5PlasmaQuick) +BuildRequires: cmake(KF5Service) +BuildRequires: cmake(KF5TextEditor) +BuildRequires: cmake(KF5WidgetsAddons) +BuildRequires: cmake(KF5WindowSystem) +BuildRequires: cmake(KF5XmlGui) +BuildRequires: cmake(Qt5Core) >= 5.4.0 +BuildRequires: cmake(Qt5DBus) >= 5.4.0 +BuildRequires: cmake(Qt5Gui) >= 5.4.0 +BuildRequires: cmake(Qt5Qml) >= 5.4.0 +BuildRequires: cmake(Qt5Quick) >= 5.4.0 +BuildRequires: cmake(Qt5Svg) >= 5.4.0 +BuildRequires: cmake(Qt5Test) >= 5.4.0 +BuildRequires: cmake(Qt5WebKit) >= 5.4.0 +BuildRequires: cmake(Qt5WebKitWidgets) >= 5.4.0 +BuildRequires: cmake(Qt5Widgets) >= 5.4.0 +BuildRequires: cmake(Qt5Xml) >= 5.4.0 %if %{with lang} Recommends: %{name}-lang %endif Conflicts: plasmate Provides: plasmate5 = %{version} Obsoletes: plasmate5 <= %{version} +Requires: bash Requires: plasmaengineexplorer5 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -128,10 +113,6 @@ %find_lang cuttlefish_editorplugin %{name}.lang %endif -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - %if %{with lang} %files lang -f %{name}.lang %endif ++++++ desktop.diff ++++++ --- /var/tmp/diff_new_pack.dG5wBf/_old 2016-01-04 09:22:14.000000000 +0100 +++ /var/tmp/diff_new_pack.dG5wBf/_new 2016-01-04 09:22:14.000000000 +0100 @@ -1,12 +1,12 @@ diff --git a/themeexplorer/package/metadata.desktop b/themeexplorer/package/metadata.desktop -index bbb119d..fdd8674 100644 +index e238e1b..0cdcba3 100644 --- a/themeexplorer/package/metadata.desktop +++ b/themeexplorer/package/metadata.desktop -@@ -33,7 +33,7 @@ Name[uk]=Редактор тем Плазми - Name[x-test]=xxPlasma Theme Explorerxx +@@ -55,7 +55,7 @@ Name[x-test]=xxPlasma Theme Explorerxx + Name[zh_TW]=Plasma 主題探索器 Type=Application Icon=preferences-desktop-theme --Categories=Qt;KDE;Development +-Categories=Qt;KDE;Development; +Categories=Qt;KDE;Development;GUIDesigner; Exec=plasmathemeexplorer X-KDE-ParentApp= ++++++ plasma-sdk-5.4.3.tar.xz -> plasma-sdk-5.5.2.tar.xz ++++++ ++++ 20503 lines of diff (skipped)

1 0

commit plasma5-mediacenter for openSUSE:Factory
by root＠hilbert.suse.de 04 Jan '16

04 Jan '16

Hello community, here is the log from the commit of package plasma5-mediacenter for openSUSE:Factory checked in at 2016-01-04 09:21:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-mediacenter (Old) and /work/SRC/openSUSE:Factory/.plasma5-mediacenter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasma5-mediacenter" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-mediacenter/plasma5-mediacenter.changes 2015-11-24 22:27:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plasma5-mediacenter.new/plasma5-mediacenter.changes 2016-01-04 09:22:12.000000000 +0100 @@ -1,0 +2,24 @@ +Tue Dec 22 22:35:14 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.2: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.2.php + +------------------------------------------------------------------- +Tue Dec 15 17:49:59 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.1: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.1.php + +------------------------------------------------------------------- +Sat Dec 12 17:32:32 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.0: + * For more details please see: + https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork +- Move to cmake(...) BuildRequires where possible + +------------------------------------------------------------------- Old: ---- plasma-mediacenter-5.4.3.tar.xz New: ---- plasma-mediacenter-5.5.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-mediacenter.spec ++++++ --- /var/tmp/diff_new_pack.cCU2c8/_old 2016-01-04 09:22:13.000000000 +0100 +++ /var/tmp/diff_new_pack.cCU2c8/_new 2016-01-04 09:22:13.000000000 +0100 @@ -20,36 +20,34 @@ %define rname plasma-mediacenter Name: plasma5-mediacenter -Version: 5.4.3 +Version: 5.5.2 Release: 0 Summary: Media center workspace for plasma License: GPL-2.0+ Group: System/GUI/KDE Url: http://projects.kde.org/plasma-mediacenter Source0: %{rname}-%{version}.tar.xz -BuildRequires: baloo5-devel BuildRequires: breeze5-icons -BuildRequires: extra-cmake-modules -BuildRequires: kactivities5-devel -BuildRequires: kconfig-devel >= 5.5.0 -BuildRequires: kconfigwidgets-devel >= 5.5.0 -BuildRequires: kcoreaddons-devel >= 5.5.0 -BuildRequires: kdeclarative-devel >= 5.5.0 +BuildRequires: extra-cmake-modules >= 0.0.8 BuildRequires: kf5-filesystem -BuildRequires: kguiaddons-devel >= 5.5.0 -BuildRequires: ki18n-devel >= 5.5.0 -BuildRequires: kio-devel >= 5.5.0 -BuildRequires: kservice-devel >= 5.5.0 -BuildRequires: kwindowsystem-devel >= 5.5.0 -BuildRequires: phonon4qt5-devel -BuildRequires: plasma-framework-devel >= 5.5.0 BuildRequires: update-desktop-files -BuildRequires: pkgconfig(Qt5Core) >= 5.4.0 -BuildRequires: pkgconfig(Qt5DBus) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Quick) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Sql) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Xml) >= 5.4.0 +BuildRequires: cmake(KF5Activities) >= 5.5.0 +BuildRequires: cmake(KF5Baloo) >= 5.5.0 +BuildRequires: cmake(KF5Config) >= 5.5.0 +BuildRequires: cmake(KF5CoreAddons) >= 5.5.0 +BuildRequires: cmake(KF5Declarative) >= 5.5.0 +BuildRequires: cmake(KF5FileMetaData) >= 5.5.0 +BuildRequires: cmake(KF5GuiAddons) >= 5.5.0 +BuildRequires: cmake(KF5I18n) >= 5.5.0 +BuildRequires: cmake(KF5KIO) >= 5.5.0 +BuildRequires: cmake(KF5Plasma) >= 5.5.0 +BuildRequires: cmake(KF5PlasmaQuick) >= 5.5.0 +BuildRequires: cmake(KF5Service) >= 5.5.0 +BuildRequires: cmake(Qt5Core) >= 5.4.0 +BuildRequires: cmake(Qt5DBus) >= 5.4.0 +BuildRequires: cmake(Qt5Quick) >= 5.4.0 +BuildRequires: cmake(Qt5Test) >= 5.4.0 +BuildRequires: cmake(Qt5Xml) >= 5.4.0 BuildRequires: pkgconfig(taglib) Requires: libQt5Multimedia5 >= 5.4.0 Requires: plasma5-workspace >= %{version} ++++++ plasma-mediacenter-5.4.3.tar.xz -> plasma-mediacenter-5.5.2.tar.xz ++++++ ++++ 4634 lines of diff (skipped)

1 0

commit kwrited5 for openSUSE:Factory
by root＠hilbert.suse.de 04 Jan '16

04 Jan '16

Hello community, here is the log from the commit of package kwrited5 for openSUSE:Factory checked in at 2016-01-04 09:21:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwrited5 (Old) and /work/SRC/openSUSE:Factory/.kwrited5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kwrited5" Changes: -------- --- /work/SRC/openSUSE:Factory/kwrited5/kwrited5.changes 2015-11-24 22:27:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kwrited5.new/kwrited5.changes 2016-01-04 09:22:10.000000000 +0100 @@ -1,0 +2,24 @@ +Tue Dec 22 22:35:10 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.2: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.2.php + +------------------------------------------------------------------- +Tue Dec 15 17:49:55 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.1: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.1.php + +------------------------------------------------------------------- +Sat Dec 12 17:32:01 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.0: + * For more details please see: + https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork +- Move to cmake(...) BuildRequires where possible + +------------------------------------------------------------------- Old: ---- kwrited-5.4.3.tar.xz New: ---- kwrited-5.5.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwrited5.spec ++++++ --- /var/tmp/diff_new_pack.rNz7jY/_old 2016-01-04 09:22:10.000000000 +0100 +++ /var/tmp/diff_new_pack.rNz7jY/_new 2016-01-04 09:22:10.000000000 +0100 @@ -17,24 +17,22 @@ Name: kwrited5 -Version: 5.4.3 +Version: 5.5.2 Release: 0 Summary: Daemon listening for wall and write messages License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org Source: kwrited-%{version}.tar.xz -BuildRequires: extra-cmake-modules -BuildRequires: gcc-c++ -BuildRequires: kcoreaddons-devel -BuildRequires: kdbusaddons-devel +BuildRequires: extra-cmake-modules >= 0.0.11 BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel -BuildRequires: knotifications-devel -BuildRequires: kpty-devel BuildRequires: xz -BuildRequires: pkgconfig(Qt5Widgets) >= 5.4.0 -#BuildRequires: update-desktop-files +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5DBusAddons) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5Notifications) +BuildRequires: cmake(KF5Pty) +BuildRequires: cmake(Qt5Widgets) >= 5.4.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -50,10 +48,6 @@ %install %kf5_makeinstall -C build -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - %files %defattr(-,root,root) %doc COPYING ++++++ kwrited-5.4.3.tar.xz -> kwrited-5.5.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwrited-5.4.3/CMakeLists.txt new/kwrited-5.5.2/CMakeLists.txt --- old/kwrited-5.4.3/CMakeLists.txt 2015-11-05 13:40:48.000000000 +0100 +++ new/kwrited-5.5.2/CMakeLists.txt 2015-12-22 11:37:51.000000000 +0100 @@ -1,5 +1,5 @@ project(kwrited) -set(PROJECT_VERSION "5.4.3") +set(PROJECT_VERSION "5.5.2") cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) set(QT_MIN_VERSION "5.4.0") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwrited-5.4.3/kwrited-autostart.desktop new/kwrited-5.5.2/kwrited-autostart.desktop --- old/kwrited-5.4.3/kwrited-autostart.desktop 2015-11-05 13:40:48.000000000 +0100 +++ new/kwrited-5.5.2/kwrited-autostart.desktop 2015-12-22 11:37:51.000000000 +0100 @@ -91,6 +91,7 @@ Name[zh_TW]=KDE Write 伺服程式 Comment=Watch for messages from local users sent with write(1) or wall(1) Comment[af]=Kyk uit vir boodskappe vanaf plaaslike gebruikers wat met write(1) of wall(1) gestuur is +Comment[ast]=Mira los mensaxes d'usuarios llocales unviaos con write(1) o wall(1) Comment[be]=Назірае за паведамленнямі ад мясцовых карыстальнікаў, дасланымі праз write(1) ці wall(1) Comment[be@latin]=Adsočvaje paviedamleńnia ad miascovych karystańnikaŭ, dasyłanyja zahadami „write(1)” ci „wall(1)”. Comment[bg]=Наблюдение за съобщения от локални потребители, изпратени с write(1) или wall(1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwrited-5.4.3/kwrited.desktop new/kwrited-5.5.2/kwrited.desktop --- old/kwrited-5.4.3/kwrited.desktop 2015-11-05 13:40:48.000000000 +0100 +++ new/kwrited-5.5.2/kwrited.desktop 2015-12-22 11:37:51.000000000 +0100 @@ -63,6 +63,7 @@ Name[zh_TW]=Write 伺服程式 Comment=Watch for messages from local users sent with write(1) or wall(1) Comment[af]=Kyk uit vir boodskappe vanaf plaaslike gebruikers wat met write(1) of wall(1) gestuur is +Comment[ast]=Mira los mensaxes d'usuarios llocales unviaos con write(1) o wall(1) Comment[be]=Назірае за паведамленнямі ад мясцовых карыстальнікаў, дасланымі праз write(1) ці wall(1) Comment[be@latin]=Adsočvaje paviedamleńnia ad miascovych karystańnikaŭ, dasyłanyja zahadami „write(1)” ci „wall(1)”. Comment[bg]=Наблюдение за съобщения от локални потребители, изпратени с write(1) или wall(1)

1 0

commit khelpcenter5 for openSUSE:Factory
by root＠hilbert.suse.de 04 Jan '16

04 Jan '16

Hello community, here is the log from the commit of package khelpcenter5 for openSUSE:Factory checked in at 2016-01-04 09:21:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/khelpcenter5 (Old) and /work/SRC/openSUSE:Factory/.khelpcenter5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "khelpcenter5" Changes: -------- --- /work/SRC/openSUSE:Factory/khelpcenter5/khelpcenter5.changes 2015-11-24 22:26:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.khelpcenter5.new/khelpcenter5.changes 2016-01-04 09:22:08.000000000 +0100 @@ -1,0 +2,24 @@ +Tue Dec 22 22:35:05 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.2: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.2.php + +------------------------------------------------------------------- +Tue Dec 15 17:49:50 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.1: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.1.php + +------------------------------------------------------------------- +Sat Dec 12 17:31:24 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.0: + * For more details please see: + https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork +- Move to cmake(...) BuildRequires where possible + +------------------------------------------------------------------- Old: ---- khelpcenter-5.4.3.tar.xz New: ---- khelpcenter-5.5.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ khelpcenter5.spec ++++++ --- /var/tmp/diff_new_pack.YJc9uz/_old 2016-01-04 09:22:09.000000000 +0100 +++ /var/tmp/diff_new_pack.YJc9uz/_new 2016-01-04 09:22:09.000000000 +0100 @@ -18,21 +18,21 @@ %bcond_without lang Name: khelpcenter5 -BuildRequires: extra-cmake-modules -BuildRequires: kcmutils-devel -BuildRequires: kconfig-devel -BuildRequires: kcoreaddons-devel -BuildRequires: kdbusaddons-devel -BuildRequires: kdelibs4support-devel +BuildRequires: extra-cmake-modules >= 1.3.0 BuildRequires: kf5-filesystem -BuildRequires: khtml-devel -BuildRequires: ki18n-devel -BuildRequires: kinit-devel -BuildRequires: kservice-devel BuildRequires: update-desktop-files -BuildRequires: pkgconfig(Qt5DBus) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Xml) >= 5.4.0 +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5DBusAddons) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5Init) +BuildRequires: cmake(KF5KCMUtils) +BuildRequires: cmake(KF5KDELibs4Support) +BuildRequires: cmake(KF5KHtml) +BuildRequires: cmake(KF5Service) +BuildRequires: cmake(Qt5DBus) >= 5.4.0 +BuildRequires: cmake(Qt5Widgets) >= 5.4.0 +BuildRequires: cmake(Qt5Xml) >= 5.4.0 %if %{with lang} Recommends: %{name}-lang %endif @@ -41,7 +41,7 @@ Summary: KDE Documentation Application License: GPL-2.0+ Group: Productivity/Other -Version: 5.4.3 +Version: 5.5.2 Release: 0 Source: khelpcenter-%{version}.tar.xz # PATCH-FIX-OPENSUSE khelpcenter-use-susehelp.patch -- use susehelp wrapper instead of directly starting khelpcenter ++++++ khelpcenter-5.4.3.tar.xz -> khelpcenter-5.5.2.tar.xz ++++++ ++++ 4963 lines of diff (skipped)

1 0

commit kgamma5 for openSUSE:Factory
by root＠hilbert.suse.de 04 Jan '16

04 Jan '16

Hello community, here is the log from the commit of package kgamma5 for openSUSE:Factory checked in at 2016-01-04 09:21:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kgamma5 (Old) and /work/SRC/openSUSE:Factory/.kgamma5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kgamma5" Changes: -------- --- /work/SRC/openSUSE:Factory/kgamma5/kgamma5.changes 2015-11-24 22:26:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kgamma5.new/kgamma5.changes 2016-01-04 09:22:07.000000000 +0100 @@ -1,0 +2,24 @@ +Tue Dec 22 22:35:04 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.2: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.2.php + +------------------------------------------------------------------- +Tue Dec 15 17:49:49 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.1: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.1.php + +------------------------------------------------------------------- +Sat Dec 12 17:31:21 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.5.0: + * For more details please see: + https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork +- Move to cmake(...) BuildRequires where possible + +------------------------------------------------------------------- Old: ---- kgamma5-5.4.3.tar.xz New: ---- kgamma5-5.5.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kgamma5.spec ++++++ --- /var/tmp/diff_new_pack.YY5zP2/_old 2016-01-04 09:22:07.000000000 +0100 +++ /var/tmp/diff_new_pack.YY5zP2/_new 2016-01-04 09:22:07.000000000 +0100 @@ -18,22 +18,24 @@ %bcond_without lang Name: kgamma5 -Version: 5.4.3 +Version: 5.5.2 Release: 0 Summary: Display gamma configuration License: GPL-2.0+ Group: Productivity/Graphics/Other Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz -BuildRequires: extra-cmake-modules -BuildRequires: kdelibs4support-devel -BuildRequires: kdoctools-devel +BuildRequires: extra-cmake-modules >= 1.0.0 BuildRequires: kf5-filesystem BuildRequires: xz -BuildRequires: pkgconfig(Qt5Core) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Gui) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.4.0 -BuildRequires: pkgconfig(Qt5X11Extras) >= 5.4.0 +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5KDELibs4Support) +BuildRequires: cmake(Qt5Core) >= 5.4.0 +BuildRequires: cmake(Qt5Gui) >= 5.4.0 +BuildRequires: cmake(Qt5Widgets) >= 5.4.0 +BuildRequires: cmake(Qt5X11Extras) >= 5.4.0 +BuildRequires: pkgconfig(x11) %if %{with lang} Recommends: %{name}-lang %endif @@ -66,7 +68,7 @@ %{_kf5_sharedir}/kgamma/ %dir %{_kf5_htmldir} %dir %{_kf5_htmldir}/en -%doc %{_kf5_htmldir}/en/%{name}/ +%doc %{_kf5_htmldir}/en/*/ %if %{with lang} %files lang ++++++ kgamma5-5.4.3.tar.xz -> kgamma5-5.5.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/CMakeLists.txt new/kgamma5-5.5.2/CMakeLists.txt --- old/kgamma5-5.4.3/CMakeLists.txt 2015-11-05 13:34:14.000000000 +0100 +++ new/kgamma5-5.5.2/CMakeLists.txt 2015-12-22 11:29:43.000000000 +0100 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8.9) project(kgamma) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) -set(PROJECT_VERSION "5.4.3") +set(PROJECT_VERSION "5.5.2") set(QT_MIN_VERSION "5.4.0") find_package(ECM 1.0.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/doc/en/index.docbook new/kgamma5-5.5.2/doc/en/index.docbook --- old/kgamma5-5.4.3/doc/en/index.docbook 2015-11-05 13:33:59.000000000 +0100 +++ new/kgamma5-5.5.2/doc/en/index.docbook 2015-12-22 11:29:28.000000000 +0100 @@ -20,8 +20,8 @@  </authorgroup> -<date>2013-12-05</date> -<releaseinfo>&kde; 4.12</releaseinfo> +<date>2015-07-31</date> +<releaseinfo>Plasma 5.4</releaseinfo> <keywordset> <keyword>KDE</keyword> @@ -53,8 +53,8 @@ startup. You need root access to use this option. Use this if you want to correct the gamma settings for all users and graphical environments on this machine.</para> -<para>To store the gamma settings to your personal &kde; configuration, do not -enable that option. The user settings will be restored at next &kde; startup and +<para>To store the gamma settings to your personal &plasma; configuration, do not +enable that option. The user settings will be restored at next &plasma; startup and replace temporary the system gamma settings. The system settings are not removed by that and will be restored at next &X-Server; startup.</para> <para>On multi head systems, select the screen you want to alter with the combo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/kcmkgamma/kgamma.desktop new/kgamma5-5.5.2/kcmkgamma/kgamma.desktop --- old/kgamma5-5.4.3/kcmkgamma/kgamma.desktop 2015-11-05 13:33:59.000000000 +0100 +++ new/kgamma5-5.5.2/kcmkgamma/kgamma.desktop 2015-12-22 11:29:28.000000000 +0100 @@ -13,7 +13,7 @@ Comment[el]=Ένα εργαλείο βαθμονόμησης της οθόνης Comment[en_GB]=A monitor calibration tool Comment[eo]=Ekrana kalibrilo -Comment[es]=Una herramienta de calibración de monitores +Comment[es]=Una herramienta de calibración del monitor Comment[et]=Monitori kalibreerija Comment[eu]=Monitoreak kalibratzeko tresna Comment[fa]=ابزار درجه‌بندی نمایشگر @@ -40,7 +40,7 @@ Comment[nb]=Et verktøy for å kalibrere skjermen Comment[nds]=En Afstimmwarktüüch för Monitoren Comment[ne]=मोनिटर क्यालिब्रेसन उपकरण -Comment[nl]=Gereedschap om de kleurweergave goed in te stellen +Comment[nl]=Een hulpmiddel voor het kalibreren van de monitor Comment[nn]=Eit verktøy for å kalibrera skjermen Comment[pa]=ਇੱਕ ਮਾਨੀਟਰ ਕੈਲੇਬਰੇਸ਼ਨ ਟੂਲ Comment[pl]=Narzędzie do kalibracji monitora @@ -64,7 +64,7 @@ Comment[uk]=Засіб для калібрування монітора Comment[vi]=Công cụ căn chỉnh màn hình Comment[x-test]=xxA monitor calibration toolxx -Comment[zh_CN]=屏幕矫正工具 +Comment[zh_CN]=显示器校准工具 Comment[zh_HK]=顯示器調校工具 Comment[zh_TW]=監視器校準工具 @@ -123,7 +123,7 @@ Name[ru]=Цветовая коррекция Name[se]=Gamma Name[si]=ගැමා -Name[sk]=Gama +Name[sk]=Gamma Name[sl]=Gama Name[sr]=Гама Name[sr@ijekavian]=Гама @@ -149,6 +149,7 @@ Icon=preferences-desktop-display-color.png X-KDE-Keywords=KGamma, kgamma, Gamma, gamma X-KDE-Keywords[ar]=جاما,KGamma, kgamma, Gamma, gamma +X-KDE-Keywords[ast]=KGamma, kgamma, Gamma, gamma X-KDE-Keywords[bg]=калибриране, гама, кгама, KGamma, kgamma, Gamma, gamma X-KDE-Keywords[bs]=KGamma, kgamma, Gamma, gamma,gama X-KDE-Keywords[ca]=KGamma, kgamma, Gamma, gamma @@ -193,7 +194,7 @@ X-KDE-Keywords[tr]=KGamma, kgamma, Kontrast derecesi, kontrast ayarı, parlaklık X-KDE-Keywords[uk]=KGamma,kgamma,Gamma,gamma,гама,рівень,контрастність,рівень контрастності X-KDE-Keywords[x-test]=xxKGammaxx,xx kgammaxx,xx Gammaxx,xx gammaxx -X-KDE-Keywords[zh_CN]=KGamma, kgamma, Gamma, gamma,伽玛 +X-KDE-Keywords[zh_CN]=KGamma, kgamma, Gamma, gamma,伽马,伽玛 X-KDE-Keywords[zh_TW]=KGamma, kgamma, Gamma, gamma Type=Service X-KDE-ServiceTypes=KCModule,KCModuleInit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/ar/kcmkgamma.po new/kgamma5-5.5.2/po/ar/kcmkgamma.po --- old/kgamma5-5.4.3/po/ar/kcmkgamma.po 2015-11-05 13:33:59.000000000 +0100 +++ new/kgamma5-5.5.2/po/ar/kcmkgamma.po 2015-12-22 11:29:29.000000000 +0100 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: kcmkgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2008-12-17 12:02+0400\n" "Last-Translator: zayed <zayed.alsaidi(a)gmail.com>\n" "Language-Team: Arabic <linuxac-kde-arabic-team(a)googlegroups.com>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/ast/kcmkgamma.po new/kgamma5-5.5.2/po/ast/kcmkgamma.po --- old/kgamma5-5.4.3/po/ast/kcmkgamma.po 2015-11-05 13:33:59.000000000 +0100 +++ new/kgamma5-5.5.2/po/ast/kcmkgamma.po 2015-12-22 11:29:29.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2015-07-31 13:49+0100\n" "Last-Translator: enolp <enolp(a)softastur.org>\n" "Language-Team: Asturian <alminsitradores(a)softastur.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/be/kcmkgamma.po new/kgamma5-5.5.2/po/be/kcmkgamma.po --- old/kgamma5-5.4.3/po/be/kcmkgamma.po 2015-11-05 13:33:59.000000000 +0100 +++ new/kgamma5-5.5.2/po/be/kcmkgamma.po 2015-12-22 11:29:29.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2007-06-22 20:54+0300\n" "Last-Translator: Darafei Praliaskouski <komzpa(a)licei2.com>\n" "Language-Team: Belarusian <i18n(a)mova.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/bg/kcmkgamma.po new/kgamma5-5.5.2/po/bg/kcmkgamma.po --- old/kgamma5-5.4.3/po/bg/kcmkgamma.po 2015-11-05 13:34:00.000000000 +0100 +++ new/kgamma5-5.5.2/po/bg/kcmkgamma.po 2015-12-22 11:29:30.000000000 +0100 @@ -2,14 +2,14 @@ # Bulgarian translation of KDE. # This file is licensed under the GPL. # -# $Id: kcmkgamma.po 1434079 2015-08-07 12:22:12Z scripty $ +# $Id: kcmkgamma.po 1444734 2015-11-19 23:22:28Z ltoscano $ # # Zlatko Popov <zlatkopopov(a)fsa-bg.org>, 2006, 2007. msgid "" msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2007-07-23 09:00+0000\n" "Last-Translator: Zlatko Popov <zlatkopopov(a)fsa-bg.org>\n" "Language-Team: Bulgarian <dict(a)linux.zonebg.com>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/br/kcmkgamma.po new/kgamma5-5.5.2/po/br/kcmkgamma.po --- old/kgamma5-5.4.3/po/br/kcmkgamma.po 2015-11-05 13:34:00.000000000 +0100 +++ new/kgamma5-5.5.2/po/br/kcmkgamma.po 2015-12-22 11:29:30.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: kdegraphics/kgamma.pot\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2004-09-20 15:44+0200\n" "Last-Translator: Thierry Vignaud <tvignaud(a)mandriva.com>\n" "Language-Team: br <LL(a)li.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/bs/kcmkgamma.po new/kgamma5-5.5.2/po/bs/kcmkgamma.po --- old/kgamma5-5.4.3/po/bs/kcmkgamma.po 2015-11-05 13:34:00.000000000 +0100 +++ new/kgamma5-5.5.2/po/bs/kcmkgamma.po 2015-12-22 11:29:30.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdegraphics\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2012-09-03 13:51+0000\n" "Last-Translator: Samir Ribić <Unknown>\n" "Language-Team: Bosnian <bs(a)li.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/ca/kcmkgamma.po new/kgamma5-5.5.2/po/ca/kcmkgamma.po --- old/kgamma5-5.4.3/po/ca/kcmkgamma.po 2015-11-05 13:34:00.000000000 +0100 +++ new/kgamma5-5.5.2/po/ca/kcmkgamma.po 2015-12-22 11:29:30.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kcmkgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2015-06-07 18:09+0200\n" "Last-Translator: Josep Ma. Ferrer <txemaq(a)gmail.com>\n" "Language-Team: Catalan <kde-i18n-ca(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/ca(a)valencia/kcmkgamma.po new/kgamma5-5.5.2/po/ca(a)valencia/kcmkgamma.po --- old/kgamma5-5.4.3/po/ca(a)valencia/kcmkgamma.po 2015-11-05 13:34:00.000000000 +0100 +++ new/kgamma5-5.5.2/po/ca(a)valencia/kcmkgamma.po 2015-12-22 11:29:30.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kcmkgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2015-06-07 18:09+0200\n" "Last-Translator: Josep Ma. Ferrer <txemaq(a)gmail.com>\n" "Language-Team: Catalan <kde-i18n-ca(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/cs/kcmkgamma.po new/kgamma5-5.5.2/po/cs/kcmkgamma.po --- old/kgamma5-5.4.3/po/cs/kcmkgamma.po 2015-11-05 13:34:00.000000000 +0100 +++ new/kgamma5-5.5.2/po/cs/kcmkgamma.po 2015-12-22 11:29:30.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2013-02-06 11:25+0100\n" "Last-Translator: Tomáš Chvátal <tomas.chvatal(a)gmail.com>\n" "Language-Team: Czech <kde-i18n-doc(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/cy/kcmkgamma.po new/kgamma5-5.5.2/po/cy/kcmkgamma.po --- old/kgamma5-5.4.3/po/cy/kcmkgamma.po 2015-11-05 13:34:00.000000000 +0100 +++ new/kgamma5-5.5.2/po/cy/kcmkgamma.po 2015-12-22 11:29:30.000000000 +0100 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: ../cy/messages//kdegraphics/kgamma.po\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2004-09-20 15:44+0200\n" "Last-Translator: Thierry Vignaud <tvignaud(a)mandrakesoft.com>\n" "Language-Team: cy <LL(a)li.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/da/kcmkgamma.po new/kgamma5-5.5.2/po/da/kcmkgamma.po --- old/kgamma5-5.4.3/po/da/kcmkgamma.po 2015-11-05 13:34:00.000000000 +0100 +++ new/kgamma5-5.5.2/po/da/kcmkgamma.po 2015-12-22 11:29:31.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2008-01-15 22:45+0100\n" "Last-Translator: Keld Simonsen <keld(a)dkuug.dk>\n" "Language-Team: dansk <dansk(a)dansk-gruppen.dk>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/de/kcmkgamma.po new/kgamma5-5.5.2/po/de/kcmkgamma.po --- old/kgamma5-5.4.3/po/de/kcmkgamma.po 2015-11-05 13:34:01.000000000 +0100 +++ new/kgamma5-5.5.2/po/de/kcmkgamma.po 2015-12-22 11:29:31.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kcmkgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2012-05-11 11:33+0200\n" "Last-Translator: Frederik Schwarzer <schwarzer(a)kde.org>\n" "Language-Team: German <kde-i18n-de(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/el/kcmkgamma.po new/kgamma5-5.5.2/po/el/kcmkgamma.po --- old/kgamma5-5.4.3/po/el/kcmkgamma.po 2015-11-05 13:34:01.000000000 +0100 +++ new/kgamma5-5.5.2/po/el/kcmkgamma.po 2015-12-22 11:29:31.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2007-03-08 22:52+0200\n" "Last-Translator: Spiros Georgaras <sng(a)hellug.gr>\n" "Language-Team: Greek <i18ngr(a)lists.hellug.gr>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/en_GB/kcmkgamma.po new/kgamma5-5.5.2/po/en_GB/kcmkgamma.po --- old/kgamma5-5.4.3/po/en_GB/kcmkgamma.po 2015-11-05 13:34:01.000000000 +0100 +++ new/kgamma5-5.5.2/po/en_GB/kcmkgamma.po 2015-12-22 11:29:31.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2008-04-13 10:20+0100\n" "Last-Translator: Malcolm Hunter <malcolm.hunter(a)gmx.co.uk>\n" "Language-Team: British English <kde-en-gb(a)kde.me.uk>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/eo/kcmkgamma.po new/kgamma5-5.5.2/po/eo/kcmkgamma.po --- old/kgamma5-5.4.3/po/eo/kcmkgamma.po 2015-11-05 13:34:01.000000000 +0100 +++ new/kgamma5-5.5.2/po/eo/kcmkgamma.po 2015-12-22 11:29:31.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2007-11-30 20:35+0100\n" "Last-Translator: Pierre-Marie Pédrot <pedrotpmx(a)wanadoo.fr>\n" "Language-Team: esperanto <kde-i18n-eo(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/es/kcmkgamma.po new/kgamma5-5.5.2/po/es/kcmkgamma.po --- old/kgamma5-5.4.3/po/es/kcmkgamma.po 2015-11-05 13:34:01.000000000 +0100 +++ new/kgamma5-5.5.2/po/es/kcmkgamma.po 2015-12-22 11:29:31.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2013-03-17 14:08+0100\n" "Last-Translator: Eloy Cuadra <ecuadra(a)eloihr.net>\n" "Language-Team: Spanish <kde-l10n-es(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/et/kcmkgamma.po new/kgamma5-5.5.2/po/et/kcmkgamma.po --- old/kgamma5-5.4.3/po/et/kcmkgamma.po 2015-11-05 13:34:01.000000000 +0100 +++ new/kgamma5-5.5.2/po/et/kcmkgamma.po 2015-12-22 11:29:31.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2007-10-10 20:39+0300\n" "Last-Translator: Marek Laane <bald(a)starman.ee>\n" "Language-Team: Estonian <kde-et(a)linux.ee>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/eu/kcmkgamma.po new/kgamma5-5.5.2/po/eu/kcmkgamma.po --- old/kgamma5-5.4.3/po/eu/kcmkgamma.po 2015-11-05 13:34:01.000000000 +0100 +++ new/kgamma5-5.5.2/po/eu/kcmkgamma.po 2015-12-22 11:29:31.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: kcmkgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2009-05-12 17:58+0200\n" "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo(a)euskalgnu.org>\n" "Language-Team: Basque <itzulpena(a)euskalgnu.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/fa/kcmkgamma.po new/kgamma5-5.5.2/po/fa/kcmkgamma.po --- old/kgamma5-5.4.3/po/fa/kcmkgamma.po 2015-11-05 13:34:01.000000000 +0100 +++ new/kgamma5-5.5.2/po/fa/kcmkgamma.po 2015-12-22 11:29:31.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2007-06-24 11:42+0330\n" "Last-Translator: Nazanin Kazemi <kazemi(a)itland.ir>\n" "Language-Team: Persian <kde-i18n-fa(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/fi/kcmkgamma.po new/kgamma5-5.5.2/po/fi/kcmkgamma.po --- old/kgamma5-5.4.3/po/fi/kcmkgamma.po 2015-11-05 13:34:01.000000000 +0100 +++ new/kgamma5-5.5.2/po/fi/kcmkgamma.po 2015-12-22 11:29:31.000000000 +0100 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: kcmkgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2015-08-07 00:10+0200\n" "Last-Translator: Lasse Liehu <lasse.liehu(a)gmail.com>\n" "Language-Team: Finnish <kde-i18n-doc(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/fr/kcmkgamma.po new/kgamma5-5.5.2/po/fr/kcmkgamma.po --- old/kgamma5-5.4.3/po/fr/kcmkgamma.po 2015-11-05 13:34:01.000000000 +0100 +++ new/kgamma5-5.5.2/po/fr/kcmkgamma.po 2015-12-22 11:29:31.000000000 +0100 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2013-06-26 11:17+0200\n" "Last-Translator: xavier <xavier.besnard(a)neuf.fr>\n" "Language-Team: French <kde-i18n-doc(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/fy/kcmkgamma.po new/kgamma5-5.5.2/po/fy/kcmkgamma.po --- old/kgamma5-5.4.3/po/fy/kcmkgamma.po 2015-11-05 13:34:01.000000000 +0100 +++ new/kgamma5-5.5.2/po/fy/kcmkgamma.po 2015-12-22 11:29:31.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2004-04-15 01:26+0200\n" "Last-Translator: Rinse de Vries <rinse(a)kde.nl>\n" "Language-Team: Nederlands <kde-i18n-nl(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/ga/kcmkgamma.po new/kgamma5-5.5.2/po/ga/kcmkgamma.po --- old/kgamma5-5.4.3/po/ga/kcmkgamma.po 2015-11-05 13:34:01.000000000 +0100 +++ new/kgamma5-5.5.2/po/ga/kcmkgamma.po 2015-12-22 11:29:32.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kdegraphics/kgamma.po\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2004-12-03 14:52-0500\n" "Last-Translator: Kevin Scannell <kscanne(a)gmail.com>\n" "Language-Team: Irish <gaeilge-gnulinux(a)lists.sourceforge.net>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/gl/kcmkgamma.po new/kgamma5-5.5.2/po/gl/kcmkgamma.po --- old/kgamma5-5.4.3/po/gl/kcmkgamma.po 2015-11-05 13:34:01.000000000 +0100 +++ new/kgamma5-5.5.2/po/gl/kcmkgamma.po 2015-12-22 11:29:32.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2009-11-29 20:35+0100\n" "Last-Translator: Miguel Branco <mgl.branco(a)gmail.com>\n" "Language-Team: Galician <proxecto(a)trasno.net>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/he/kcmkgamma.po new/kgamma5-5.5.2/po/he/kcmkgamma.po --- old/kgamma5-5.4.3/po/he/kcmkgamma.po 2015-11-05 13:34:02.000000000 +0100 +++ new/kgamma5-5.5.2/po/he/kcmkgamma.po 2015-12-22 11:29:32.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2005-10-28 22:59+0200\n" "Last-Translator: Diego Iastrubni <elcuco(a)kde.org>\n" "Language-Team: Hebrew <kde-l10n-he(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/hi/kcmkgamma.po new/kgamma5-5.5.2/po/hi/kcmkgamma.po --- old/kgamma5-5.4.3/po/hi/kcmkgamma.po 2015-11-05 13:34:02.000000000 +0100 +++ new/kgamma5-5.5.2/po/hi/kcmkgamma.po 2015-12-22 11:29:32.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2007-12-27 16:41+0530\n" "Last-Translator: Ravishankar Shrivastava <raviratlami(a)yahoo.com>\n" "Language-Team: Hindi <indlinux-hindi(a)lists.sourceforge.net>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/hne/kcmkgamma.po new/kgamma5-5.5.2/po/hne/kcmkgamma.po --- old/kgamma5-5.4.3/po/hne/kcmkgamma.po 2015-11-05 13:34:02.000000000 +0100 +++ new/kgamma5-5.5.2/po/hne/kcmkgamma.po 2015-12-22 11:29:32.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2009-02-26 15:24+0530\n" "Last-Translator: Ravishankar Shrivastava <raviratlami(a)aol.in>\n" "Language-Team: Hindi <kde-i18n-doc(a)lists.kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/hr/kcmkgamma.po new/kgamma5-5.5.2/po/hr/kcmkgamma.po --- old/kgamma5-5.4.3/po/hr/kcmkgamma.po 2015-11-05 13:34:02.000000000 +0100 +++ new/kgamma5-5.5.2/po/hr/kcmkgamma.po 2015-12-22 11:29:32.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kgamma 0\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2010-01-09 14:07+0100\n" "Last-Translator: Andrej Dundović <adundovi(a)gmail.com>\n" "Language-Team: Croatian <kde-croatia-list(a)lists.sourceforge.net>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/hu/kcmkgamma.po new/kgamma5-5.5.2/po/hu/kcmkgamma.po --- old/kgamma5-5.4.3/po/hu/kcmkgamma.po 2015-11-05 13:34:02.000000000 +0100 +++ new/kgamma5-5.5.2/po/hu/kcmkgamma.po 2015-12-22 11:29:32.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: KDE 4.0\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2008-04-01 11:11+0100\n" "Last-Translator: Tamas Szanto <tszanto(a)interware.hu>\n" "Language-Team: Hungarian <kde-lista(a)sophia.jpte.hu>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/ia/kcmkgamma.po new/kgamma5-5.5.2/po/ia/kcmkgamma.po --- old/kgamma5-5.4.3/po/ia/kcmkgamma.po 2015-11-05 13:34:02.000000000 +0100 +++ new/kgamma5-5.5.2/po/ia/kcmkgamma.po 2015-12-22 11:29:32.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2013-02-07 10:22+0100\n" "Last-Translator: Giovanni Sora <g.sora(a)tiscali.it>\n" "Language-Team: Interlingua <kde-l10n-ia(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/is/kcmkgamma.po new/kgamma5-5.5.2/po/is/kcmkgamma.po --- old/kgamma5-5.4.3/po/is/kcmkgamma.po 2015-11-05 13:34:02.000000000 +0100 +++ new/kgamma5-5.5.2/po/is/kcmkgamma.po 2015-12-22 11:29:32.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2007-06-20 20:32+0000\n" "Last-Translator: Sveinn í Felli <sveinki(a)nett.is>\n" "Language-Team: íslenska <kde-isl(a)molar.is>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/it/kcmkgamma.po new/kgamma5-5.5.2/po/it/kcmkgamma.po --- old/kgamma5-5.4.3/po/it/kcmkgamma.po 2015-11-05 13:34:02.000000000 +0100 +++ new/kgamma5-5.5.2/po/it/kcmkgamma.po 2015-12-22 11:29:32.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kcmgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2007-12-26 23:18+0100\n" "Last-Translator: Nicola Ruggero <nicola(a)nxnt.org>\n" "Language-Team: Italian <kde-i18n-it(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/ja/kcmkgamma.po new/kgamma5-5.5.2/po/ja/kcmkgamma.po --- old/kgamma5-5.4.3/po/ja/kcmkgamma.po 2015-11-05 13:34:02.000000000 +0100 +++ new/kgamma5-5.5.2/po/ja/kcmkgamma.po 2015-12-22 11:29:32.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2007-07-08 17:00+0900\n" "Last-Translator: Yukiko Bando <ybando(a)k6.dion.ne.jp>\n" "Language-Team: Japanese <kde-jp(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/kk/kcmkgamma.po new/kgamma5-5.5.2/po/kk/kcmkgamma.po --- old/kgamma5-5.4.3/po/kk/kcmkgamma.po 2015-11-05 13:34:03.000000000 +0100 +++ new/kgamma5-5.5.2/po/kk/kcmkgamma.po 2015-12-22 11:29:33.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2008-02-01 15:07+0600\n" "Last-Translator: Sairan Kikkarin <sairan(a)computer.org>\n" "Language-Team: Kazakh\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/km/kcmkgamma.po new/kgamma5-5.5.2/po/km/kcmkgamma.po --- old/kgamma5-5.4.3/po/km/kcmkgamma.po 2015-11-05 13:34:03.000000000 +0100 +++ new/kgamma5-5.5.2/po/km/kcmkgamma.po 2015-12-22 11:29:33.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2008-01-24 10:12+0700\n" "Last-Translator: Khoem Sokhem <khoemsokhem(a)khmeros.info>\n" "Language-Team: Khmer <support(a)khmeros.info>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/ko/kcmkgamma.po new/kgamma5-5.5.2/po/ko/kcmkgamma.po --- old/kgamma5-5.4.3/po/ko/kcmkgamma.po 2015-11-05 13:34:03.000000000 +0100 +++ new/kgamma5-5.5.2/po/ko/kcmkgamma.po 2015-12-22 11:29:33.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2007-09-08 10:50+0900\n" "Last-Translator: Shinjo Park <kde(a)peremen.name>\n" "Language-Team: Korean <kde-i18n-doc(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/lt/kcmkgamma.po new/kgamma5-5.5.2/po/lt/kcmkgamma.po --- old/kgamma5-5.4.3/po/lt/kcmkgamma.po 2015-11-05 13:34:03.000000000 +0100 +++ new/kgamma5-5.5.2/po/lt/kcmkgamma.po 2015-12-22 11:29:33.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kcmkgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2009-01-11 19:02+0300\n" "Last-Translator: Andrius Štikonas <andrius(a)stikonas.eu>\n" "Language-Team: Lithuanian <kde-i18n-lt(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/lv/kcmkgamma.po new/kgamma5-5.5.2/po/lv/kcmkgamma.po --- old/kgamma5-5.4.3/po/lv/kcmkgamma.po 2015-11-05 13:34:03.000000000 +0100 +++ new/kgamma5-5.5.2/po/lv/kcmkgamma.po 2015-12-22 11:29:33.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2007-12-17 22:28+0200\n" "Last-Translator: Viesturs Zarins <viesturs.zarins(a)mii.lu.lv>\n" "Language-Team: Latvian <locale(a)laka.lv>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/mk/kcmkgamma.po new/kgamma5-5.5.2/po/mk/kcmkgamma.po --- old/kgamma5-5.4.3/po/mk/kcmkgamma.po 2015-11-05 13:34:03.000000000 +0100 +++ new/kgamma5-5.5.2/po/mk/kcmkgamma.po 2015-12-22 11:29:33.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2007-11-30 19:03+0100\n" "Last-Translator: Bozidar Proevski <bobibobi(a)freemail.com.mk>\n" "Language-Team: Macedonian <mkde-l10n(a)lists.sourceforge.net>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/mr/kcmkgamma.po new/kgamma5-5.5.2/po/mr/kcmkgamma.po --- old/kgamma5-5.4.3/po/mr/kcmkgamma.po 2015-11-05 13:34:03.000000000 +0100 +++ new/kgamma5-5.5.2/po/mr/kcmkgamma.po 2015-12-22 11:29:33.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2013-02-07 12:00+0530\n" "Last-Translator: Chetan Khona <chetan(a)kompkin.com>\n" "Language-Team: American English <kde-i18n-doc(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/ms/kcmkgamma.po new/kgamma5-5.5.2/po/ms/kcmkgamma.po --- old/kgamma5-5.4.3/po/ms/kcmkgamma.po 2015-11-05 13:34:03.000000000 +0100 +++ new/kgamma5-5.5.2/po/ms/kcmkgamma.po 2015-12-22 11:29:33.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Mimos\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2005-11-05 07:13+0800\n" "Last-Translator: MIMOS <opensource(a)mimos.my>\n" "Language-Team: Malay <kedidiemas(a)yahoogroups.com>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/nb/kcmkgamma.po new/kgamma5-5.5.2/po/nb/kcmkgamma.po --- old/kgamma5-5.4.3/po/nb/kcmkgamma.po 2015-11-05 13:34:03.000000000 +0100 +++ new/kgamma5-5.5.2/po/nb/kcmkgamma.po 2015-12-22 11:29:34.000000000 +0100 @@ -1,10 +1,12 @@ +# Translation of kcmkgamma to Norwegian Bokmål +# # Knut Yrvin <knut.yrvin(a)gmail.com>, 2003. # Bjørn Steensrud <bjornst(a)skogkatt.homelinux.org>, 2004. msgid "" msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2008-02-06 20:45+0100\n" "Last-Translator: MagicPO 0.3 (automated)\n" "Language-Team: Norwegian Bokmål <i18n-nb(a)lister.ping.uio.no>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/nds/kcmkgamma.po new/kgamma5-5.5.2/po/nds/kcmkgamma.po --- old/kgamma5-5.4.3/po/nds/kcmkgamma.po 2015-11-05 13:34:04.000000000 +0100 +++ new/kgamma5-5.5.2/po/nds/kcmkgamma.po 2015-12-22 11:29:34.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2007-11-07 21:07+0100\n" "Last-Translator: Manfred Wiese <m.j.wiese(a)web.de>\n" "Language-Team: Low Saxon <kde-i18n-nds(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/ne/kcmkgamma.po new/kgamma5-5.5.2/po/ne/kcmkgamma.po --- old/kgamma5-5.4.3/po/ne/kcmkgamma.po 2015-11-05 13:34:04.000000000 +0100 +++ new/kgamma5-5.5.2/po/ne/kcmkgamma.po 2015-12-22 11:29:34.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2007-08-20 12:28+0545\n" "Last-Translator: Nabin Gautam <nabin(a)mpp.org.np>\n" "Language-Team: Nepali <info(a)mpp.org.np>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/nl/kcmkgamma.po new/kgamma5-5.5.2/po/nl/kcmkgamma.po --- old/kgamma5-5.4.3/po/nl/kcmkgamma.po 2015-11-05 13:34:04.000000000 +0100 +++ new/kgamma5-5.5.2/po/nl/kcmkgamma.po 2015-12-22 11:29:34.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2015-07-31 11:50+0100\n" "Last-Translator: Freek de Kruijf <freekdekruijf(a)kde.nl>\n" "Language-Team: Dutch <kde-i18n-nl(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/nn/kcmkgamma.po new/kgamma5-5.5.2/po/nn/kcmkgamma.po --- old/kgamma5-5.4.3/po/nn/kcmkgamma.po 2015-11-05 13:34:04.000000000 +0100 +++ new/kgamma5-5.5.2/po/nn/kcmkgamma.po 2015-12-22 11:29:34.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2008-08-03 19:23+0200\n" "Last-Translator: Karl Ove Hufthammer <karl(a)huftis.org>\n" "Language-Team: Norwegian Nynorsk <i18n-nn(a)lister.ping.uio.no>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/oc/kcmkgamma.po new/kgamma5-5.5.2/po/oc/kcmkgamma.po --- old/kgamma5-5.4.3/po/oc/kcmkgamma.po 2015-11-05 13:34:04.000000000 +0100 +++ new/kgamma5-5.5.2/po/oc/kcmkgamma.po 2015-12-22 11:29:34.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2008-08-05 22:27+0200\n" "Last-Translator: Yannig Marchegay (Kokoyaya) <yannig(a)marchegay.org>\n" "Language-Team: Occitan (lengadocian) <ubuntu-l10n-oci(a)lists.ubuntu.com>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/pa/kcmkgamma.po new/kgamma5-5.5.2/po/pa/kcmkgamma.po --- old/kgamma5-5.4.3/po/pa/kcmkgamma.po 2015-11-05 13:34:04.000000000 +0100 +++ new/kgamma5-5.5.2/po/pa/kcmkgamma.po 2015-12-22 11:29:34.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2007-06-20 19:05+0530\n" "Last-Translator: A S Alam <aalam(a)users.sf.net>\n" "Language-Team: Punjabi <punjabi-l10n(a)users.sf.net>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/pl/kcmkgamma.po new/kgamma5-5.5.2/po/pl/kcmkgamma.po --- old/kgamma5-5.4.3/po/pl/kcmkgamma.po 2015-11-05 13:34:04.000000000 +0100 +++ new/kgamma5-5.5.2/po/pl/kcmkgamma.po 2015-12-22 11:29:34.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2003-11-24 21:55+0100\n" "Last-Translator: Michal Rudolf <mrudolf(a)kdewebdev.org>\n" "Language-Team: Polish <kde-transl(a)mer.chemia.polsl.gliwice.pl>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/pt/kcmkgamma.po new/kgamma5-5.5.2/po/pt/kcmkgamma.po --- old/kgamma5-5.4.3/po/pt/kcmkgamma.po 2015-11-05 13:34:04.000000000 +0100 +++ new/kgamma5-5.5.2/po/pt/kcmkgamma.po 2015-12-22 11:29:35.000000000 +0100 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2007-06-22 02:40+0100\n" "Last-Translator: Pedro Morais <morais(a)kde.org>\n" "Language-Team: pt <kde-i18n-pt(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/pt_BR/kcmkgamma.po new/kgamma5-5.5.2/po/pt_BR/kcmkgamma.po --- old/kgamma5-5.4.3/po/pt_BR/kcmkgamma.po 2015-11-05 13:34:04.000000000 +0100 +++ new/kgamma5-5.5.2/po/pt_BR/kcmkgamma.po 2015-12-22 11:29:35.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kcmkgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2009-01-03 01:23-0200\n" "Last-Translator: André Marcelo Alvarenga <andrealvarenga(a)gmx.net>\n" "Language-Team: Brazilian Portuguese <kde-i18n-pt_br(a)mail.kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/ro/kcmkgamma.po new/kgamma5-5.5.2/po/ro/kcmkgamma.po --- old/kgamma5-5.4.3/po/ro/kcmkgamma.po 2015-11-05 13:34:04.000000000 +0100 +++ new/kgamma5-5.5.2/po/ro/kcmkgamma.po 2015-12-22 11:29:35.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2008-12-29 22:17+0200\n" "Last-Translator: Sergiu Bivol <sergiu(a)ase.md>\n" "Language-Team: Romanian <kde-i18n-ro(a)lists.kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/ru/kcmkgamma.po new/kgamma5-5.5.2/po/ru/kcmkgamma.po --- old/kgamma5-5.4.3/po/ru/kcmkgamma.po 2015-11-05 13:34:05.000000000 +0100 +++ new/kgamma5-5.5.2/po/ru/kcmkgamma.po 2015-12-22 11:29:35.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2010-12-24 23:16+0300\n" "Last-Translator: Alexander Potashev <aspotashev(a)gmail.com>\n" "Language-Team: Russian <kde-russian(a)lists.kde.ru>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/se/kcmkgamma.po new/kgamma5-5.5.2/po/se/kcmkgamma.po --- old/kgamma5-5.4.3/po/se/kcmkgamma.po 2015-11-05 13:34:05.000000000 +0100 +++ new/kgamma5-5.5.2/po/se/kcmkgamma.po 2015-12-22 11:29:35.000000000 +0100 @@ -1,9 +1,11 @@ +# Translation of kcmkgamma to Northern Sami +# # Børre Gaup <boerre(a)skolelinux.no>, 2004. msgid "" msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2004-12-10 10:14+0100\n" "Last-Translator: Børre Gaup <boerre(a)skolelinux.no>\n" "Language-Team: Northern Sami <i18n-sme(a)lister.ping.uio.no>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/si/kcmkgamma.po new/kgamma5-5.5.2/po/si/kcmkgamma.po --- old/kgamma5-5.4.3/po/si/kcmkgamma.po 2015-11-05 13:34:05.000000000 +0100 +++ new/kgamma5-5.5.2/po/si/kcmkgamma.po 2015-12-22 11:29:35.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2011-09-04 13:02+0530\n" "Last-Translator: Danishka Navin <danishka(a)gmail.com>\n" "Language-Team: Sinhala <info(a)hanthana.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/sk/kcmkgamma.po new/kgamma5-5.5.2/po/sk/kcmkgamma.po --- old/kgamma5-5.4.3/po/sk/kcmkgamma.po 2015-11-05 13:34:05.000000000 +0100 +++ new/kgamma5-5.5.2/po/sk/kcmkgamma.po 2015-12-22 11:29:35.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kcmkgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2009-11-21 11:31+0100\n" "Last-Translator: Michal Sulek <misurel(a)gmail.com>\n" "Language-Team: Slovak <kde-sk(a)linux.sk>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/sl/kcmkgamma.po new/kgamma5-5.5.2/po/sl/kcmkgamma.po --- old/kgamma5-5.4.3/po/sl/kcmkgamma.po 2015-11-05 13:34:05.000000000 +0100 +++ new/kgamma5-5.5.2/po/sl/kcmkgamma.po 2015-12-22 11:29:35.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2013-07-22 11:08+0200\n" "Last-Translator: Andrej Mernik <andrejm(a)ubuntu.si>\n" "Language-Team: Slovenian <lugos-slo(a)lugos.si>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/sq/kcmkgamma.po new/kgamma5-5.5.2/po/sq/kcmkgamma.po --- old/kgamma5-5.4.3/po/sq/kcmkgamma.po 2015-11-05 13:34:05.000000000 +0100 +++ new/kgamma5-5.5.2/po/sq/kcmkgamma.po 2015-12-22 11:29:35.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdegraphics\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2010-02-06 14:26+0000\n" "Last-Translator: Vilson Gjeci <vilsongjeci(a)gmail.com>\n" "Language-Team: Albanian <sq(a)li.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/sr/kcmkgamma.po new/kgamma5-5.5.2/po/sr/kcmkgamma.po --- old/kgamma5-5.4.3/po/sr/kcmkgamma.po 2015-11-05 13:34:05.000000000 +0100 +++ new/kgamma5-5.5.2/po/sr/kcmkgamma.po 2015-12-22 11:29:35.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kcmkgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2015-08-01 14:25+0200\n" "Last-Translator: Chusslove Illich <caslav.ilic(a)gmx.net>\n" "Language-Team: Serbian <kde-i18n-sr(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/sr(a)ijekavian/kcmkgamma.po new/kgamma5-5.5.2/po/sr(a)ijekavian/kcmkgamma.po --- old/kgamma5-5.4.3/po/sr(a)ijekavian/kcmkgamma.po 2015-11-05 13:34:05.000000000 +0100 +++ new/kgamma5-5.5.2/po/sr(a)ijekavian/kcmkgamma.po 2015-12-22 11:29:35.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kcmkgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2015-08-01 14:25+0200\n" "Last-Translator: Chusslove Illich <caslav.ilic(a)gmx.net>\n" "Language-Team: Serbian <kde-i18n-sr(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/sr(a)ijekavianlatin/kcmkgamma.po new/kgamma5-5.5.2/po/sr(a)ijekavianlatin/kcmkgamma.po --- old/kgamma5-5.4.3/po/sr(a)ijekavianlatin/kcmkgamma.po 2015-11-05 13:34:05.000000000 +0100 +++ new/kgamma5-5.5.2/po/sr(a)ijekavianlatin/kcmkgamma.po 2015-12-22 11:29:35.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kcmkgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2015-08-01 14:25+0200\n" "Last-Translator: Chusslove Illich <caslav.ilic(a)gmx.net>\n" "Language-Team: Serbian <kde-i18n-sr(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/sr(a)latin/kcmkgamma.po new/kgamma5-5.5.2/po/sr(a)latin/kcmkgamma.po --- old/kgamma5-5.4.3/po/sr(a)latin/kcmkgamma.po 2015-11-05 13:34:05.000000000 +0100 +++ new/kgamma5-5.5.2/po/sr(a)latin/kcmkgamma.po 2015-12-22 11:29:35.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kcmkgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2015-08-01 14:25+0200\n" "Last-Translator: Chusslove Illich <caslav.ilic(a)gmx.net>\n" "Language-Team: Serbian <kde-i18n-sr(a)kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/sv/kcmkgamma.po new/kgamma5-5.5.2/po/sv/kcmkgamma.po --- old/kgamma5-5.4.3/po/sv/kcmkgamma.po 2015-11-05 13:34:05.000000000 +0100 +++ new/kgamma5-5.5.2/po/sv/kcmkgamma.po 2015-12-22 11:29:35.000000000 +0100 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2007-04-01 08:20+0200\n" "Last-Translator: Stefan Asserhäll <stefan.asserhall(a)bredband.net>\n" "Language-Team: Swedish <sv(a)li.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/ta/kcmkgamma.po new/kgamma5-5.5.2/po/ta/kcmkgamma.po --- old/kgamma5-5.4.3/po/ta/kcmkgamma.po 2015-11-05 13:34:05.000000000 +0100 +++ new/kgamma5-5.5.2/po/ta/kcmkgamma.po 2015-12-22 11:29:36.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2004-08-14 12:34+0530\n" "Last-Translator: I. Felix <ifelix25(a)yahoo.co.in>\n" "Language-Team: <tamilpc(a)ambalam.com>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/tg/kcmkgamma.po new/kgamma5-5.5.2/po/tg/kcmkgamma.po --- old/kgamma5-5.4.3/po/tg/kcmkgamma.po 2015-11-05 13:34:06.000000000 +0100 +++ new/kgamma5-5.5.2/po/tg/kcmkgamma.po 2015-12-22 11:29:36.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2004-08-04 15:07+0500\n" "Last-Translator: Victor Ibragimov <youth_opportunities(a)tajik.net>\n" "Language-Team: Tajik\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/th/kcmkgamma.po new/kgamma5-5.5.2/po/th/kcmkgamma.po --- old/kgamma5-5.4.3/po/th/kcmkgamma.po 2015-11-05 13:34:06.000000000 +0100 +++ new/kgamma5-5.5.2/po/th/kcmkgamma.po 2015-12-22 11:29:36.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2008-02-04 15:27+0700\n" "Last-Translator: Thanomsub Noppaburana <donga.nb(a)gmail.com>\n" "Language-Team: Thai <thai-l10n(a)googlegroups.com>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/tr/kcmkgamma.po new/kgamma5-5.5.2/po/tr/kcmkgamma.po --- old/kgamma5-5.4.3/po/tr/kcmkgamma.po 2015-11-05 13:34:06.000000000 +0100 +++ new/kgamma5-5.5.2/po/tr/kcmkgamma.po 2015-12-22 11:29:36.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: kdegraphics-kde4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2014-06-08 13:55+0000\n" "Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/kdegraphics-k-tr/" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/ug/kcmkgamma.po new/kgamma5-5.5.2/po/ug/kcmkgamma.po --- old/kgamma5-5.4.3/po/ug/kcmkgamma.po 2015-11-05 13:34:06.000000000 +0100 +++ new/kgamma5-5.5.2/po/ug/kcmkgamma.po 2015-12-22 11:29:36.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kcmkgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2013-09-08 07:05+0900\n" "Last-Translator: Gheyret Kenji <gheyret(a)gmail.com>\n" "Language-Team: Uyghur Computer Science Association <UKIJ(a)yahoogroups.com>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/uk/kcmkgamma.po new/kgamma5-5.5.2/po/uk/kcmkgamma.po --- old/kgamma5-5.4.3/po/uk/kcmkgamma.po 2015-11-05 13:34:06.000000000 +0100 +++ new/kgamma5-5.5.2/po/uk/kcmkgamma.po 2015-12-22 11:29:36.000000000 +0100 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: kcmkgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2009-12-13 10:23+0200\n" "Last-Translator: Yuri Chornoivan <yurchor(a)ukr.net>\n" "Language-Team: Ukrainian <translation(a)linux.org.ua>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/zh_CN/kcmkgamma.po new/kgamma5-5.5.2/po/zh_CN/kcmkgamma.po --- old/kgamma5-5.4.3/po/zh_CN/kcmkgamma.po 2015-11-05 13:34:06.000000000 +0100 +++ new/kgamma5-5.5.2/po/zh_CN/kcmkgamma.po 2015-12-22 11:29:37.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2007-09-20 14:02+0800\n" "Last-Translator: Lie_Ex <lilith.ex(a)gmail.com>\n" "Language-Team: zh_CN <kde-china(a)kde.com>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/zh_HK/kcmkgamma.po new/kgamma5-5.5.2/po/zh_HK/kcmkgamma.po --- old/kgamma5-5.4.3/po/zh_HK/kcmkgamma.po 2015-11-05 13:34:06.000000000 +0100 +++ new/kgamma5-5.5.2/po/zh_HK/kcmkgamma.po 2015-12-22 11:29:37.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2006-01-09 22:32+0800\n" "Last-Translator: Walter Cheuk <wwycheuk(a)netvigator.com>\n" "Language-Team: Chinese (Hong Kong) <community(a)linuxhall.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgamma5-5.4.3/po/zh_TW/kcmkgamma.po new/kgamma5-5.5.2/po/zh_TW/kcmkgamma.po --- old/kgamma5-5.4.3/po/zh_TW/kcmkgamma.po 2015-11-05 13:34:07.000000000 +0100 +++ new/kgamma5-5.5.2/po/zh_TW/kcmkgamma.po 2015-12-22 11:29:37.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kgamma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-08-07 11:19+0000\n" +"POT-Creation-Date: 2015-07-31 08:30+0000\n" "PO-Revision-Date: 2007-05-21 17:52+0800\n" "Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n" "Language-Team: Chinese Traditional <zh-l10n(a)linux.org.tw>\n"

1 0

commit kmediaplayer for openSUSE:Factory
by root＠hilbert.suse.de 04 Jan '16

04 Jan '16

Hello community, here is the log from the commit of package kmediaplayer for openSUSE:Factory checked in at 2016-01-04 09:21:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmediaplayer (Old) and /work/SRC/openSUSE:Factory/.kmediaplayer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kmediaplayer" Changes: -------- --- /work/SRC/openSUSE:Factory/kmediaplayer/kmediaplayer.changes 2015-11-24 22:24:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kmediaplayer.new/kmediaplayer.changes 2016-01-04 09:22:06.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Dec 10 23:08:07 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.17.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.17.0.php + +------------------------------------------------------------------- Old: ---- kmediaplayer-5.16.0.tar.xz New: ---- kmediaplayer-5.17.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmediaplayer.spec ++++++ --- /var/tmp/diff_new_pack.E3hj7b/_old 2016-01-04 09:22:06.000000000 +0100 +++ /var/tmp/diff_new_pack.E3hj7b/_new 2016-01-04 09:22:06.000000000 +0100 @@ -17,9 +17,9 @@ %define lname libKF5MediaPlayer5 -%define _tar_path 5.16 +%define _tar_path 5.17 Name: kmediaplayer -Version: 5.16.0 +Version: 5.17.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 ++++++ kmediaplayer-5.16.0.tar.xz -> kmediaplayer-5.17.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmediaplayer-5.16.0/CMakeLists.txt new/kmediaplayer-5.17.0/CMakeLists.txt --- old/kmediaplayer-5.16.0/CMakeLists.txt 2015-11-08 12:11:57.000000000 +0100 +++ new/kmediaplayer-5.17.0/CMakeLists.txt 2015-12-06 15:08:37.000000000 +0100 @@ -7,7 +7,7 @@ # CMake stuff from ECM # include(FeatureSummary) -find_package(ECM 5.16.0 NO_MODULE) +find_package(ECM 5.17.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -23,8 +23,8 @@ include(ECMGenerateHeaders) include(ECMPackageConfigHelpers) -set(KF5_VERSION "5.16.0") # handled by release scripts -set(KF5_DEP_VERSION "5.16.0") # handled by release scripts +set(KF5_VERSION "5.17.0") # handled by release scripts +set(KF5_DEP_VERSION "5.17.0") # handled by release scripts # # Version info

1 0

commit kapidox for openSUSE:Factory
by root＠hilbert.suse.de 04 Jan '16

04 Jan '16

Hello community, here is the log from the commit of package kapidox for openSUSE:Factory checked in at 2016-01-04 09:21:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kapidox (Old) and /work/SRC/openSUSE:Factory/.kapidox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kapidox" Changes: -------- --- /work/SRC/openSUSE:Factory/kapidox/kapidox.changes 2015-11-24 22:21:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kapidox.new/kapidox.changes 2016-01-04 09:22:04.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Dec 10 23:02:52 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Update to 5.17.0 + * Make kgenframeworksapidox more robust. + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.17.0.php + +------------------------------------------------------------------- Old: ---- kapidox-5.16.0.tar.xz New: ---- kapidox-5.17.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kapidox.spec ++++++ --- /var/tmp/diff_new_pack.2n62Te/_old 2016-01-04 09:22:05.000000000 +0100 +++ /var/tmp/diff_new_pack.2n62Te/_new 2016-01-04 09:22:05.000000000 +0100 @@ -16,9 +16,9 @@ # -%define _tar_path 5.16 +%define _tar_path 5.17 Name: kapidox -Version: 5.16.0 +Version: 5.17.0 Release: 0 Requires: doxygen BuildRequires: fdupes ++++++ kapidox-5.16.0.tar.xz -> kapidox-5.17.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.16.0/setup.py new/kapidox-5.17.0/setup.py --- old/kapidox-5.16.0/setup.py 2015-10-19 22:22:40.000000000 +0200 +++ new/kapidox-5.17.0/setup.py 2015-12-06 09:18:17.000000000 +0100 @@ -6,7 +6,7 @@ setup( name='kapidox', - version='5.16.0', + version='5.17.0', description='KDE API documentation generation tools', maintainer = 'Alex Merry', maintainer_email = 'alex.merry(a)kde.org', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.16.0/src/kapidox/data/templates/fwinfo.html new/kapidox-5.17.0/src/kapidox/data/templates/fwinfo.html --- old/kapidox-5.16.0/src/kapidox/data/templates/fwinfo.html 2015-10-19 22:22:40.000000000 +0200 +++ new/kapidox-5.17.0/src/kapidox/data/templates/fwinfo.html 2015-12-06 09:18:17.000000000 +0100 @@ -37,7 +37,7 @@ <dd>IRC channel: {{ fwinfo.irc|default("#kde-devel") }} on Freenode</dd> <dd><a href="https://mail.kde.org/mailman/listinfo/{{ fwinfo.mailinglist|default("kde-frameworks-devel") }}">Mailing list</a></dd> -{% if fwinfo.libraries|count != 0 %} +{% if fwinfo.libraries is iterable and fwinfo.libraries|count != 0 %} <dt>Use with <a href="https://techbase.kde.org/Development/Tutorials/CMake">CMake</a></dt> <dd><pre class="fragment">find_package({{ fwinfo.cmakename }}) target_link_libraries(yourapp{% for lib in fwinfo.libraries %} {{ lib.cmake }}{% endfor %})</pre></dd> @@ -45,7 +45,7 @@ {% endif %} {% if fwinfo.libraries|selectattr("qmake")|list|count != 0 %} <dt>Use with QMake</dt> - <dd><pre class="fragment">QT +={% for lib in fwinfo.libraries|selectattr("qmake") %} {{ lib.qmake }}{% endfor %}</pre></dd> + <dd><pre class="fragment">QT +={% for lib in fwinfo.libraries|selectattr("qmake") %} {{ lib.qmake }}{% endfor %} {% for line in fwinfo.qmakepro %}<br/>{{ line }} {% endfor %}</pre></dd> {% endif %} <dt>Clone URL</dt> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.16.0/src/kgenframeworksapidox new/kapidox-5.17.0/src/kgenframeworksapidox --- old/kapidox-5.16.0/src/kgenframeworksapidox 2015-10-19 22:22:40.000000000 +0200 +++ new/kapidox-5.17.0/src/kgenframeworksapidox 2015-12-06 09:18:17.000000000 +0100 @@ -102,14 +102,13 @@ # Extend framework info fw['href'] = fw['outputdir'] + '/html/index.html' - # Fix broken frameworks lacking platform definitions - if fw['platforms'] is None: - logging.warning('{} framework lacks platform definitions'.format(fw['fancyname'])) + try: + platform_lst = [x['name'] for x in fw['platforms'] if x['name'] not in (PLATFORM_ALL, PLATFORM_UNKNOWN)] + available_platforms.update(set(platform_lst)) + except (KeyError, TypeError): + logging.warning('{} framework lacks valid platform definitions'.format(fw['fancyname'])) fw['platforms'] = [dict(name=PLATFORM_UNKNOWN)] - platform_lst = [x['name'] for x in fw['platforms'] if x['name'] not in (PLATFORM_ALL, PLATFORM_UNKNOWN)] - available_platforms.update(set(platform_lst)) - lst.append(fw) lst.sort(key=lambda x: x['fancyname'].lower()) @@ -222,16 +221,27 @@ outputdir = modulename # FIXME: option in yaml file to disable docs - metainfo = yaml.load(open(yaml_file)) - tier = metainfo["tier"] + try: + metainfo = yaml.load(open(yaml_file)) + except: + logging.warning('Could not load metainfo.yaml for {}, skipping it'.format(modulename)) + return None + + if metainfo is None: + logging.warning('Empty metainfo.yaml for {}, skipping it'.format(modulename)) + return None + + tier = metainfo.get("tier") if tier is None: - logging.warning('Could not find tier for {}'.format(framework)) + logging.warning('Could not find tier for {}, skipping it'.format(modulename)) return None elif tier < 1 or tier > 4: - logging.warning('Invalid tier {} for {}'.format(tier, framework)) + logging.warning('Invalid tier {} for {}, skipping it'.format(tier, modulename)) return None - if isinstance(metainfo['maintainer'],list): + if 'maintainer' not in metainfo: + fw_maintainers = [] + elif isinstance(metainfo['maintainer'],list): fw_maintainers = map(lambda x: maintainers.get(x, None), metainfo['maintainer']) else:

1 0

commit python3-urllib3 for openSUSE:Factory
by root＠hilbert.suse.de 04 Jan '16

04 Jan '16

Hello community, here is the log from the commit of package python3-urllib3 for openSUSE:Factory checked in at 2016-01-04 09:21:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-urllib3 (Old) and /work/SRC/openSUSE:Factory/.python3-urllib3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-urllib3" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-urllib3/python3-urllib3.changes 2015-12-23 09:57:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-urllib3.new/python3-urllib3.changes 2016-01-04 09:21:59.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Dec 31 19:57:42 UTC 2015 - arun(a)gmx.de + +- update to version 1.14: + * contrib: SOCKS proxy support! (Issue #762) + * Fixed AppEngine handling of transfer-encoding header and bug + in Timeout defaults checking. (Issue #763) + +------------------------------------------------------------------- Old: ---- urllib3-1.13.1.tar.gz New: ---- urllib3-1.14.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-urllib3.spec ++++++ --- /var/tmp/diff_new_pack.rvrL2r/_old 2016-01-04 09:22:00.000000000 +0100 +++ /var/tmp/diff_new_pack.rvrL2r/_new 2016-01-04 09:22:00.000000000 +0100 @@ -17,7 +17,7 @@ Name: python3-urllib3 -Version: 1.13.1 +Version: 1.14 Release: 0 Summary: HTTP library with thread-safe connection pooling, file post, and more License: MIT ++++++ urllib3-1.13.1.tar.gz -> urllib3-1.14.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/CHANGES.rst new/urllib3-1.14/CHANGES.rst --- old/urllib3-1.13.1/CHANGES.rst 2015-12-18 23:47:24.000000000 +0100 +++ new/urllib3-1.14/CHANGES.rst 2015-12-29 21:28:18.000000000 +0100 @@ -1,6 +1,15 @@ Changes ======= +1.14 (2015-12-29) ++++++++++++++++++ + +* contrib: SOCKS proxy support! (Issue #762) + +* Fixed AppEngine handling of transfer-encoding header and bug + in Timeout defaults checking. (Issue #763) + + 1.13.1 (2015-12-18) +++++++++++++++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/CONTRIBUTORS.txt new/urllib3-1.14/CONTRIBUTORS.txt --- old/urllib3-1.13.1/CONTRIBUTORS.txt 2015-12-14 22:06:26.000000000 +0100 +++ new/urllib3-1.14/CONTRIBUTORS.txt 2015-12-29 21:28:18.000000000 +0100 @@ -184,5 +184,8 @@ * Andy Caldwell <andy.m.caldwell(a)googlemail.com> * Bugfix related to reusing connections in indeterminate states. +* Ville Skyttä <ville.skytta(a)iki.fi> + * Logging efficiency improvements, spelling fixes, Travis config. + * [Your name or handle] <[email or website]> * [Brief summary of your changes] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/PKG-INFO new/urllib3-1.14/PKG-INFO --- old/urllib3-1.13.1/PKG-INFO 2015-12-18 23:47:28.000000000 +0100 +++ new/urllib3-1.14/PKG-INFO 2015-12-29 21:28:24.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: urllib3 -Version: 1.13.1 +Version: 1.14 Summary: HTTP library with thread-safe connection pooling, file post, and more. Home-page: http://urllib3.readthedocs.org/ Author: Andrey Petrov @@ -156,6 +156,15 @@ Changes ======= + 1.14 (2015-12-29) + +++++++++++++++++ + + * contrib: SOCKS proxy support! (Issue #762) + + * Fixed AppEngine handling of transfer-encoding header and bug + in Timeout defaults checking. (Issue #763) + + 1.13.1 (2015-12-18) +++++++++++++++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/docs/contrib.rst new/urllib3-1.14/docs/contrib.rst --- old/urllib3-1.13.1/docs/contrib.rst 2015-09-04 02:16:43.000000000 +0200 +++ new/urllib3-1.14/docs/contrib.rst 2015-12-29 21:28:18.000000000 +0100 @@ -4,7 +4,7 @@ =============== These modules implement various extra features, that may not be ready for -prime time. +prime time or that require optional third-party dependencies. .. _contrib-pyopenssl: @@ -16,7 +16,7 @@ .. _gae: -Google App Engine +Google App Engine ----------------- The :mod:`urllib3.contrib.appengine` module provides a pool manager that @@ -45,8 +45,62 @@ 1. You can use :class:`AppEngineManager` with URLFetch. URLFetch is cost-effective in many circumstances as long as your usage is within the limitations. 2. You can use a normal :class:`PoolManager` by enabling sockets. Sockets also have `limitations and restrictions <https://cloud.google.com/appengine/docs/python/sockets/#limitations-and-res…>`_ and have a lower free quota than URLFetch. To use sockets, be sure to specify the following in your ``app.yaml``:: - + env_variables: GAE_USE_SOCKETS_HTTPLIB : 'true' 3. If you are using `Managed VMs <https://cloud.google.com/appengine/docs/managed-vms/>`_, you can use the standard :class:`PoolManager` without any configuration or special environment variables. + + +SOCKS Proxies +------------- + +.. versionadded:: 1.14.0 + +The :mod:`urllib3.contrib.socks` module enables urllib3 to work with proxies +that use either the SOCKS4 or SOCKS5 protocols. These proxies are common in +environments that want to allow generic TCP/UDP traffic through their borders, +but don't want unrestricted traffic flows. + +To use it, either install ``PySocks`` or install urllib3 with the ``socks`` +extra, like so: + +.. code-block:: bash + + $ pip install urllib3[socks] + +If you have already got urllib3 1.14.0 or later installed, run: + +.. code-block:: bash + + $ pip install -U urllib3[socks] + +The SOCKS module provides a +:class:`SOCKSProxyManager <urllib3.contrib.socks.SOCKSProxyManager>` that can +be used when SOCKS support is required. This class behaves very much like a +standard :class:`ProxyManager <urllib3.poolmanager.ProxyManager>`, but allows +the use of a SOCKS proxy instead. + +Using it is simple. For example, with a SOCKS5 proxy running on the local +machine, listening on port 8889: + +.. code-block:: python + + from urllib3.contrib.socks import SOCKSProxyManager + + http = SOCKSProxyManager('socks5://localhost:8889/') + r = http.request('GET', 'https://www.google.com/') + +The SOCKS implementation supports the full range of urllib3 features. It also +supports the following SOCKS features: + +- SOCKS4 +- SOCKS4a +- SOCKS5 +- Usernames and passwords for the SOCKS proxy + +The SOCKS module does have the following limitations: + +- No support for contacting a SOCKS proxy via IPv6. +- No support for reaching websites via a literal IPv6 address: domain names + must be used. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/docs/index.rst new/urllib3-1.14/docs/index.rst --- old/urllib3-1.13.1/docs/index.rst 2015-12-14 22:06:26.000000000 +0100 +++ new/urllib3-1.14/docs/index.rst 2015-12-29 21:28:18.000000000 +0100 @@ -327,7 +327,7 @@ --------------- These modules implement various extra features, that may not be ready for -prime time. +prime time or that require optional third-party dependencies. * :ref:`contrib-modules` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/docs/security.rst new/urllib3-1.14/docs/security.rst --- old/urllib3-1.13.1/docs/security.rst 2015-12-14 22:06:26.000000000 +0100 +++ new/urllib3-1.14/docs/security.rst 2015-12-29 21:28:18.000000000 +0100 @@ -199,9 +199,11 @@ succeed on more featureful platforms to fail, and can cause certain security features to be unavailable. -If you encounter this warning, it is strongly recommended you upgrade to a -newer Python version, or that you use pyOpenSSL as described in the -:ref:`pyopenssl` section. +If you encounter this warning, it is strongly recommended you: + +- upgrade to a newer Python version +- upgrade ``ndg-httpsclient`` with ``pip install --upgrade ndg-httpsclient`` +- use pyOpenSSL as described in the :ref:`pyopenssl` section For info about disabling warnings, see `Disabling Warnings`_. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/dummyserver/server.py new/urllib3-1.14/dummyserver/server.py --- old/urllib3-1.13.1/dummyserver/server.py 2015-12-18 23:47:24.000000000 +0100 +++ new/urllib3-1.14/dummyserver/server.py 2015-12-29 21:28:18.000000000 +0100 @@ -90,6 +90,8 @@ :param ready_event: Event which gets set when the socket handler is ready to receive requests. """ + USE_IPV6 = HAS_IPV6_AND_DNS + def __init__(self, socket_handler, host='localhost', port=8081, ready_event=None): threading.Thread.__init__(self) @@ -100,7 +102,7 @@ self.ready_event = ready_event def _start_server(self): - if HAS_IPV6_AND_DNS: + if self.USE_IPV6: sock = socket.socket(socket.AF_INET6) else: warnings.warn("No IPv6 support. Falling back to IPv4.", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/dummyserver/testcase.py new/urllib3-1.14/dummyserver/testcase.py --- old/urllib3-1.13.1/dummyserver/testcase.py 2015-12-18 23:47:24.000000000 +0100 +++ new/urllib3-1.14/dummyserver/testcase.py 2015-12-29 21:28:18.000000000 +0100 @@ -71,6 +71,21 @@ cls.server_thread.join(0.1) +class IPV4SocketDummyServerTestCase(SocketDummyServerTestCase): + @classmethod + def _start_server(cls, socket_handler): + ready_event = threading.Event() + cls.server_thread = SocketServerThread(socket_handler=socket_handler, + ready_event=ready_event, + host=cls.host) + cls.server_thread.USE_IPV6 = False + cls.server_thread.start() + ready_event.wait(5) + if not ready_event.is_set(): + raise Exception("most likely failed to start server") + cls.port = cls.server_thread.port + + class HTTPDummyServerTestCase(unittest.TestCase): """ A simple HTTP server that runs when your test class runs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/setup.py new/urllib3-1.14/setup.py --- old/urllib3-1.13.1/setup.py 2015-12-14 22:06:26.000000000 +0100 +++ new/urllib3-1.14/setup.py 2015-12-29 21:28:18.000000000 +0100 @@ -61,5 +61,8 @@ 'pyasn1', 'certifi', ], + 'socks': [ + 'PySocks>=1.5.6,<2.0', + ] }, ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/test/__init__.py new/urllib3-1.14/test/__init__.py --- old/urllib3-1.13.1/test/__init__.py 2015-09-06 20:40:19.000000000 +0200 +++ new/urllib3-1.14/test/__init__.py 2015-12-29 21:28:18.000000000 +0100 @@ -57,7 +57,7 @@ return wrapper def onlyPy279OrNewer(test): - """Skips this test unless you are onl Python 2.7.9 or later.""" + """Skips this test unless you are on Python 2.7.9 or later.""" @functools.wraps(test) def wrapper(*args, **kwargs): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/test/contrib/test_socks.py new/urllib3-1.14/test/contrib/test_socks.py --- old/urllib3-1.13.1/test/contrib/test_socks.py 1970-01-01 01:00:00.000000000 +0100 +++ new/urllib3-1.14/test/contrib/test_socks.py 2015-12-29 21:28:18.000000000 +0100 @@ -0,0 +1,599 @@ +import threading +import socket + +from urllib3.contrib import socks +from urllib3.exceptions import ConnectTimeoutError, NewConnectionError + +from dummyserver.server import DEFAULT_CERTS +from dummyserver.testcase import IPV4SocketDummyServerTestCase + +from nose.plugins.skip import SkipTest + +try: + import ssl + from urllib3.util import ssl_ as better_ssl + HAS_SSL = True +except ImportError: + ssl = None + better_ssl = None + HAS_SSL = False + + +SOCKS_NEGOTIATION_NONE = b'\x00' +SOCKS_NEGOTIATION_PASSWORD = b'\x02' + +SOCKS_VERSION_SOCKS4 = b'\x04' +SOCKS_VERSION_SOCKS5 = b'\x05' + + +def _get_free_port(host): + """ + Gets a free port by opening a socket, binding it, checking the assigned + port, and then closing it. + """ + s = socket.socket() + s.bind((host, 0)) + port = s.getsockname()[1] + s.close() + return port + + +def _read_exactly(sock, amt): + """ + Read *exactly* ``amt`` bytes from the socket ``sock``. + """ + data = b'' + + while amt > 0: + chunk = sock.recv(amt) + data += chunk + amt -= len(chunk) + + return data + + +def _read_until(sock, char): + """ + Read from the socket until the character is received. + """ + chunks = [] + while True: + chunk = sock.recv(1) + chunks.append(chunk) + if chunk == char: + break + + return b''.join(chunks) + + +def _address_from_socket(sock): + """ + Returns the address from the SOCKS socket + """ + addr_type = sock.recv(1) + + if addr_type == b'\x01': + ipv4_addr = _read_exactly(sock, 4) + return socket.inet_ntoa(ipv4_addr) + elif addr_type == b'\x04': + ipv6_addr = _read_exactly(sock, 16) + return socket.inet_ntop(socket.AF_INET6, ipv6_addr) + elif addr_type == b'\x03': + addr_len = ord(sock.recv(1)) + return _read_exactly(sock, addr_len) + else: + raise RuntimeError("Unexpected addr type: %r" % addr_type) + + +def handle_socks5_negotiation(sock, negotiate, username=None, + password=None): + """ + Handle the SOCKS5 handshake. + + Returns a generator object that allows us to break the handshake into + steps so that the test code can intervene at certain useful points. + """ + received_version = sock.recv(1) + assert received_version == SOCKS_VERSION_SOCKS5 + nmethods = ord(sock.recv(1)) + methods = _read_exactly(sock, nmethods) + + if negotiate: + assert SOCKS_NEGOTIATION_PASSWORD in methods + send_data = SOCKS_VERSION_SOCKS5 + SOCKS_NEGOTIATION_PASSWORD + sock.sendall(send_data) + + # This is the password negotiation. + negotiation_version = sock.recv(1) + assert negotiation_version == b'\x01' + ulen = ord(sock.recv(1)) + provided_username = _read_exactly(sock, ulen) + plen = ord(sock.recv(1)) + provided_password = _read_exactly(sock, plen) + + if username == provided_username and password == provided_password: + sock.sendall(b'\x01\x00') + else: + sock.sendall(b'\x01\x01') + sock.close() + yield False + return + else: + assert SOCKS_NEGOTIATION_NONE in methods + send_data = SOCKS_VERSION_SOCKS5 + SOCKS_NEGOTIATION_NONE + sock.sendall(send_data) + + # Client sends where they want to go. + received_version = sock.recv(1) + command = sock.recv(1) + reserved = sock.recv(1) + addr = _address_from_socket(sock) + port = _read_exactly(sock, 2) + port = (ord(port[0:1]) << 8) + (ord(port[1:2])) + + # Check some basic stuff. + assert received_version == SOCKS_VERSION_SOCKS5 + assert command == b'\x01' # Only support connect, not bind. + assert reserved == b'\x00' + + # Yield the address port tuple. + succeed = yield addr, port + + if succeed: + # Hard-coded response for now. + response = ( + SOCKS_VERSION_SOCKS5 + b'\x00\x00\x01\x7f\x00\x00\x01\xea\x60' + ) + else: + # Hard-coded response for now. + response = SOCKS_VERSION_SOCKS5 + b'\x01\00' + + sock.sendall(response) + yield True # Avoid StopIteration exceptions getting fired. + + +def handle_socks4_negotiation(sock, username=None): + """ + Handle the SOCKS4 handshake. + + Returns a generator object that allows us to break the handshake into + steps so that the test code can intervene at certain useful points. + """ + received_version = sock.recv(1) + command = sock.recv(1) + port = _read_exactly(sock, 2) + port = (ord(port[0:1]) << 8) + (ord(port[1:2])) + addr = _read_exactly(sock, 4) + provided_username = _read_until(sock, b'\x00')[:-1] # Strip trailing null. + + if addr == b'\x00\x00\x00\x01': + # Magic string: means DNS name. + addr = _read_until(sock, b'\x00')[:-1] # Strip trailing null. + else: + addr = socket.inet_ntoa(addr) + + # Check some basic stuff. + assert received_version == SOCKS_VERSION_SOCKS4 + assert command == b'\x01' # Only support connect, not bind. + + if username is not None and username != provided_username: + sock.sendall(b'\x00\x5d\x00\x00\x00\x00\x00\x00') + sock.close() + yield False + return + + # Yield the address port tuple. + succeed = yield addr, port + + if succeed: + response = b'\x00\x5a\xea\x60\x7f\x00\x00\x01' + else: + response = b'\x00\x5b\x00\x00\x00\x00\x00\x00' + + sock.sendall(response) + yield True # Avoid StopIteration exceptions getting fired. + + +class TestSocks5Proxy(IPV4SocketDummyServerTestCase): + """ + Test the SOCKS proxy in SOCKS5 mode. + """ + def test_basic_request(self): + def request_handler(listener): + sock = listener.accept()[0] + + handler = handle_socks5_negotiation(sock, negotiate=False) + addr, port = next(handler) + + self.assertEqual(addr, '16.17.18.19') + self.assertTrue(port, 80) + handler.send(True) + + while True: + buf = sock.recv(65535) + if buf.endswith(b'\r\n\r\n'): + break + + sock.sendall(b'HTTP/1.1 200 OK\r\n' + b'Server: SocksTestServer\r\n' + b'Content-Length: 0\r\n' + b'\r\n') + sock.close() + + self._start_server(request_handler) + proxy_url = "socks5://%s:%s" % (self.host, self.port) + pm = socks.SOCKSProxyManager(proxy_url) + response = pm.request('GET', 'http://16.17.18.19') + + self.assertEqual(response.status, 200) + self.assertEqual(response.data, b'') + self.assertEqual(response.headers['Server'], 'SocksTestServer') + + def test_correct_header_line(self): + def request_handler(listener): + sock = listener.accept()[0] + + handler = handle_socks5_negotiation(sock, negotiate=False) + addr, port = next(handler) + + self.assertEqual(addr, b'example.com') + self.assertTrue(port, 80) + handler.send(True) + + buf = b'' + while True: + buf += sock.recv(65535) + if buf.endswith(b'\r\n\r\n'): + break + + self.assertTrue(buf.startswith(b'GET / HTTP/1.1')) + self.assertTrue(b'Host: example.com' in buf) + + sock.sendall(b'HTTP/1.1 200 OK\r\n' + b'Server: SocksTestServer\r\n' + b'Content-Length: 0\r\n' + b'\r\n') + sock.close() + + self._start_server(request_handler) + proxy_url = "socks5://%s:%s" % (self.host, self.port) + pm = socks.SOCKSProxyManager(proxy_url) + response = pm.request('GET', 'http://example.com') + self.assertEqual(response.status, 200) + + def test_connection_timeouts(self): + event = threading.Event() + + def request_handler(listener): + event.wait() + + self._start_server(request_handler) + proxy_url = "socks5://%s:%s" % (self.host, self.port) + pm = socks.SOCKSProxyManager(proxy_url) + + self.assertRaises( + ConnectTimeoutError, pm.request, 'GET', 'http://example.com', + timeout=0.001, retries=False + ) + event.set() + + def test_connection_failure(self): + event = threading.Event() + + def request_handler(listener): + listener.close() + event.set() + + self._start_server(request_handler) + proxy_url = "socks5://%s:%s" % (self.host, self.port) + pm = socks.SOCKSProxyManager(proxy_url) + + event.wait() + self.assertRaises( + NewConnectionError, pm.request, 'GET', 'http://example.com', + retries=False + ) + + def test_proxy_rejection(self): + evt = threading.Event() + + def request_handler(listener): + sock = listener.accept()[0] + + handler = handle_socks5_negotiation(sock, negotiate=False) + addr, port = next(handler) + handler.send(False) + + evt.wait() + sock.close() + + self._start_server(request_handler) + proxy_url = "socks5://%s:%s" % (self.host, self.port) + pm = socks.SOCKSProxyManager(proxy_url) + + self.assertRaises( + NewConnectionError, pm.request, 'GET', 'http://example.com', + retries=False + ) + evt.set() + + def test_socks_with_password(self): + def request_handler(listener): + sock = listener.accept()[0] + + handler = handle_socks5_negotiation( + sock, negotiate=True, username=b'user', password=b'pass' + ) + addr, port = next(handler) + + self.assertEqual(addr, '16.17.18.19') + self.assertTrue(port, 80) + handler.send(True) + + while True: + buf = sock.recv(65535) + if buf.endswith(b'\r\n\r\n'): + break + + sock.sendall(b'HTTP/1.1 200 OK\r\n' + b'Server: SocksTestServer\r\n' + b'Content-Length: 0\r\n' + b'\r\n') + sock.close() + + self._start_server(request_handler) + proxy_url = "socks5://%s:%s" % (self.host, self.port) + pm = socks.SOCKSProxyManager(proxy_url, username='user', + password='pass') + response = pm.request('GET', 'http://16.17.18.19') + + self.assertEqual(response.status, 200) + self.assertEqual(response.data, b'') + self.assertEqual(response.headers['Server'], 'SocksTestServer') + + def test_socks_with_invalid_password(self): + def request_handler(listener): + sock = listener.accept()[0] + + handler = handle_socks5_negotiation( + sock, negotiate=True, username=b'user', password=b'pass' + ) + next(handler) + + self._start_server(request_handler) + proxy_url = "socks5://%s:%s" % (self.host, self.port) + pm = socks.SOCKSProxyManager(proxy_url, username='user', + password='badpass') + + try: + pm.request('GET', 'http://example.com', retries=False) + except NewConnectionError as e: + self.assertTrue("SOCKS5 authentication failed" in str(e)) + else: + self.fail("Did not raise") + + def test_source_address_works(self): + expected_port = _get_free_port(self.host) + + def request_handler(listener): + sock = listener.accept()[0] + self.assertEqual(sock.getpeername()[0], '127.0.0.1') + self.assertEqual(sock.getpeername()[1], expected_port) + + handler = handle_socks5_negotiation(sock, negotiate=False) + addr, port = next(handler) + + self.assertEqual(addr, '16.17.18.19') + self.assertTrue(port, 80) + handler.send(True) + + while True: + buf = sock.recv(65535) + if buf.endswith(b'\r\n\r\n'): + break + + sock.sendall(b'HTTP/1.1 200 OK\r\n' + b'Server: SocksTestServer\r\n' + b'Content-Length: 0\r\n' + b'\r\n') + sock.close() + + self._start_server(request_handler) + proxy_url = "socks5://%s:%s" % (self.host, self.port) + pm = socks.SOCKSProxyManager( + proxy_url, source_address=('127.0.0.1', expected_port) + ) + response = pm.request('GET', 'http://16.17.18.19') + self.assertEqual(response.status, 200) + + +class TestSOCKS4Proxy(IPV4SocketDummyServerTestCase): + """ + Test the SOCKS proxy in SOCKS4 mode. + + Has relatively fewer tests than the SOCKS5 case, mostly because once the + negotiation is done the two cases behave identically. + """ + def test_basic_request(self): + def request_handler(listener): + sock = listener.accept()[0] + + handler = handle_socks4_negotiation(sock) + addr, port = next(handler) + + self.assertEqual(addr, '16.17.18.19') + self.assertTrue(port, 80) + handler.send(True) + + while True: + buf = sock.recv(65535) + if buf.endswith(b'\r\n\r\n'): + break + + sock.sendall(b'HTTP/1.1 200 OK\r\n' + b'Server: SocksTestServer\r\n' + b'Content-Length: 0\r\n' + b'\r\n') + sock.close() + + self._start_server(request_handler) + proxy_url = "socks4://%s:%s" % (self.host, self.port) + pm = socks.SOCKSProxyManager(proxy_url) + response = pm.request('GET', 'http://16.17.18.19') + + self.assertEqual(response.status, 200) + self.assertEqual(response.headers['Server'], 'SocksTestServer') + self.assertEqual(response.data, b'') + + def test_correct_header_line(self): + def request_handler(listener): + sock = listener.accept()[0] + + handler = handle_socks4_negotiation(sock) + addr, port = next(handler) + + self.assertEqual(addr, b'example.com') + self.assertTrue(port, 80) + handler.send(True) + + buf = b'' + while True: + buf += sock.recv(65535) + if buf.endswith(b'\r\n\r\n'): + break + + self.assertTrue(buf.startswith(b'GET / HTTP/1.1')) + self.assertTrue(b'Host: example.com' in buf) + + sock.sendall(b'HTTP/1.1 200 OK\r\n' + b'Server: SocksTestServer\r\n' + b'Content-Length: 0\r\n' + b'\r\n') + sock.close() + + self._start_server(request_handler) + proxy_url = "socks4://%s:%s" % (self.host, self.port) + pm = socks.SOCKSProxyManager(proxy_url) + response = pm.request('GET', 'http://example.com') + self.assertEqual(response.status, 200) + + def test_proxy_rejection(self): + evt = threading.Event() + + def request_handler(listener): + sock = listener.accept()[0] + + handler = handle_socks4_negotiation(sock) + addr, port = next(handler) + handler.send(False) + + evt.wait() + sock.close() + + self._start_server(request_handler) + proxy_url = "socks4://%s:%s" % (self.host, self.port) + pm = socks.SOCKSProxyManager(proxy_url) + + self.assertRaises( + NewConnectionError, pm.request, 'GET', 'http://example.com', + retries=False + ) + evt.set() + + def test_socks4_with_username(self): + def request_handler(listener): + sock = listener.accept()[0] + + handler = handle_socks4_negotiation(sock, username=b'user') + addr, port = next(handler) + + self.assertEqual(addr, '16.17.18.19') + self.assertTrue(port, 80) + handler.send(True) + + while True: + buf = sock.recv(65535) + if buf.endswith(b'\r\n\r\n'): + break + + sock.sendall(b'HTTP/1.1 200 OK\r\n' + b'Server: SocksTestServer\r\n' + b'Content-Length: 0\r\n' + b'\r\n') + sock.close() + + self._start_server(request_handler) + proxy_url = "socks4://%s:%s" % (self.host, self.port) + pm = socks.SOCKSProxyManager(proxy_url, username='user') + response = pm.request('GET', 'http://16.17.18.19') + + self.assertEqual(response.status, 200) + self.assertEqual(response.data, b'') + self.assertEqual(response.headers['Server'], 'SocksTestServer') + + def test_socks_with_invalid_username(self): + def request_handler(listener): + sock = listener.accept()[0] + + handler = handle_socks4_negotiation(sock, username=b'user') + next(handler) + + self._start_server(request_handler) + proxy_url = "socks4://%s:%s" % (self.host, self.port) + pm = socks.SOCKSProxyManager(proxy_url, username='baduser') + + try: + pm.request('GET', 'http://example.com', retries=False) + except NewConnectionError as e: + self.assertTrue("different user-ids" in str(e)) + else: + self.fail("Did not raise") + + +class TestSOCKSWithTLS(IPV4SocketDummyServerTestCase): + """ + Test that TLS behaves properly for SOCKS proxies. + """ + def test_basic_request(self): + if not HAS_SSL: + raise SkipTest("No TLS available") + + def request_handler(listener): + sock = listener.accept()[0] + + handler = handle_socks5_negotiation(sock, negotiate=False) + addr, port = next(handler) + + self.assertEqual(addr, b'localhost') + self.assertTrue(port, 443) + handler.send(True) + + # Wrap in TLS + context = better_ssl.SSLContext(ssl.PROTOCOL_SSLv23) + context.load_cert_chain( + DEFAULT_CERTS['certfile'], DEFAULT_CERTS['keyfile'] + ) + tls = context.wrap_socket(sock, server_side=True) + buf = b'' + + while True: + buf += tls.recv(65535) + if buf.endswith(b'\r\n\r\n'): + break + + self.assertTrue(buf.startswith(b'GET / HTTP/1.1\r\n')) + + tls.sendall(b'HTTP/1.1 200 OK\r\n' + b'Server: SocksTestServer\r\n' + b'Content-Length: 0\r\n' + b'\r\n') + tls.close() + + self._start_server(request_handler) + proxy_url = "socks5://%s:%s" % (self.host, self.port) + pm = socks.SOCKSProxyManager(proxy_url) + response = pm.request('GET', 'https://localhost') + + self.assertEqual(response.status, 200) + self.assertEqual(response.data, b'') + self.assertEqual(response.headers['Server'], 'SocksTestServer') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/urllib3/__init__.py new/urllib3-1.14/urllib3/__init__.py --- old/urllib3-1.13.1/urllib3/__init__.py 2015-12-18 23:47:24.000000000 +0100 +++ new/urllib3-1.14/urllib3/__init__.py 2015-12-29 21:28:18.000000000 +0100 @@ -32,7 +32,7 @@ __author__ = 'Andrey Petrov (andrey.petrov(a)shazow.net)' __license__ = 'MIT' -__version__ = '1.13.1' +__version__ = '1.14' __all__ = ( 'HTTPConnectionPool', @@ -68,7 +68,7 @@ handler.setFormatter(logging.Formatter('%(asctime)s %(levelname)s %(message)s')) logger.addHandler(handler) logger.setLevel(level) - logger.debug('Added a stderr logging handler to logger: %s' % __name__) + logger.debug('Added a stderr logging handler to logger: %s', __name__) return handler # ... Clean up. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/urllib3/connectionpool.py new/urllib3-1.14/urllib3/connectionpool.py --- old/urllib3-1.13.1/urllib3/connectionpool.py 2015-12-14 22:06:26.000000000 +0100 +++ new/urllib3-1.14/urllib3/connectionpool.py 2015-12-29 21:28:18.000000000 +0100 @@ -203,8 +203,8 @@ Return a fresh :class:`HTTPConnection`. """ self.num_connections += 1 - log.info("Starting new HTTP connection (%d): %s" % - (self.num_connections, self.host)) + log.info("Starting new HTTP connection (%d): %s", + self.num_connections, self.host) conn = self.ConnectionCls(host=self.host, port=self.port, timeout=self.timeout.connect_timeout, @@ -239,7 +239,7 @@ # If this is a persistent connection, check if it got disconnected if conn and is_connection_dropped(conn): - log.info("Resetting dropped connection: %s" % self.host) + log.info("Resetting dropped connection: %s", self.host) conn.close() if getattr(conn, 'auto_open', 1) == 0: # This is a proxied connection that has been mutated by @@ -272,7 +272,7 @@ except Full: # This should never happen if self.block == True log.warning( - "Connection pool is full, discarding connection: %s" % + "Connection pool is full, discarding connection: %s", self.host) # Connection never got put back into the pool, close it. @@ -382,9 +382,8 @@ # AppEngine doesn't have a version attr. http_version = getattr(conn, '_http_vsn_str', 'HTTP/?') - log.debug("\"%s %s %s\" %s %s" % (method, url, http_version, - httplib_response.status, - httplib_response.length)) + log.debug("\"%s %s %s\" %s %s", method, url, http_version, + httplib_response.status, httplib_response.length) try: assert_header_parsing(httplib_response.msg) @@ -622,7 +621,7 @@ if not conn: # Try again log.warning("Retrying (%r) after connection " - "broken by '%r': %s" % (retries, err, url)) + "broken by '%r': %s", retries, err, url) return self.urlopen(method, url, body, headers, retries, redirect, assert_same_host, timeout=timeout, pool_timeout=pool_timeout, @@ -644,7 +643,7 @@ raise return response - log.info("Redirecting %s -> %s" % (url, redirect_location)) + log.info("Redirecting %s -> %s", url, redirect_location) return self.urlopen( method, redirect_location, body, headers, retries=retries, redirect=redirect, @@ -656,7 +655,7 @@ if retries.is_forced_retry(method, status_code=response.status): retries = retries.increment(method, url, response=response, _pool=self) retries.sleep() - log.info("Forced retry: %s" % url) + log.info("Forced retry: %s", url) return self.urlopen( method, url, body, headers, retries=retries, redirect=redirect, @@ -754,8 +753,8 @@ Return a fresh :class:`httplib.HTTPSConnection`. """ self.num_connections += 1 - log.info("Starting new HTTPS connection (%d): %s" - % (self.num_connections, self.host)) + log.info("Starting new HTTPS connection (%d): %s", + self.num_connections, self.host) if not self.ConnectionCls or self.ConnectionCls is DummyConnection: raise SSLError("Can't connect to HTTPS URL because the SSL " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/urllib3/contrib/appengine.py new/urllib3-1.14/urllib3/contrib/appengine.py --- old/urllib3-1.13.1/urllib3/contrib/appengine.py 2015-12-14 22:06:26.000000000 +0100 +++ new/urllib3-1.14/urllib3/contrib/appengine.py 2015-12-29 21:28:18.000000000 +0100 @@ -144,7 +144,7 @@ if retries.is_forced_retry(method, status_code=http_response.status): retries = retries.increment( method, url, response=http_response, _pool=self) - log.info("Forced retry: %s" % url) + log.info("Forced retry: %s", url) retries.sleep() return self.urlopen( method, url, @@ -164,6 +164,14 @@ if content_encoding == 'deflate': del urlfetch_resp.headers['content-encoding'] + transfer_encoding = urlfetch_resp.headers.get('transfer-encoding') + # We have a full response's content, + # so let's make sure we don't report ourselves as chunked data. + if transfer_encoding == 'chunked': + encodings = transfer_encoding.split(",") + encodings.remove('chunked') + urlfetch_resp.headers['transfer-encoding'] = ','.join(encodings) + return HTTPResponse( # In order for decoding to work, we must present the content as # a file-like object. @@ -177,7 +185,7 @@ if timeout is Timeout.DEFAULT_TIMEOUT: return 5 # 5s is the default timeout for URLFetch. if isinstance(timeout, Timeout): - if timeout.read is not timeout.connect: + if timeout._read is not timeout._connect: warnings.warn( "URLFetch does not support granular timeout settings, " "reverting to total timeout.", AppEnginePlatformWarning) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/urllib3/contrib/ntlmpool.py new/urllib3-1.14/urllib3/contrib/ntlmpool.py --- old/urllib3-1.13.1/urllib3/contrib/ntlmpool.py 2015-12-14 22:06:26.000000000 +0100 +++ new/urllib3-1.14/urllib3/contrib/ntlmpool.py 2015-12-29 21:28:18.000000000 +0100 @@ -43,8 +43,8 @@ # Performs the NTLM handshake that secures the connection. The socket # must be kept open while requests are performed. self.num_connections += 1 - log.debug('Starting NTLM HTTPS connection no. %d: https://%s%s' % - (self.num_connections, self.host, self.authurl)) + log.debug('Starting NTLM HTTPS connection no. %d: https://%s%s', + self.num_connections, self.host, self.authurl) headers = {} headers['Connection'] = 'Keep-Alive' @@ -56,13 +56,13 @@ # Send negotiation message headers[req_header] = ( 'NTLM %s' % ntlm.create_NTLM_NEGOTIATE_MESSAGE(self.rawuser)) - log.debug('Request headers: %s' % headers) + log.debug('Request headers: %s', headers) conn.request('GET', self.authurl, None, headers) res = conn.getresponse() reshdr = dict(res.getheaders()) - log.debug('Response status: %s %s' % (res.status, res.reason)) - log.debug('Response headers: %s' % reshdr) - log.debug('Response data: %s [...]' % res.read(100)) + log.debug('Response status: %s %s', res.status, res.reason) + log.debug('Response headers: %s', reshdr) + log.debug('Response data: %s [...]', res.read(100)) # Remove the reference to the socket, so that it can not be closed by # the response object (we want to keep the socket open) @@ -87,12 +87,12 @@ self.pw, NegotiateFlags) headers[req_header] = 'NTLM %s' % auth_msg - log.debug('Request headers: %s' % headers) + log.debug('Request headers: %s', headers) conn.request('GET', self.authurl, None, headers) res = conn.getresponse() - log.debug('Response status: %s %s' % (res.status, res.reason)) - log.debug('Response headers: %s' % dict(res.getheaders())) - log.debug('Response data: %s [...]' % res.read()[:100]) + log.debug('Response status: %s %s', res.status, res.reason) + log.debug('Response headers: %s', dict(res.getheaders())) + log.debug('Response data: %s [...]', res.read()[:100]) if res.status != 200: if res.status == 401: raise Exception('Server rejected request: wrong ' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/urllib3/contrib/socks.py new/urllib3-1.14/urllib3/contrib/socks.py --- old/urllib3-1.13.1/urllib3/contrib/socks.py 1970-01-01 01:00:00.000000000 +0100 +++ new/urllib3-1.14/urllib3/contrib/socks.py 2015-12-29 21:28:18.000000000 +0100 @@ -0,0 +1,172 @@ +# -*- coding: utf-8 -*- +""" +SOCKS support for urllib3 +~~~~~~~~~~~~~~~~~~~~~~~~~ + +This contrib module contains provisional support for SOCKS proxies from within +urllib3. This module supports SOCKS4 (specifically the SOCKS4A variant) and +SOCKS5. To enable its functionality, either install PySocks or install this +module with the ``socks`` extra. + +Known Limitations: + +- Currently PySocks does not support contacting remote websites via literal + IPv6 addresses. Any such connection attempt will fail. +- Currently PySocks does not support IPv6 connections to the SOCKS proxy. Any + such connection attempt will fail. +""" +from __future__ import absolute_import + +try: + import socks +except ImportError: + import warnings + from urllib3.exceptions import DependencyWarning + + warnings.warn(( + 'SOCKS support in urllib3 requires the installation of optional ' + 'dependencies: specifically, PySocks. For more information, see ' + 'https://urllib3.readthedocs.org/en/latest/contrib.html#socks-proxies' + ), + DependencyWarning + ) + raise + +from socket import error as SocketError, timeout as SocketTimeout + +from urllib3.connection import ( + HTTPConnection, HTTPSConnection +) +from urllib3.connectionpool import ( + HTTPConnectionPool, HTTPSConnectionPool +) +from urllib3.exceptions import ConnectTimeoutError, NewConnectionError +from urllib3.poolmanager import PoolManager +from urllib3.util.url import parse_url + +try: + import ssl +except ImportError: + ssl = None + + +class SOCKSConnection(HTTPConnection): + """ + A plain-text HTTP connection that connects via a SOCKS proxy. + """ + def __init__(self, *args, **kwargs): + self._socks_options = kwargs.pop('_socks_options') + super(SOCKSConnection, self).__init__(*args, **kwargs) + + def _new_conn(self): + """ + Establish a new connection via the SOCKS proxy. + """ + extra_kw = {} + if self.source_address: + extra_kw['source_address'] = self.source_address + + if self.socket_options: + extra_kw['socket_options'] = self.socket_options + + try: + conn = socks.create_connection( + (self.host, self.port), + proxy_type=self._socks_options['socks_version'], + proxy_addr=self._socks_options['proxy_host'], + proxy_port=self._socks_options['proxy_port'], + proxy_username=self._socks_options['username'], + proxy_password=self._socks_options['password'], + timeout=self.timeout, + **extra_kw + ) + + except SocketTimeout as e: + raise ConnectTimeoutError( + self, "Connection to %s timed out. (connect timeout=%s)" % + (self.host, self.timeout)) + + except socks.ProxyError as e: + # This is fragile as hell, but it seems to be the only way to raise + # useful errors here. + if e.socket_err: + error = e.socket_err + if isinstance(error, SocketTimeout): + raise ConnectTimeoutError( + self, + "Connection to %s timed out. (connect timeout=%s)" % + (self.host, self.timeout) + ) + else: + raise NewConnectionError( + self, + "Failed to establish a new connection: %s" % error + ) + else: + raise NewConnectionError( + self, + "Failed to establish a new connection: %s" % e + ) + + except SocketError as e: # Defensive: PySocks should catch all these. + raise NewConnectionError( + self, "Failed to establish a new connection: %s" % e) + + return conn + + +# We don't need to duplicate the Verified/Unverified distinction from +# urllib3/connection.py here because the HTTPSConnection will already have been +# correctly set to either the Verified or Unverified form by that module. This +# means the SOCKSHTTPSConnection will automatically be the correct type. +class SOCKSHTTPSConnection(SOCKSConnection, HTTPSConnection): + pass + + +class SOCKSHTTPConnectionPool(HTTPConnectionPool): + ConnectionCls = SOCKSConnection + + +class SOCKSHTTPSConnectionPool(HTTPSConnectionPool): + ConnectionCls = SOCKSHTTPSConnection + + +class SOCKSProxyManager(PoolManager): + """ + A version of the urllib3 ProxyManager that routes connections via the + defined SOCKS proxy. + """ + pool_classes_by_scheme = { + 'http': SOCKSHTTPConnectionPool, + 'https': SOCKSHTTPSConnectionPool, + } + + def __init__(self, proxy_url, username=None, password=None, + num_pools=10, headers=None, **connection_pool_kw): + parsed = parse_url(proxy_url) + + if parsed.scheme == 'socks5': + socks_version = socks.PROXY_TYPE_SOCKS5 + elif parsed.scheme == 'socks4': + socks_version = socks.PROXY_TYPE_SOCKS4 + else: + raise ValueError( + "Unable to determine SOCKS version from %s" % proxy_url + ) + + self.proxy_url = proxy_url + + socks_options = { + 'socks_version': socks_version, + 'proxy_host': parsed.host, + 'proxy_port': parsed.port, + 'username': username, + 'password': password, + } + connection_pool_kw['_socks_options'] = socks_options + + super(SOCKSProxyManager, self).__init__( + num_pools, headers, **connection_pool_kw + ) + + self.pool_classes_by_scheme = SOCKSProxyManager.pool_classes_by_scheme diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/urllib3/exceptions.py new/urllib3-1.14/urllib3/exceptions.py --- old/urllib3-1.13.1/urllib3/exceptions.py 2015-12-14 22:06:26.000000000 +0100 +++ new/urllib3-1.14/urllib3/exceptions.py 2015-12-29 21:28:18.000000000 +0100 @@ -180,6 +180,14 @@ pass +class DependencyWarning(HTTPWarning): + """ + Warned when an attempt is made to import a module with missing optional + dependencies. + """ + pass + + class ResponseNotChunked(ProtocolError, ValueError): "Response needs to be chunked in order to read it as chunks." pass diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/urllib3/poolmanager.py new/urllib3-1.14/urllib3/poolmanager.py --- old/urllib3-1.13.1/urllib3/poolmanager.py 2015-12-14 22:06:26.000000000 +0100 +++ new/urllib3-1.14/urllib3/poolmanager.py 2015-12-29 21:28:18.000000000 +0100 @@ -18,16 +18,16 @@ __all__ = ['PoolManager', 'ProxyManager', 'proxy_from_url'] -pool_classes_by_scheme = { - 'http': HTTPConnectionPool, - 'https': HTTPSConnectionPool, -} - log = logging.getLogger(__name__) SSL_KEYWORDS = ('key_file', 'cert_file', 'cert_reqs', 'ca_certs', 'ssl_version', 'ca_cert_dir') +pool_classes_by_scheme = { + 'http': HTTPConnectionPool, + 'https': HTTPSConnectionPool, +} + class PoolManager(RequestMethods): """ @@ -65,6 +65,9 @@ self.pools = RecentlyUsedContainer(num_pools, dispose_func=lambda p: p.close()) + # Locally set the pool classes so other PoolManagers can override them. + self.pool_classes_by_scheme = pool_classes_by_scheme + def __enter__(self): return self @@ -81,7 +84,7 @@ by :meth:`connection_from_url` and companion methods. It is intended to be overridden for customization. """ - pool_cls = pool_classes_by_scheme[scheme] + pool_cls = self.pool_classes_by_scheme[scheme] kwargs = self.connection_pool_kw if scheme == 'http': kwargs = self.connection_pool_kw.copy() @@ -186,7 +189,7 @@ kw['retries'] = retries kw['redirect'] = redirect - log.info("Redirecting %s -> %s" % (url, redirect_location)) + log.info("Redirecting %s -> %s", url, redirect_location) return self.urlopen(method, redirect_location, **kw) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/urllib3/util/response.py new/urllib3-1.14/urllib3/util/response.py --- old/urllib3-1.13.1/urllib3/util/response.py 2015-12-14 22:06:26.000000000 +0100 +++ new/urllib3-1.14/urllib3/util/response.py 2015-12-29 21:28:18.000000000 +0100 @@ -61,7 +61,7 @@ def is_response_to_head(response): """ - Checks, wether a the request of a response has been a HEAD-request. + Checks whether the request of a response has been a HEAD-request. Handles the quirks of AppEngine. :param conn: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/urllib3/util/retry.py new/urllib3-1.14/urllib3/util/retry.py --- old/urllib3-1.13.1/urllib3/util/retry.py 2015-12-14 22:06:26.000000000 +0100 +++ new/urllib3-1.14/urllib3/util/retry.py 2015-12-29 21:28:18.000000000 +0100 @@ -153,7 +153,7 @@ redirect = bool(redirect) and None new_retries = cls(retries, redirect=redirect) - log.debug("Converted retries value: %r -> %r" % (retries, new_retries)) + log.debug("Converted retries value: %r -> %r", retries, new_retries) return new_retries def get_backoff_time(self): @@ -272,7 +272,7 @@ if new_retry.is_exhausted(): raise MaxRetryError(_pool, url, error or ResponseError(cause)) - log.debug("Incremented Retry for (url='%s'): %r" % (url, new_retry)) + log.debug("Incremented Retry for (url='%s'): %r", url, new_retry) return new_retry diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/urllib3/util/ssl_.py new/urllib3-1.14/urllib3/util/ssl_.py --- old/urllib3-1.13.1/urllib3/util/ssl_.py 2015-12-14 22:06:26.000000000 +0100 +++ new/urllib3-1.14/urllib3/util/ssl_.py 2015-12-29 21:28:18.000000000 +0100 @@ -110,7 +110,7 @@ ) self.ciphers = cipher_suite - def wrap_socket(self, socket, server_hostname=None): + def wrap_socket(self, socket, server_hostname=None, server_side=False): warnings.warn( 'A true SSLContext object is not available. This prevents ' 'urllib3 from configuring SSL appropriately and may cause ' @@ -125,6 +125,7 @@ 'ca_certs': self.ca_certs, 'cert_reqs': self.verify_mode, 'ssl_version': self.protocol, + 'server_side': server_side, } if self.supports_set_ciphers: # Platform-specific: Python 2.7+ return wrap_socket(socket, ciphers=self.ciphers, **kwargs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/urllib3.egg-info/PKG-INFO new/urllib3-1.14/urllib3.egg-info/PKG-INFO --- old/urllib3-1.13.1/urllib3.egg-info/PKG-INFO 2015-12-18 23:47:28.000000000 +0100 +++ new/urllib3-1.14/urllib3.egg-info/PKG-INFO 2015-12-29 21:28:24.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: urllib3 -Version: 1.13.1 +Version: 1.14 Summary: HTTP library with thread-safe connection pooling, file post, and more. Home-page: http://urllib3.readthedocs.org/ Author: Andrey Petrov @@ -156,6 +156,15 @@ Changes ======= + 1.14 (2015-12-29) + +++++++++++++++++ + + * contrib: SOCKS proxy support! (Issue #762) + + * Fixed AppEngine handling of transfer-encoding header and bug + in Timeout defaults checking. (Issue #763) + + 1.13.1 (2015-12-18) +++++++++++++++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/urllib3.egg-info/SOURCES.txt new/urllib3-1.14/urllib3.egg-info/SOURCES.txt --- old/urllib3-1.13.1/urllib3.egg-info/SOURCES.txt 2015-12-18 23:47:28.000000000 +0100 +++ new/urllib3-1.14/urllib3.egg-info/SOURCES.txt 2015-12-29 21:28:24.000000000 +0100 @@ -67,6 +67,7 @@ test/contrib/__init__.py test/contrib/test_gae_manager.py test/contrib/test_pyopenssl.py +test/contrib/test_socks.py test/with_dummyserver/__init__.py test/with_dummyserver/test_connectionpool.py test/with_dummyserver/test_https.py @@ -94,6 +95,7 @@ urllib3/contrib/appengine.py urllib3/contrib/ntlmpool.py urllib3/contrib/pyopenssl.py +urllib3/contrib/socks.py urllib3/packages/__init__.py urllib3/packages/ordered_dict.py urllib3/packages/six.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/urllib3.egg-info/pbr.json new/urllib3-1.14/urllib3.egg-info/pbr.json --- old/urllib3-1.13.1/urllib3.egg-info/pbr.json 2015-12-18 23:47:28.000000000 +0100 +++ new/urllib3-1.14/urllib3.egg-info/pbr.json 2015-12-29 21:28:24.000000000 +0100 @@ -1 +1 @@ -{"is_release": false, "git_version": "12d04b7"} \ No newline at end of file +{"is_release": false, "git_version": "27df29b"} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urllib3-1.13.1/urllib3.egg-info/requires.txt new/urllib3-1.14/urllib3.egg-info/requires.txt --- old/urllib3-1.13.1/urllib3.egg-info/requires.txt 2015-12-18 23:47:28.000000000 +0100 +++ new/urllib3-1.14/urllib3.egg-info/requires.txt 2015-12-29 21:28:24.000000000 +0100 @@ -4,3 +4,6 @@ ndg-httpsclient pyasn1 certifi + +[socks] +PySocks>=1.5.6,<2.0

1 0