openSUSE Commits
Threads by month
- ----- 2024 -----
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
January 2016
- 1 participants
- 1523 discussions
Hello community,
here is the log from the commit of package sssd for openSUSE:Factory checked in at 2016-01-05 14:59:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sssd (Old)
and /work/SRC/openSUSE:Factory/.sssd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sssd"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sssd/sssd.changes 2016-01-04 09:20:06.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.sssd.new/sssd.changes 2016-01-05 15:00:03.000000000 +0100
@@ -2,13 +1,0 @@
-Wed Dec 16 14:08:01 UTC 2015 - jengelh(a)inai.de
-
-- Update to new maintenance release 1.13.3
-* A bug that prevented user lookups and logins after migration from
- winsync to IPA-AD trusts was fixed.
-* A bug that prevented the ignore_group_members option from working
- correctly in AD provider setups that use a dedicated primary
- group (as opposed to a user-private group) was fixed.
-* Offline detection and offline login timeouts were improved for AD
- users logging in from a domain trusted by an IPA server.
-* The AD provider supports setting up autofs_provider=ad .
-
--------------------------------------------------------------------
Old:
----
sssd-1.13.3.tar.gz
sssd-1.13.3.tar.gz.asc
New:
----
sssd-1.13.2.tar.gz
sssd-1.13.2.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sssd.spec ++++++
--- /var/tmp/diff_new_pack.h1hVVD/_old 2016-01-05 15:00:04.000000000 +0100
+++ /var/tmp/diff_new_pack.h1hVVD/_new 2016-01-05 15:00:04.000000000 +0100
@@ -17,7 +17,7 @@
Name: sssd
-Version: 1.13.3
+Version: 1.13.2
Release: 0
Summary: System Security Services Daemon
License: GPL-3.0+ and LGPL-3.0+
++++++ 0001-build-detect-endianness-at-configure-time.patch ++++++
--- /var/tmp/diff_new_pack.h1hVVD/_old 2016-01-05 15:00:04.000000000 +0100
+++ /var/tmp/diff_new_pack.h1hVVD/_new 2016-01-05 15:00:04.000000000 +0100
@@ -8,16 +8,14 @@
Signed-off-by: David Disseldorp <ddiss(a)samba.org>
---
- configure.ac | 3 +++
- 1 file changed, 3 insertions(+)
+ configure.ac | 7 +++++++
+ 1 file changed, 7 insertions(+)
-Index: sssd-1.13.3/configure.ac
-===================================================================
---- sssd-1.13.3.orig/configure.ac
-+++ sssd-1.13.3/configure.ac
-@@ -428,6 +428,9 @@ AM_CONDITIONAL([HAVE_DEVSHM], [test -d /
- ENABLE_POLKIT_RULES_PATH
- AM_CONDITIONAL([HAVE_POLKIT_RULES_D], [test x$HAVE_POLKIT_RULES_D != x])
+--- sssd-1.12.1.orig/configure.ac
++++ sssd-1.12.1/configure.ac
+@@ -322,6 +322,9 @@ AM_CHECK_CMOCKA
+
+ AM_CONDITIONAL([HAVE_DEVSHM], [test -d /dev/shm])
+AC_C_BIGENDIAN([AC_DEFINE(HAVE_BIG_ENDIAN, [1], [whether platform is big endian])],
+ [AC_DEFINE(HAVE_LITTLE_ENDIAN, [1], [whether platform is little endian])])
++++++ sssd-1.13.3.tar.gz -> sssd-1.13.2.tar.gz ++++++
++++ 146316 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package mumble for openSUSE:Factory checked in at 2016-01-05 09:41:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mumble (Old)
and /work/SRC/openSUSE:Factory/.mumble.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mumble"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mumble/mumble.changes 2015-12-21 12:04:24.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mumble.new/mumble.changes 2016-01-05 09:42:00.000000000 +0100
@@ -1,0 +2,15 @@
+Mon Jan 4 14:32:36 UTC 2016 - astieger(a)suse.com
+
+- mumble 1.2.12:
+ * The log would always scroll-to-bottom, even if manually
+ scrolled up to view a previous message. Scroll-to-bottom is now
+ only triggered if the log view has not manually scrolled by the
+ user.
+ * Fixed a bug where a stale overlay client could cause the Mumble
+ UI to freeze under some circumstances.
+ * Fixed a bug where CELT and Opus encoders were not properly
+ reset when using more than one frame per packet in Mumble. This
+ would previously cause noisy artifacts at the beginning of
+ transmissions.
+
+-------------------------------------------------------------------
Old:
----
mumble-1.2.11.tar.gz
mumble-1.2.11.tar.gz.sig
New:
----
mumble-1.2.12.tar.gz
mumble-1.2.12.tar.gz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mumble.spec ++++++
--- /var/tmp/diff_new_pack.fqTLKB/_old 2016-01-05 09:42:01.000000000 +0100
+++ /var/tmp/diff_new_pack.fqTLKB/_new 2016-01-05 09:42:01.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mumble
#
-# 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
@@ -49,7 +49,7 @@
%bcond_with system_celt
%bcond_without system_speex
Name: mumble
-Version: 1.2.11%{?snapshot:_%{snapshot}}
+Version: 1.2.12%{?snapshot:_%{snapshot}}
Release: 0
Summary: Voice Communication Client for Gamers
License: BSD-3-Clause
++++++ mumble-1.2.11.tar.gz -> mumble-1.2.12.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.11/CHANGES new/mumble-1.2.12/CHANGES
--- old/mumble-1.2.11/CHANGES 2015-12-06 04:01:17.000000000 +0100
+++ new/mumble-1.2.12/CHANGES 2015-12-20 12:22:22.000000000 +0100
@@ -1,3 +1,18 @@
+2015-12-20
+ Mikkel Krautz <mikkel(a)krautz.dk>
+ 443d0d2 AudioInput: ensure our encoders are reset correctly when using
+ > 1 frame per packet.
+
+2015-12-10
+ Mikkel Krautz <mikkel(a)krautz.dk>
+ 1a4ae8d LogTextBrowser: move all scroll-to-bottom logic to the
+ LogTextBrowser.
+ 31b68bf Bump version to 1.2.12.
+
+2015-12-06
+ Mikkel Krautz <mikkel(a)krautz.dk>
+ 212a4c0 Update changelog.
+
2015-12-05
Mikkel Krautz <mikkel(a)krautz.dk>
a1a5b10 GlobalShortcut: update help text for marking Mumble trusted
@@ -68,6 +83,10 @@
7b086e8 SSL: add MumbleSSL::defaultOpenSSLCipherString().
0a89171 SSL: implement OpenSSL cipher list format reader.
+2015-04-30
+ Stefan Hacker <dd0t(a)users.sourceforge.net>
+ 1e4e1e1 Prevent OverlayClient destructor from hanging on disconnect
+
2015-03-22
Mikkel Krautz <mikkel(a)krautz.dk>
7efa896 Fix Qt 4 build of mach-override to build both x86 and x86-64
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.11/g15helper/g15helper.plist new/mumble-1.2.12/g15helper/g15helper.plist
--- old/mumble-1.2.11/g15helper/g15helper.plist 2015-12-06 04:01:17.000000000 +0100
+++ new/mumble-1.2.12/g15helper/g15helper.plist 2015-12-20 12:22:22.000000000 +0100
@@ -13,7 +13,7 @@
<key>CFBundleSignature</key>
<string>G15H</string>
<key>CFBundleVersion</key>
- <string>1.2.11</string>
+ <string>1.2.12</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright (c) 2009 Mikkel Krautz <mikkel(a)krautz.dk></string>
</dict>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.11/g15helper/g15helper.rc new/mumble-1.2.12/g15helper/g15helper.rc
--- old/mumble-1.2.11/g15helper/g15helper.rc 2015-12-06 04:01:17.000000000 +0100
+++ new/mumble-1.2.12/g15helper/g15helper.rc 2015-12-20 12:22:22.000000000 +0100
@@ -15,8 +15,8 @@
#endif
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,11,0
- PRODUCTVERSION 1,2,11,0
+ FILEVERSION 1,2,12,0
+ PRODUCTVERSION 1,2,12,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS (VER_DEBUG|VER_RELEASE)
FILEOS VOS_NT_WINDOWS32
@@ -29,8 +29,8 @@
BEGIN
VALUE "CompanyName", "Mikkel Krautz"
VALUE "FileDescription", "Mumble G15 LCD Helper"
- VALUE "FileVersion", "1.2.11"
- VALUE "ProductVersion", "1.2.11"
+ VALUE "FileVersion", "1.2.12"
+ VALUE "ProductVersion", "1.2.12"
VALUE "LegalCopyright", "Copyright (C) 2008-2011, Mikkel Krautz <mikkel(a)krautz.dk>"
VALUE "OriginalFilename", "mumble-g15-helper.exe"
VALUE "ProductName", "Mumble G15 LCD Helper"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.11/macx/common.pri new/mumble-1.2.12/macx/common.pri
--- old/mumble-1.2.11/macx/common.pri 2015-12-06 04:01:17.000000000 +0100
+++ new/mumble-1.2.12/macx/common.pri 2015-12-20 12:22:22.000000000 +0100
@@ -1,6 +1,6 @@
# Common OSX overlay settings.
-VERSION = 1.2.11
+VERSION = 1.2.12
DEFINES *= VERSION=\\\"$$VERSION\\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.11/macx/osax/osax.plist new/mumble-1.2.12/macx/osax/osax.plist
--- old/mumble-1.2.11/macx/osax/osax.plist 2015-12-06 04:01:17.000000000 +0100
+++ new/mumble-1.2.12/macx/osax/osax.plist 2015-12-20 12:22:22.000000000 +0100
@@ -13,7 +13,7 @@
<key>CFBundlePackageType</key>
<string>osax</string>
<key>CFbundleVersion</key>
- <string>1.2.11</string>
+ <string>1.2.12</string>
<key>CFBundleSignature</key>
<string>MUOL</string>
<key>CSResourcesFileMapped</key>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.11/overlay/overlay.pro new/mumble-1.2.12/overlay/overlay.pro
--- old/mumble-1.2.11/overlay/overlay.pro 2015-12-06 04:01:17.000000000 +0100
+++ new/mumble-1.2.12/overlay/overlay.pro 2015-12-20 12:22:22.000000000 +0100
@@ -1,6 +1,6 @@
include (../compiler.pri)
-VERSION = 1.2.11
+VERSION = 1.2.12
TARGET_EXT = .dll
TEMPLATE = lib
CONFIG -= qt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.11/overlay_gl/overlay_gl.pro new/mumble-1.2.12/overlay_gl/overlay_gl.pro
--- old/mumble-1.2.11/overlay_gl/overlay_gl.pro 2015-12-06 04:01:17.000000000 +0100
+++ new/mumble-1.2.12/overlay_gl/overlay_gl.pro 2015-12-20 12:22:22.000000000 +0100
@@ -5,7 +5,7 @@
CONFIG -= qt
CONFIG *= debug_and_release
TARGET = mumble$(TARGET_ADD)
-VERSION = 1.2.11
+VERSION = 1.2.12
SOURCES = overlay.c
LIBS *= -lrt -ldl
QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.11/src/Version.h new/mumble-1.2.12/src/Version.h
--- old/mumble-1.2.11/src/Version.h 2015-12-06 04:01:17.000000000 +0100
+++ new/mumble-1.2.12/src/Version.h 2015-12-20 12:22:22.000000000 +0100
@@ -36,7 +36,7 @@
#define MUMTEXT(X) MUMXTEXT(X)
#ifndef MUMBLE_VERSION
-#define MUMBLE_VERSION 1.2.11
+#define MUMBLE_VERSION 1.2.12
#endif
#ifndef MUMBLE_VERSION
#define MUMBLE_RELEASE "Compiled " __DATE__ " " __TIME__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.11/src/mumble/AudioInput.cpp new/mumble-1.2.12/src/mumble/AudioInput.cpp
--- old/mumble-1.2.11/src/mumble/AudioInput.cpp 2015-12-06 04:01:17.000000000 +0100
+++ new/mumble-1.2.12/src/mumble/AudioInput.cpp 2015-12-20 12:22:22.000000000 +0100
@@ -144,6 +144,8 @@
bPreviousVoice = false;
+ bResetEncoder = true;
+
pfMicInput = pfEchoInput = pfOutput = NULL;
iBitrate = 0;
@@ -594,6 +596,8 @@
sesEcho = NULL;
}
+ bResetEncoder = true;
+
bResetProcessor = false;
}
@@ -675,8 +679,10 @@
int AudioInput::encodeOpusFrame(short *source, int size, unsigned char *buffer) {
int len = 0;
#ifdef USE_OPUS
- if (!bPreviousVoice)
+ if (bResetEncoder) {
opus_encoder_ctl(opusState, OPUS_RESET_STATE, NULL);
+ bResetEncoder = false;
+ }
opus_encoder_ctl(opusState, OPUS_SET_BITRATE(iAudioQuality));
@@ -692,8 +698,10 @@
if (!cCodec)
return len;
- if (!bPreviousVoice)
+ if (bResetEncoder) {
cCodec->celt_encoder_ctl(ceEncoder, CELT_RESET_STATE);
+ bResetEncoder = false;
+ }
cCodec->celt_encoder_ctl(ceEncoder, CELT_SET_PREDICTION(0));
@@ -841,6 +849,10 @@
speex_preprocess_ctl(sppPreprocess, SPEEX_PREPROCESS_SET_AGC_INCREMENT, &increment);
}
+ if (bIsSpeech && !bPreviousVoice) {
+ bResetEncoder = true;
+ }
+
tIdle.restart();
unsigned char buffer[512];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.11/src/mumble/AudioInput.h new/mumble-1.2.12/src/mumble/AudioInput.h
--- old/mumble-1.2.11/src/mumble/AudioInput.h 2015-12-06 04:01:17.000000000 +0100
+++ new/mumble-1.2.12/src/mumble/AudioInput.h 2015-12-20 12:22:22.000000000 +0100
@@ -122,6 +122,11 @@
CELTCodec *cCodec;
CELTEncoder *ceEncoder;
+ /// bResetEncoder is a flag that notifies
+ /// our encoder functions that the encoder
+ /// needs to be reset.
+ bool bResetEncoder;
+
int iAudioQuality;
int iAudioFrames;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.11/src/mumble/CustomElements.cpp new/mumble-1.2.12/src/mumble/CustomElements.cpp
--- old/mumble-1.2.11/src/mumble/CustomElements.cpp 2015-12-06 04:01:17.000000000 +0100
+++ new/mumble-1.2.12/src/mumble/CustomElements.cpp 2015-12-20 12:22:22.000000000 +0100
@@ -39,36 +39,72 @@
#include "Log.h"
-LogTextBrowser::LogTextBrowser(QWidget *p) : QTextBrowser(p) {}
+LogTextBrowser::LogTextBrowser(QWidget *p)
+ : m_pos(0)
+ , m_scrollToBottom(true)
+ , QTextBrowser(p) {
+
+ connect(verticalScrollBar(), SIGNAL(sliderMoved(int)), SLOT(verticalScrollBarMoved(int)));
+ connect(verticalScrollBar(), SIGNAL(actionTriggered(int)), SLOT(verticalScrollBarActionTriggered(int)));
+ connect(verticalScrollBar(), SIGNAL(rangeChanged(int, int)), SLOT(verticalScrollBarRangeChanged(int, int)));
+}
void LogTextBrowser::resizeEvent(QResizeEvent *e) {
- scrollLogToBottom();
+ // Scroll to the bottom of the log view on resize.
+ m_pos = 0;
+ m_scrollToBottom = true;
+ updateScrollPosition();
+
QTextBrowser::resizeEvent(e);
}
bool LogTextBrowser::event(QEvent *e) {
if (e->type() == LogDocumentResourceAddedEvent::Type) {
- scrollLogToBottom();
+ updateScrollPosition();
}
return QTextBrowser::event(e);
}
-int LogTextBrowser::getLogScroll() {
- return verticalScrollBar()->value();
+/// Update the scroll position based on the current
+/// state of the scroll bar. If the scrollbar has been
+/// scrolled to the bottom by the user (or has not been
+/// moved at all by the user), it will always scroll to
+/// the bottom automatically. Otherwise, it will keep the
+/// position the user last put it at.
+void LogTextBrowser::updateScrollPosition() {
+ if (m_scrollToBottom) {
+ verticalScrollBar()->setValue(verticalScrollBar()->maximum());
+ } else {
+ verticalScrollBar()->setValue(m_pos);
+ }
}
-int LogTextBrowser::getLogScrollMaximum() {
- return verticalScrollBar()->maximum();
+/// updateUserScrollState updates the current scroll
+/// state. This method should only be called when a
+/// user changes the scrollbar's position.
+void LogTextBrowser::updateUserScrollState() {
+ QScrollBar *scrollBar = verticalScrollBar();
+ int curpos = scrollBar->sliderPosition();
+ int max = scrollBar->maximum();
+ if (curpos >= max) {
+ m_scrollToBottom = true;
+ } else {
+ m_scrollToBottom = false;
+ }
+ m_pos = curpos;
}
-void LogTextBrowser::setLogScroll(int pos) {
- verticalScrollBar()->setValue(pos);
+void LogTextBrowser::verticalScrollBarMoved(int) {
+ updateUserScrollState();
}
-void LogTextBrowser::scrollLogToBottom() {
- verticalScrollBar()->setValue(verticalScrollBar()->maximum());
+void LogTextBrowser::verticalScrollBarActionTriggered(int) {
+ updateUserScrollState();
}
+void LogTextBrowser::verticalScrollBarRangeChanged(int, int) {
+ updateScrollPosition();
+}
/*!
\fn int ChatbarTextEdit::completeAtCursor()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.11/src/mumble/CustomElements.h new/mumble-1.2.12/src/mumble/CustomElements.h
--- old/mumble-1.2.11/src/mumble/CustomElements.h 2015-12-06 04:01:17.000000000 +0100
+++ new/mumble-1.2.12/src/mumble/CustomElements.h 2015-12-20 12:22:22.000000000 +0100
@@ -42,15 +42,18 @@
Q_OBJECT
Q_DISABLE_COPY(LogTextBrowser)
protected:
+ int m_pos;
+ bool m_scrollToBottom;
+ void updateUserScrollState();
virtual void resizeEvent(QResizeEvent *e);
virtual bool event(QEvent *e);
+ protected slots:
+ void verticalScrollBarMoved(int pos);
+ void verticalScrollBarActionTriggered(int action);
+ void verticalScrollBarRangeChanged(int min, int max);
public:
LogTextBrowser(QWidget *p = NULL);
-
- int getLogScroll();
- int getLogScrollMaximum();
- void setLogScroll(int pos);
- void scrollLogToBottom();
+ void updateScrollPosition();
};
class ChatbarTextEdit : public QTextEdit {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.11/src/mumble/Log.cpp new/mumble-1.2.12/src/mumble/Log.cpp
--- old/mumble-1.2.11/src/mumble/Log.cpp 2015-12-06 04:01:17.000000000 +0100
+++ new/mumble-1.2.12/src/mumble/Log.cpp 2015-12-20 12:22:22.000000000 +0100
@@ -441,8 +441,6 @@
QTextCursor tc = g.mw->qteLog->textCursor();
LogTextBrowser *tlog = g.mw->qteLog;
- const int oldscrollvalue = tlog->getLogScroll();
- const bool scroll = (oldscrollvalue == tlog->getLogScrollMaximum());
tc.movePosition(QTextCursor::End);
@@ -467,10 +465,7 @@
tc.movePosition(QTextCursor::End);
g.mw->qteLog->setTextCursor(tc);
- if (scroll || ownMessage)
- tlog->scrollLogToBottom();
- else
- tlog->setLogScroll(oldscrollvalue);
+ tlog->updateScrollPosition();
}
if (!g.s.bTTSMessageReadBack && ownMessage)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.11/src/mumble/OverlayClient.cpp new/mumble-1.2.12/src/mumble/OverlayClient.cpp
--- old/mumble-1.2.11/src/mumble/OverlayClient.cpp 2015-12-06 04:01:17.000000000 +0100
+++ new/mumble-1.2.12/src/mumble/OverlayClient.cpp 2015-12-20 12:22:22.000000000 +0100
@@ -90,8 +90,12 @@
delete qgpiCursor;
delete qgpiLogo;
- qlsSocket->disconnect();
- qlsSocket->abort();
+ qlsSocket->disconnectFromServer();
+ if (!qlsSocket->waitForDisconnected(1000)) {
+ qDebug() << "OverlayClient: Failed to cleanly disconnect: " << qlsSocket->errorString();
+ qlsSocket->abort();
+ }
+
qlsSocket->deleteLater();
ougUsers.reset();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.11/src/mumble/mumble.plist new/mumble-1.2.12/src/mumble/mumble.plist
--- old/mumble-1.2.11/src/mumble/mumble.plist 2015-12-06 04:01:17.000000000 +0100
+++ new/mumble-1.2.12/src/mumble/mumble.plist 2015-12-20 12:22:22.000000000 +0100
@@ -26,7 +26,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>1.2.11</string>
+ <string>1.2.12</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright (c) 2005-2010 Thorvald Natvig <slicer(a)users.sourceforge.net></string>
</dict>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.11/src/mumble/mumble.rc new/mumble-1.2.12/src/mumble/mumble.rc
--- old/mumble-1.2.11/src/mumble/mumble.rc 2015-12-06 04:01:17.000000000 +0100
+++ new/mumble-1.2.12/src/mumble/mumble.rc 2015-12-20 12:22:22.000000000 +0100
@@ -15,8 +15,8 @@
#endif
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,11,0
- PRODUCTVERSION 1,2,11,0
+ FILEVERSION 1,2,12,0
+ PRODUCTVERSION 1,2,12,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS (VER_DEBUG|VER_RELEASE)
FILEOS VOS_NT_WINDOWS32
@@ -29,8 +29,8 @@
BEGIN
VALUE "CompanyName", "Thorvald Natvig"
VALUE "FileDescription", "Mumble - Low-latency VoIP client"
- VALUE "FileVersion", "1.2.11"
- VALUE "ProductVersion", "1.2.11"
+ VALUE "FileVersion", "1.2.12"
+ VALUE "ProductVersion", "1.2.12"
VALUE "LegalCopyright", "Copyright (C) 2005-2011, Thorvald Natvig <thorvald(a)natvig.com>"
VALUE "OriginalFilename", "mumble.exe"
VALUE "ProductName", "Mumble"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.11/src/mumble.pri new/mumble-1.2.12/src/mumble.pri
--- old/mumble-1.2.11/src/mumble.pri 2015-12-06 04:01:17.000000000 +0100
+++ new/mumble-1.2.12/src/mumble.pri 2015-12-20 12:22:22.000000000 +0100
@@ -1,6 +1,6 @@
include(../compiler.pri)
-VERSION = 1.2.11
+VERSION = 1.2.12
DIST = mumble.pri Message.h PacketDataStream.h CryptState.h Timer.h Version.h OSInfo.h SSL.h Mumble.proto
CONFIG += qt thread debug_and_release warn_on
DEFINES *= MUMBLE_VERSION_STRING=$$VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.11/src/murmur/murmur.plist new/mumble-1.2.12/src/murmur/murmur.plist
--- old/mumble-1.2.11/src/murmur/murmur.plist 2015-12-06 04:01:17.000000000 +0100
+++ new/mumble-1.2.12/src/murmur/murmur.plist 2015-12-20 12:22:22.000000000 +0100
@@ -13,7 +13,7 @@
<key>CFBundleSignature</key>
<string>MMUR</string>
<key>CFBundleVersion</key>
- <string>1.2.11</string>
+ <string>1.2.12</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright (c) 2005-2010 Thorvald Natvig <slicer(a)users.sourceforge.net></string>
</dict>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mumble-1.2.11/src/murmur/murmur.rc new/mumble-1.2.12/src/murmur/murmur.rc
--- old/mumble-1.2.11/src/murmur/murmur.rc 2015-12-06 04:01:17.000000000 +0100
+++ new/mumble-1.2.12/src/murmur/murmur.rc 2015-12-20 12:22:22.000000000 +0100
@@ -15,8 +15,8 @@
#endif
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,11,0
- PRODUCTVERSION 1,2,11,0
+ FILEVERSION 1,2,12,0
+ PRODUCTVERSION 1,2,12,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS (VER_DEBUG|VER_RELEASE)
FILEOS VOS_NT_WINDOWS32
@@ -29,8 +29,8 @@
BEGIN
VALUE "CompanyName", "Thorvald Natvig"
VALUE "FileDescription", "Murmur - Low-latency VoIP server"
- VALUE "FileVersion", "1.2.11"
- VALUE "ProductVersion", "1.2.11"
+ VALUE "FileVersion", "1.2.12"
+ VALUE "ProductVersion", "1.2.12"
VALUE "LegalCopyright", "Copyright (C) 2005-2011, Thorvald Natvig <thorvald(a)natvig.com>"
VALUE "OriginalFilename", "murmur.exe"
VALUE "ProductName", "Mumble"
1
0
Hello community,
here is the log from the commit of package yast2-firstboot for openSUSE:Factory checked in at 2016-01-05 09:41:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-firstboot (Old)
and /work/SRC/openSUSE:Factory/.yast2-firstboot.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-firstboot"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-firstboot/yast2-firstboot.changes 2015-10-20 00:05:58.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-firstboot.new/yast2-firstboot.changes 2016-01-05 09:41:59.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Jan 4 12:50:27 UTC 2016 - ancor(a)suse.com
+
+- Fixed firstboot.xml to call the correct client for LAN
+ configuration (bsc#960081)
+- 3.1.11
+
+-------------------------------------------------------------------
Old:
----
yast2-firstboot-3.1.10.tar.bz2
New:
----
yast2-firstboot-3.1.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-firstboot.spec ++++++
--- /var/tmp/diff_new_pack.6FYG29/_old 2016-01-05 09:41:59.000000000 +0100
+++ /var/tmp/diff_new_pack.6FYG29/_new 2016-01-05 09:41:59.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-firstboot
#
-# 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: yast2-firstboot
-Version: 3.1.10
+Version: 3.1.11
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-firstboot-3.1.10.tar.bz2 -> yast2-firstboot-3.1.11.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-3.1.10/README.md new/yast2-firstboot-3.1.11/README.md
--- old/yast2-firstboot-3.1.10/README.md 2015-10-16 15:27:11.000000000 +0200
+++ new/yast2-firstboot-3.1.11/README.md 2016-01-04 15:42:10.000000000 +0100
@@ -1,5 +1,58 @@
-# YaST - The Firstboot Module #
+YaST - System Configuration at First-Boot
+=========================================
[![Travis Build](https://travis-ci.org/yast/yast-firstboot.svg?branch=master)](https:…
[![Jenkins Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-firstboot…
+Description
+===========
+
+This is a special YaST module that allows users to configure pre-installed
+systems to match their needs, e.g., language, network settings, root password,
+etc.
+
+The workflow is defined in a
+[control file](control/firstboot.xml),
+which uses the same format as the
+[Installer control file](https://github.com/yast/yast-installation/blob/master/doc/control-fil….
+The default control file can be found in
+[control directory](control).
+
+More subject-specific pieces of information can be found in the [doc](doc)
+directory.
+
+Development
+===========
+
+This module is developed as part of YaST. See the
+[development documentation](http://yastgithubio.readthedocs.org/en/latest/development/).
+
+Getting the Sources
+===================
+
+To get the source code, clone the GitHub repository:
+
+ $ git clone https://github.com/yast/yast-firstboot.git
+
+If you want to contribute into the project you can
+[fork](https://help.github.com/articles/fork-a-repo/) the repository and clone your fork.
+
+Testing Environment
+===================
+
+##To test your first-boot workflow
+
+1. Install yast2-firstboot package from media or directly from sources at GitHub
+2. Copy your firstboot control file to /etc/YaST2/firstboot.xml
+3. Enable first boot at startup `sudo systemctl enable YaST2-Firstboot.service`
+4. Make sure this file exists `sudo touch /var/lib/YaST2/reconfig_system`
+5. Reboot the system
+6. While booting again, YaST2-Firstboot service checks for existence of
+ /var/lib/YaST2/reconfig_system and starts the configuration workflow
+
+Contact
+=======
+
+If you have any question, feel free to ask at the [development mailing
+list](http://lists.opensuse.org/yast-devel/) or at the
+[#yast](https://webchat.freenode.net/?channels=%23yast) IRC channel on freenode.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-3.1.10/control/firstboot.xml new/yast2-firstboot-3.1.11/control/firstboot.xml
--- old/yast2-firstboot-3.1.10/control/firstboot.xml 2015-10-16 15:27:11.000000000 +0200
+++ new/yast2-firstboot-3.1.11/control/firstboot.xml 2016-01-04 15:42:10.000000000 +0100
@@ -70,15 +70,6 @@
<proposal_module>printer</proposal_module>
</proposal_modules>
</proposal>
- <proposal>
- <name>firstboot_network</name>
- <mode>installation</mode>
- <stage>firstboot</stage>
- <label>Network Configuration</label>
- <proposal_modules config:type="list">
- <proposal_module>lan</proposal_module>
- </proposal_modules>
- </proposal>
</proposals>
<workflows config:type="list">
<workflow>
@@ -147,9 +138,8 @@
</module>
<module>
<label>Network</label>
- <name>inst_proposal</name>
+ <name>inst_lan</name>
<enabled config:type="boolean">false</enabled>
- <proposal>firstboot_network</proposal>
</module>
<module>
<label>Automatic Configuration</label>
@@ -173,9 +163,8 @@
</module>
<module>
<label>Network</label>
- <name>inst_proposal</name>
+ <name>inst_lan</name>
<enabled config:type="boolean">false</enabled>
- <proposal>firstboot_network</proposal>
</module>
<module>
<label>Root Password</label>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-3.1.10/package/yast2-firstboot.changes new/yast2-firstboot-3.1.11/package/yast2-firstboot.changes
--- old/yast2-firstboot-3.1.10/package/yast2-firstboot.changes 2015-10-16 15:27:11.000000000 +0200
+++ new/yast2-firstboot-3.1.11/package/yast2-firstboot.changes 2016-01-04 15:42:10.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Jan 4 12:50:27 UTC 2016 - ancor(a)suse.com
+
+- Fixed firstboot.xml to call the correct client for LAN
+ configuration (bsc#960081)
+- 3.1.11
+
+-------------------------------------------------------------------
Fri Oct 16 12:21:01 UTC 2015 - ancor(a)suse.com
- Fixed to always use the configured keyboard layout (bsc#950335)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-3.1.10/package/yast2-firstboot.spec new/yast2-firstboot-3.1.11/package/yast2-firstboot.spec
--- old/yast2-firstboot-3.1.10/package/yast2-firstboot.spec 2015-10-16 15:27:11.000000000 +0200
+++ new/yast2-firstboot-3.1.11/package/yast2-firstboot.spec 2016-01-04 15:42:10.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-firstboot
-Version: 3.1.10
+Version: 3.1.11
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
1
0
Hello community,
here is the log from the commit of package python-pyinotify for openSUSE:Factory checked in at 2016-01-05 09:41:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pyinotify (Old)
and /work/SRC/openSUSE:Factory/.python-pyinotify.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pyinotify"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pyinotify/python-pyinotify.changes 2015-05-16 19:01:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-pyinotify.new/python-pyinotify.changes 2016-01-05 09:41:57.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Jan 4 14:35:03 UTC 2016 - dmueller(a)suse.com
+
+- update to 0.9.6:
+ * fixes for sysctl compatibility issues
+
+-------------------------------------------------------------------
Old:
----
pyinotify-0.9.5.tar.gz
New:
----
pyinotify-0.9.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pyinotify.spec ++++++
--- /var/tmp/diff_new_pack.Qp7HT4/_old 2016-01-05 09:41:58.000000000 +0100
+++ /var/tmp/diff_new_pack.Qp7HT4/_new 2016-01-05 09:41:58.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-pyinotify
#
-# 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: python-pyinotify
-Version: 0.9.5
+Version: 0.9.6
Release: 0
Summary: Python module for watching filesystems changes
License: MIT
++++++ pyinotify-0.9.5.tar.gz -> pyinotify-0.9.6.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyinotify-0.9.5/PKG-INFO new/pyinotify-0.9.6/PKG-INFO
--- old/pyinotify-0.9.5/PKG-INFO 2015-01-09 22:49:28.000000000 +0100
+++ new/pyinotify-0.9.6/PKG-INFO 2015-06-04 17:50:19.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: pyinotify
-Version: 0.9.5
+Version: 0.9.6
Summary: Linux filesystem events monitoring
Home-page: http://github.com/seb-m/pyinotify
Author: Sebastien Martini
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyinotify-0.9.5/python2/pyinotify.egg-info/PKG-INFO new/pyinotify-0.9.6/python2/pyinotify.egg-info/PKG-INFO
--- old/pyinotify-0.9.5/python2/pyinotify.egg-info/PKG-INFO 2015-01-09 22:49:27.000000000 +0100
+++ new/pyinotify-0.9.6/python2/pyinotify.egg-info/PKG-INFO 1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-Metadata-Version: 1.1
-Name: pyinotify
-Version: 0.9.5
-Summary: Linux filesystem events monitoring
-Home-page: http://github.com/seb-m/pyinotify
-Author: Sebastien Martini
-Author-email: seb(a)dbzteam.org
-License: MIT License
-Download-URL: http://pypi.python.org/pypi/pyinotify
-Description: UNKNOWN
-Platform: Linux
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Console
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Natural Language :: English
-Classifier: Operating System :: POSIX :: Linux
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2.4
-Classifier: Programming Language :: Python :: 2.5
-Classifier: Programming Language :: Python :: 2.6
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.0
-Classifier: Programming Language :: Python :: 3.1
-Classifier: Programming Language :: Python :: 3.2
-Classifier: Programming Language :: Python :: 3.3
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Topic :: System :: Filesystems
-Classifier: Topic :: System :: Monitoring
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyinotify-0.9.5/python2/pyinotify.egg-info/SOURCES.txt new/pyinotify-0.9.6/python2/pyinotify.egg-info/SOURCES.txt
--- old/pyinotify-0.9.5/python2/pyinotify.egg-info/SOURCES.txt 2015-01-09 22:49:28.000000000 +0100
+++ new/pyinotify-0.9.6/python2/pyinotify.egg-info/SOURCES.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-ACKS
-COPYING
-MANIFEST.in
-README.md
-setup.py
-common/inotify_syscalls.c
-old/ChangeLog
-old/NEWS
-python2/Makefile
-python2/pyinotify.py
-python2/examples/autocompile.py
-python2/examples/chain.py
-python2/examples/coalesce.py
-python2/examples/daemon.py
-python2/examples/exclude.lst
-python2/examples/exclude.py
-python2/examples/loop.py
-python2/examples/not_quiet.py
-python2/examples/stats.py
-python2/examples/stats_threaded.py
-python2/examples/tornado_notifier.py
-python2/examples/transient_file.py
-python2/examples/transient_file.sh
-python2/examples/tutorial_asyncnotifier.py
-python2/examples/tutorial_notifier.py
-python2/examples/tutorial_threadednotifier.py
-python2/examples/unicode.py
-python2/pyinotify.egg-info/PKG-INFO
-python2/pyinotify.egg-info/SOURCES.txt
-python2/pyinotify.egg-info/dependency_links.txt
-python2/pyinotify.egg-info/top_level.txt
-python3/Makefile
-python3/pyinotify.py
-python3/examples/asyncio_notifier.py
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyinotify-0.9.5/python2/pyinotify.egg-info/dependency_links.txt new/pyinotify-0.9.6/python2/pyinotify.egg-info/dependency_links.txt
--- old/pyinotify-0.9.5/python2/pyinotify.egg-info/dependency_links.txt 2015-01-09 22:49:27.000000000 +0100
+++ new/pyinotify-0.9.6/python2/pyinotify.egg-info/dependency_links.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyinotify-0.9.5/python2/pyinotify.egg-info/top_level.txt new/pyinotify-0.9.6/python2/pyinotify.egg-info/top_level.txt
--- old/pyinotify-0.9.5/python2/pyinotify.egg-info/top_level.txt 2015-01-09 22:49:27.000000000 +0100
+++ new/pyinotify-0.9.6/python2/pyinotify.egg-info/top_level.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-pyinotify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyinotify-0.9.5/python2/pyinotify.py new/pyinotify-0.9.6/python2/pyinotify.py
--- old/pyinotify-0.9.5/python2/pyinotify.py 2015-01-09 22:13:04.000000000 +0100
+++ new/pyinotify-0.9.6/python2/pyinotify.py 2015-06-04 17:34:41.000000000 +0200
@@ -95,7 +95,7 @@
__author__ = "seb(a)dbzteam.org (Sebastien Martini)"
-__version__ = "0.9.5"
+__version__ = "0.9.6"
__metaclass__ = type # Use new-style classes by default
@@ -258,10 +258,6 @@
assert self._libc is not None
return self._libc.inotify_rm_watch(fd, wd)
- def _sysctl(self, *args):
- assert self._libc is not None
- return self._libc.sysctl(*args)
-
# Logging
def logger_init():
@@ -278,97 +274,65 @@
# inotify's variables
-class SysCtlINotify:
+class ProcINotify:
"""
- Access (read, write) inotify's variables through sysctl. Usually it
- requires administrator rights to update them.
+ Access (read, write) inotify's variables through /proc/sys/. Note that
+ usually it requires administrator rights to update them.
Examples:
- Read max_queued_events attribute: myvar = max_queued_events.value
- Update max_queued_events attribute: max_queued_events.value = 42
"""
-
- inotify_attrs = {'max_user_instances': 1,
- 'max_user_watches': 2,
- 'max_queued_events': 3}
-
- def __init__(self, attrname, inotify_wrapper):
- # FIXME: right now only supporting ctypes
- assert ctypes
- self._attrname = attrname
- self._inotify_wrapper = inotify_wrapper
- sino = ctypes.c_int * 3
- self._attr = sino(5, 20, SysCtlINotify.inotify_attrs[attrname])
-
- @staticmethod
- def create(attrname):
- """
- Factory method instanciating and returning the right wrapper.
- """
- # FIXME: right now only supporting ctypes
- if ctypes is None:
- return None
- inotify_wrapper = _CtypesLibcINotifyWrapper()
- if not inotify_wrapper.init():
- return None
- return SysCtlINotify(attrname, inotify_wrapper)
+ def __init__(self, attr):
+ self._base = "/proc/sys/fs/inotify"
+ self._attr = attr
def get_val(self):
"""
- Gets attribute's value. Raises OSError if the operation failed.
+ Gets attribute's value.
@return: stored value.
@rtype: int
+ @raise IOError: if corresponding file in /proc/sys cannot be read.
"""
- oldv = ctypes.c_int(0)
- size = ctypes.c_int(ctypes.sizeof(oldv))
- sysctl = self._inotify_wrapper._sysctl
- res = sysctl(self._attr, 3,
- ctypes.c_voidp(ctypes.addressof(oldv)),
- ctypes.addressof(size),
- None, 0)
- if res == -1:
- raise OSError(self._inotify_wrapper.get_errno(),
- self._inotify_wrapper.str_errno())
- return oldv.value
+ file_obj = file(os.path.join(self._base, self._attr), 'r')
+ try:
+ val = int(file_obj.readline())
+ finally:
+ file_obj.close()
+ return val
def set_val(self, nval):
"""
- Sets new attribute's value. Raises OSError if the operation failed.
+ Sets new attribute's value.
@param nval: replaces current value by nval.
@type nval: int
+ @raise IOError: if corresponding file in /proc/sys cannot be written.
"""
- oldv = ctypes.c_int(0)
- sizeo = ctypes.c_int(ctypes.sizeof(oldv))
- newv = ctypes.c_int(nval)
- sizen = ctypes.c_int(ctypes.sizeof(newv))
- sysctl = self._inotify_wrapper._sysctl
- res = sysctl(self._attr, 3,
- ctypes.c_voidp(ctypes.addressof(oldv)),
- ctypes.addressof(sizeo),
- ctypes.c_voidp(ctypes.addressof(newv)),
- sizen)
- if res == -1:
- raise OSError(self._inotify_wrapper.get_errno(),
- self._inotify_wrapper.str_errno())
+ file_obj = file(os.path.join(self._base, self._attr), 'w')
+ try:
+ file_obj.write(str(nval) + '\n')
+ finally:
+ file_obj.close()
value = property(get_val, set_val)
def __repr__(self):
- return '<%s=%d>' % (self._attrname, self.get_val())
+ return '<%s=%d>' % (self._attr, self.get_val())
# Inotify's variables
#
-# FIXME: currently these variables are only accessible when ctypes is used,
-# otherwise there are set to None.
+# Note: may raise IOError if the corresponding value in /proc/sys
+# cannot be accessed.
#
-# read: myvar = max_queued_events.value
-# update: max_queued_events.value = 42
+# Examples:
+# - read: myvar = max_queued_events.value
+# - update: max_queued_events.value = 42
#
for attrname in ('max_queued_events', 'max_user_instances', 'max_user_watches'):
- globals()[attrname] = SysCtlINotify.create(attrname)
+ globals()[attrname] = ProcINotify(attrname)
class EventsCodes:
@@ -1149,8 +1113,8 @@
@type default_proc_fun: instance of ProcessEvent
@param read_freq: if read_freq == 0, events are read asap,
if read_freq is > 0, this thread sleeps
- max(0, read_freq - timeout) seconds. But if
- timeout is None it may be different because
+ max(0, read_freq - (timeout / 1000)) seconds. But
+ if timeout is None it may be different because
poll is blocking waiting for something to read.
@type read_freq: int
@param threshold: File descriptor will be read only if the accumulated
@@ -1161,8 +1125,9 @@
until the amount of events to read is >= threshold.
At least with read_freq set you might sleep.
@type threshold: int
- @param timeout:
- https://docs.python.org/3/library/select.html#polling-objects
+ @param timeout: see read_freq above. If provided, it must be set in
+ milliseconds. See
+ https://docs.python.org/2/library/select.html#polling-objects
@type timeout: int
"""
# Watch Manager instance
@@ -1228,7 +1193,8 @@
milliseconds.
@param timeout: If specified it overrides the corresponding instance
- attribute _timeout.
+ attribute _timeout. timeout must be sepcified in
+ milliseconds.
@type timeout: int
@return: New events to read.
@@ -1441,9 +1407,12 @@
Close inotify's instance (close its file descriptor).
It destroys all existing watches, pending events,...
This method is automatically called at the end of loop().
+ Afterward it is invalid to access this instance.
"""
- self._pollobj.unregister(self._fd)
- os.close(self._fd)
+ if self._fd is not None:
+ self._pollobj.unregister(self._fd)
+ os.close(self._fd)
+ self._fd = None
self._sys_proc_fun = None
@@ -1468,7 +1437,7 @@
@type default_proc_fun: instance of ProcessEvent
@param read_freq: if read_freq == 0, events are read asap,
if read_freq is > 0, this thread sleeps
- max(0, read_freq - timeout) seconds.
+ max(0, read_freq - (timeout / 1000)) seconds.
@type read_freq: int
@param threshold: File descriptor will be read only if the accumulated
size to read becomes >= threshold. If != 0, you likely
@@ -1478,8 +1447,9 @@
until the amount of events to read is >= threshold. At
least with read_freq you might sleep.
@type threshold: int
- @param timeout:
- https://docs.python.org/3/library/select.html#polling-objects
+ @param timeout: see read_freq above. If provided, it must be set in
+ milliseconds. See
+ https://docs.python.org/2/library/select.html#select.poll.poll
@type timeout: int
"""
# Init threading base class
@@ -1911,7 +1881,7 @@
although unicode paths are accepted there are converted to byte
strings before a watch is put on that path. The encoding used for
converting the unicode object is given by sys.getfilesystemencoding().
- If |path| si already watched it is ignored, but if it is called with
+ If |path| is already watched it is ignored, but if it is called with
option rec=True a watch is put on each one of its not-watched
subdirectory.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyinotify-0.9.5/python3/pyinotify.py new/pyinotify-0.9.6/python3/pyinotify.py
--- old/pyinotify-0.9.5/python3/pyinotify.py 2015-01-09 22:13:32.000000000 +0100
+++ new/pyinotify-0.9.6/python3/pyinotify.py 2015-06-04 17:34:41.000000000 +0200
@@ -92,7 +92,7 @@
__author__ = "seb(a)dbzteam.org (Sebastien Martini)"
-__version__ = "0.9.5"
+__version__ = "0.9.6"
# Compatibity mode: set to True to improve compatibility with
@@ -251,10 +251,6 @@
assert self._libc is not None
return self._libc.inotify_rm_watch(fd, wd)
- def _sysctl(self, *args):
- assert self._libc is not None
- return self._libc.sysctl(*args)
-
# Logging
def logger_init():
@@ -271,94 +267,58 @@
# inotify's variables
-class SysCtlINotify:
+class ProcINotify:
"""
- Access (read, write) inotify's variables through sysctl. Usually it
- requires administrator rights to update them.
+ Access (read, write) inotify's variables through /proc/sys/. Note that
+ usually it requires administrator rights to update them.
Examples:
- Read max_queued_events attribute: myvar = max_queued_events.value
- Update max_queued_events attribute: max_queued_events.value = 42
"""
-
- inotify_attrs = {'max_user_instances': 1,
- 'max_user_watches': 2,
- 'max_queued_events': 3}
-
- def __init__(self, attrname, inotify_wrapper):
- # FIXME: right now only supporting ctypes
- assert ctypes
- self._attrname = attrname
- self._inotify_wrapper = inotify_wrapper
- sino = ctypes.c_int * 3
- self._attr = sino(5, 20, SysCtlINotify.inotify_attrs[attrname])
-
- @staticmethod
- def create(attrname):
- # FIXME: right now only supporting ctypes
- if ctypes is None:
- return None
- inotify_wrapper = _CtypesLibcINotifyWrapper()
- if not inotify_wrapper.init():
- return None
- return SysCtlINotify(attrname, inotify_wrapper)
+ def __init__(self, attr):
+ self._base = "/proc/sys/fs/inotify"
+ self._attr = attr
def get_val(self):
"""
- Gets attribute's value. Raises OSError if the operation failed.
+ Gets attribute's value.
@return: stored value.
@rtype: int
+ @raise IOError: if corresponding file in /proc/sys cannot be read.
"""
- oldv = ctypes.c_int(0)
- size = ctypes.c_int(ctypes.sizeof(oldv))
- sysctl = self._inotify_wrapper._sysctl
- res = sysctl(self._attr, 3,
- ctypes.c_voidp(ctypes.addressof(oldv)),
- ctypes.addressof(size),
- None, 0)
- if res == -1:
- raise OSError(self._inotify_wrapper.get_errno(),
- self._inotify_wrapper.str_errno())
- return oldv.value
+ with open(os.path.join(self._base, self._attr), 'r') as file_obj:
+ return int(file_obj.readline())
def set_val(self, nval):
"""
- Sets new attribute's value. Raises OSError if the operation failed.
+ Sets new attribute's value.
@param nval: replaces current value by nval.
@type nval: int
+ @raise IOError: if corresponding file in /proc/sys cannot be written.
"""
- oldv = ctypes.c_int(0)
- sizeo = ctypes.c_int(ctypes.sizeof(oldv))
- newv = ctypes.c_int(nval)
- sizen = ctypes.c_int(ctypes.sizeof(newv))
- sysctl = self._inotify_wrapper._sysctl
- res = sysctl(self._attr, 3,
- ctypes.c_voidp(ctypes.addressof(oldv)),
- ctypes.addressof(sizeo),
- ctypes.c_voidp(ctypes.addressof(newv)),
- sizen)
- if res == -1:
- raise OSError(self._inotify_wrapper.get_errno(),
- self._inotify_wrapper.str_errno())
+ with open(os.path.join(self._base, self._attr), 'w') as file_obj:
+ file_obj.write(str(nval) + '\n')
value = property(get_val, set_val)
def __repr__(self):
- return '<%s=%d>' % (self._attrname, self.get_val())
+ return '<%s=%d>' % (self._attr, self.get_val())
# Inotify's variables
#
-# FIXME: currently these variables are only accessible when ctypes is used,
-# otherwise there are set to None.
+# Note: may raise IOError if the corresponding value in /proc/sys
+# cannot be accessed.
#
-# read: myvar = max_queued_events.value
-# update: max_queued_events.value = 42
+# Examples:
+# - read: myvar = max_queued_events.value
+# - update: max_queued_events.value = 42
#
for attrname in ('max_queued_events', 'max_user_instances', 'max_user_watches'):
- globals()[attrname] = SysCtlINotify.create(attrname)
+ globals()[attrname] = ProcINotify(attrname)
class EventsCodes:
@@ -1139,7 +1099,7 @@
@type default_proc_fun: instance of ProcessEvent
@param read_freq: if read_freq == 0, events are read asap,
if read_freq is > 0, this thread sleeps
- max(0, read_freq - timeout) seconds. But if
+ max(0, read_freq - (timeout / 1000)) seconds. But if
timeout is None it may be different because
poll is blocking waiting for something to read.
@type read_freq: int
@@ -1151,8 +1111,9 @@
until the amount of events to read is >= threshold.
At least with read_freq set you might sleep.
@type threshold: int
- @param timeout:
- http://docs.python.org/lib/poll-objects.html#poll-objects
+ @param timeout: see read_freq above. If provided, it must be set in
+ milliseconds. See
+ https://docs.python.org/3/library/select.html#select.poll.poll
@type timeout: int
"""
# Watch Manager instance
@@ -1218,7 +1179,8 @@
milliseconds.
@param timeout: If specified it overrides the corresponding instance
- attribute _timeout.
+ attribute _timeout. timeout must be sepcified in
+ milliseconds.
@type timeout: int
@return: New events to read.
@@ -1431,9 +1393,12 @@
Close inotify's instance (close its file descriptor).
It destroys all existing watches, pending events,...
This method is automatically called at the end of loop().
+ Afterward it is invalid to access this instance.
"""
- self._pollobj.unregister(self._fd)
- os.close(self._fd)
+ if self._fd is not None:
+ self._pollobj.unregister(self._fd)
+ os.close(self._fd)
+ self._fd = None
self._sys_proc_fun = None
@@ -1458,7 +1423,7 @@
@type default_proc_fun: instance of ProcessEvent
@param read_freq: if read_freq == 0, events are read asap,
if read_freq is > 0, this thread sleeps
- max(0, read_freq - timeout) seconds.
+ max(0, read_freq - (timeout / 1000)) seconds.
@type read_freq: int
@param threshold: File descriptor will be read only if the accumulated
size to read becomes >= threshold. If != 0, you likely
@@ -1468,8 +1433,9 @@
until the amount of events to read is >= threshold. At
least with read_freq you might sleep.
@type threshold: int
- @param timeout:
- see http://docs.python.org/lib/poll-objects.html#poll-objects
+ @param timeout: see read_freq above. If provided, it must be set in
+ milliseconds. See
+ https://docs.python.org/3/library/select.html#select.poll.poll
@type timeout: int
"""
# Init threading base class
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyinotify-0.9.5/setup.cfg new/pyinotify-0.9.6/setup.cfg
--- old/pyinotify-0.9.5/setup.cfg 2015-01-09 22:49:28.000000000 +0100
+++ new/pyinotify-0.9.6/setup.cfg 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-[egg_info]
-tag_build =
-tag_date = 0
-tag_svn_revision = 0
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyinotify-0.9.5/setup.py new/pyinotify-0.9.6/setup.py
--- old/pyinotify-0.9.5/setup.py 2015-01-09 22:11:57.000000000 +0100
+++ new/pyinotify-0.9.6/setup.py 2015-06-04 17:34:41.000000000 +0200
@@ -103,7 +103,7 @@
setup(
name='pyinotify',
- version='0.9.5',
+ version='0.9.6',
description='Linux filesystem events monitoring',
author='Sebastien Martini',
author_email='seb(a)dbzteam.org',
1
0
Hello community,
here is the log from the commit of package ubuntu-mate-artwork for openSUSE:Factory checked in at 2016-01-05 09:41:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ubuntu-mate-artwork (Old)
and /work/SRC/openSUSE:Factory/.ubuntu-mate-artwork.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ubuntu-mate-artwork"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ubuntu-mate-artwork/ubuntu-mate-artwork.changes 2015-12-23 08:49:53.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.ubuntu-mate-artwork.new/ubuntu-mate-artwork.changes 2016-01-05 09:41:54.000000000 +0100
@@ -1,0 +2,10 @@
+Sun Jan 3 14:13:43 UTC 2016 - sor.alexei(a)meowr.ru
+
+- Update to 16.04.0:
+ * Add padding to sidebar icons (lp#1515557).
+ * Revised theme support for new version of Gedit.
+ * osd: style free-floating osd buttons (lp#1466890, lp#1500844).
+ * Add new community contributed wallpapers.
+ * Add MATE colourised icons for devices and places (lp#1509712).
+
+-------------------------------------------------------------------
Old:
----
ubuntu-mate-artwork_15.12.1.tar.xz
New:
----
ubuntu-mate-artwork_16.04.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ubuntu-mate-artwork.spec ++++++
--- /var/tmp/diff_new_pack.SmGRfx/_old 2016-01-05 09:41:57.000000000 +0100
+++ /var/tmp/diff_new_pack.SmGRfx/_new 2016-01-05 09:41:57.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ubuntu-mate-artwork
#
-# 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 _name ubuntu-mate
Name: ubuntu-mate-artwork
-Version: 15.12.1
+Version: 16.04.0
Release: 0
Summary: Ubuntu MATE themes and artwork
License: GPL-3.0+ and CC-BY-SA-4.0 and CC-BY-SA-3.0
++++++ ubuntu-mate-artwork_15.12.1.tar.xz -> ubuntu-mate-artwork_16.04.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/ubuntu-mate-artwork/ubuntu-mate-artwork_15.12.1.tar.xz /work/SRC/openSUSE:Factory/.ubuntu-mate-artwork.new/ubuntu-mate-artwork_16.04.0.tar.xz differ: char 25, line 1
1
0
Hello community,
here is the log from the commit of package python3-veusz for openSUSE:Factory checked in at 2016-01-05 09:41:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-veusz (Old)
and /work/SRC/openSUSE:Factory/.python3-veusz.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-veusz"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-veusz/python3-veusz.changes 2015-06-23 11:59:14.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python3-veusz.new/python3-veusz.changes 2016-01-05 09:41:52.000000000 +0100
@@ -1,0 +2,14 @@
+Thu Dec 31 20:10:07 UTC 2015 - arun(a)gmx.de
+
+- Update to version 1.23.2:
+ * Add data clipping dataset plugin
+ * Fix boxplot with manual settings
+ * Fix plugin normalize and divide by maximum for new numpy versions
+ * Avoid error in 2d data creation
+ * Fix problems with unicode characters in plugins in Python 2.x
+ * Clip axis to sensible range -1e100->1e100
+ * Handle unicode errors from operating system in Veusz scripts
+ * Handle unicode errors in error reports
+ * Fix crash in \color
+
+-------------------------------------------------------------------
Old:
----
veusz-1.23.1.tar.gz
New:
----
veusz-1.23.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-veusz.spec ++++++
--- /var/tmp/diff_new_pack.1WNYT0/_old 2016-01-05 09:41:53.000000000 +0100
+++ /var/tmp/diff_new_pack.1WNYT0/_new 2016-01-05 09:41:53.000000000 +0100
@@ -19,7 +19,7 @@
%define appname veusz3
Name: python3-veusz
-Version: 1.23.1
+Version: 1.23.2
Release: 0
Summary: Scientific plotting library for Python
License: GPL-2.0+ and Python-2.0
++++++ veusz-1.23.1.tar.gz -> veusz-1.23.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.23.1/ChangeLog new/veusz-1.23.2/ChangeLog
--- old/veusz-1.23.1/ChangeLog 2015-06-14 12:28:08.000000000 +0200
+++ new/veusz-1.23.2/ChangeLog 2015-12-23 12:37:33.000000000 +0100
@@ -1,3 +1,14 @@
+Changes in 1.23.2:
+ * Add data clipping dataset plugin
+ * Fix boxplot with manual settings
+ * Fix plugin normalize and divide by maximum for new numpy versions
+ * Avoid error in 2d data creation
+ * Fix problems with unicode characters in plugins in Python 2.x
+ * Clip axis to sensible range -1e100->1e100
+ * Handle unicode errors from operating system in Veusz scripts
+ * Handle unicode errors in error reports
+ * Fix crash in \color
+
Changes in 1.23.1:
* Enable compression in exported files (Benjamin K. Stuhl)
* Fix saving histogram datasets
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.23.1/INSTALL new/veusz-1.23.2/INSTALL
--- old/veusz-1.23.1/INSTALL 2015-06-13 10:22:03.000000000 +0200
+++ new/veusz-1.23.2/INSTALL 2015-12-23 12:37:30.000000000 +0100
@@ -36,7 +36,7 @@
To install on linux to the standard location on the hard disk
-# cd veusz-1.23.1
+# cd veusz-1.23.2
# python setup.py build
# su
[enter root password]
@@ -94,8 +94,8 @@
If you don't want to install veusz fully or are doing development, it
can currently be run from its own directory. Do
-# tar xzf veusz-1.23.1.tar.gz [change version here]
-# cd veusz-1.23.1
+# tar xzf veusz-1.23.2.tar.gz [change version here]
+# cd veusz-1.23.2
# ./run_veusz_inplace
Certain features will be disabled if you do this. You will not be able
@@ -117,8 +117,8 @@
incompatibilities. Simply unpack the tar file and run the main
executable:
-# tar xzf veusz-linux-i386-1.23.1.tar.gz [change version here]
-# cd veusz-linux-i386-1.23.1
+# tar xzf veusz-linux-i386-1.23.2.tar.gz [change version here]
+# cd veusz-linux-i386-1.23.2
# ./veusz
2.2 Installing in Windows
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.23.1/PKG-INFO new/veusz-1.23.2/PKG-INFO
--- old/veusz-1.23.1/PKG-INFO 2015-06-14 12:37:53.000000000 +0200
+++ new/veusz-1.23.2/PKG-INFO 2015-12-23 13:55:21.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: veusz
-Version: 1.23.1
+Version: 1.23.2
Summary: A scientific plotting package
Home-page: http://home.gna.org/veusz/
Author: Jeremy Sanders
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.23.1/README new/veusz-1.23.2/README
--- old/veusz-1.23.1/README 2015-06-14 12:28:11.000000000 +0200
+++ new/veusz-1.23.2/README 2015-12-23 12:37:16.000000000 +0100
@@ -1,4 +1,4 @@
-Veusz 1.23.1
+Veusz 1.23.2
------------
http://home.gna.org/veusz/
@@ -12,6 +12,17 @@
manipulation and editing of datasets. Data can be captured from
external sources such as Internet sockets or other programs.
+Changes in 1.23.2:
+ * Add data clipping dataset plugin
+ * Fix boxplot with manual settings
+ * Fix plugin normalize and divide by maximum for new numpy versions
+ * Avoid error in 2d data creation
+ * Fix problems with unicode characters in plugins in Python 2.x
+ * Clip axis to sensible range -1e100->1e100
+ * Handle unicode errors from operating system in Veusz scripts
+ * Handle unicode errors in error reports
+ * Fix crash in \color
+
Changes in 1.23.1:
* Enable compression in exported files (Benjamin K. Stuhl)
* Fix saving histogram datasets
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.23.1/VERSION new/veusz-1.23.2/VERSION
--- old/veusz-1.23.1/VERSION 2015-06-13 10:20:39.000000000 +0200
+++ new/veusz-1.23.2/VERSION 2015-12-23 12:36:35.000000000 +0100
@@ -1 +1 @@
-1.23.1
+1.23.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.23.1/ui/exceptionlist.ui new/veusz-1.23.2/ui/exceptionlist.ui
--- old/veusz-1.23.1/ui/exceptionlist.ui 2014-12-22 13:42:32.000000000 +0100
+++ new/veusz-1.23.2/ui/exceptionlist.ui 2015-08-30 10:44:35.000000000 +0200
@@ -82,6 +82,13 @@
</widget>
</item>
<item>
+ <widget class="QPushButton" name="saveButton">
+ <property name="text">
+ <string>Save report</string>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QPushButton" name="cancelButton">
<property name="text">
<string>&Ignore this time</string>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.23.1/veusz/compat.py new/veusz-1.23.2/veusz/compat.py
--- old/veusz-1.23.1/veusz/compat.py 2015-04-05 14:38:55.000000000 +0200
+++ new/veusz-1.23.2/veusz/compat.py 2015-11-22 12:56:22.000000000 +0100
@@ -80,6 +80,12 @@
# exec function
cexec = getattr(cbuiltins, 'exec')
+ # execfile
+ def cexecfile(filename, globaldict):
+ with open(filename) as f:
+ code = compile(f.read(), filename, 'exec')
+ cexec(code, globaldict)
+
# convert strerror exception to string
def cstrerror(ex):
return ex.strerror
@@ -90,6 +96,10 @@
return 'u' + repr(v)
return repr(v)
+ # convert exception to a user string
+ def cexceptionuser(ex):
+ return str(ex)
+
else:
# py2
@@ -152,15 +162,28 @@
code = 'exec text in globdict'
exec(code)
+ # execfile
+ def cexecfile(filename, globaldict):
+ execfile(filename, globaldict)
+
# convert strerror exception to string
def cstrerror(ex):
if isinstance(ex.strerror, str):
- deflocale = locale.getdefaultlocale()[1]
- if deflocale is None:
- deflocale = 'ascii'
+ deflocale = locale.getdefaultlocale()[1] or 'ascii'
return ex.strerror.decode(deflocale)
else:
return ex.strerror
+ # sometimes exceptions come as unicode, sometimes as strings
+ # encoded in ascii, so we have to decode
+ def cexceptionuser(ex):
+ if hasattr(ex, 'strerror') and isinstance(ex.strerror, str):
+ # comes from operating system as encoded
+ deflocale = locale.getdefaultlocale()[1] or 'ascii'
+ return str(ex).decode(deflocale)
+ else:
+ # let's hope this works
+ return unicode(ex)
+
# py2/3 repr
crepr = repr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.23.1/veusz/dialogs/datacreate2d.py new/veusz-1.23.2/veusz/dialogs/datacreate2d.py
--- old/veusz-1.23.1/veusz/dialogs/datacreate2d.py 2015-04-22 19:41:20.000000000 +0200
+++ new/veusz-1.23.2/veusz/dialogs/datacreate2d.py 2015-11-22 11:20:19.000000000 +0100
@@ -19,7 +19,7 @@
"""Dataset creation dialog for 2d data."""
from __future__ import division
-from ..compat import crange, citems
+from ..compat import crange, citems, cstr
from .. import qtall as qt4
from .. import utils
from .. import document
@@ -95,7 +95,7 @@
if ds.datatype == 'numeric':
datasets[ds.dimensions-1].append(name)
datasets[0].sort()
- datasets[1].sort()
+ datasets[1].sort()
# make sure names are escaped if they have funny characters
self.escapeDatasets(datasets[0])
@@ -163,7 +163,7 @@
disable = False
# need name and zexpr
disable = disable or not text['name'] or not text['zexpr']
-
+
if self.mode == 'xyzexpr':
# need x and yexpr
disable = disable or not text['xexpr'] or not text['yexpr']
@@ -171,7 +171,7 @@
elif self.mode == '2dexpr':
# nothing else
pass
-
+
elif self.mode == 'xyfunc':
# need x and yexpr in special step format min:max:step
disable = disable or ( checkGetStep(text['xexpr']) is None or
@@ -179,7 +179,7 @@
# finally check button
self.createbutton.setDisabled(disable)
-
+
def createButtonClickedSlot(self):
"""Create button pressed."""
@@ -188,29 +188,30 @@
text[name] = getattr(self, name+'combo').currentText().strip()
link = self.linkcheckbox.checkState() == qt4.Qt.Checked
- if self.mode == 'xyzexpr':
- # build operation
- op = document.OperationDataset2DCreateExpressionXYZ(
- text['name'],
- text['xexpr'], text['yexpr'], text['zexpr'],
- link)
-
- elif self.mode == '2dexpr':
- op = document.OperationDataset2DCreateExpression(
- text['name'], text['zexpr'], link)
-
- elif self.mode == 'xyfunc':
- xstep = checkGetStep(text['xexpr'])
- ystep = checkGetStep(text['yexpr'])
- # build operation
- op = document.OperationDataset2DXYFunc(
- text['name'],
- xstep, ystep,
- text['zexpr'], link)
-
- # apply operation, catching evaluation errors
+ # create and apply operation, catching evaluation errors
try:
+ if self.mode == 'xyzexpr':
+ # build operation
+ op = document.OperationDataset2DCreateExpressionXYZ(
+ text['name'],
+ text['xexpr'], text['yexpr'], text['zexpr'],
+ link)
+
+ elif self.mode == '2dexpr':
+ op = document.OperationDataset2DCreateExpression(
+ text['name'], text['zexpr'], link)
+
+ elif self.mode == 'xyfunc':
+ xstep = checkGetStep(text['xexpr'])
+ ystep = checkGetStep(text['yexpr'])
+
+ # build operation
+ op = document.OperationDataset2DXYFunc(
+ text['name'],
+ xstep, ystep,
+ text['zexpr'], link)
+
# check expression is okay
op.validateExpression(self.document)
@@ -218,15 +219,20 @@
self.document.applyOperation(op)
# forces an evaluation
self.document.data[text['name']].data
+
except (document.CreateDatasetException,
- document.DatasetException):
+ document.DatasetException) as e:
+
msg = _("Failed to create dataset '%s'") % text['name']
+ s = cstr(e)
+ if s:
+ msg += ' (%s)' % s
else:
msg = _("Created dataset '%s'") % text['name']
self.notifylabel.setText(msg)
qt4.QTimer.singleShot(4000, self.notifylabel.clear)
-
+
def recreateDataset(mainwindow, document, dataset, datasetname):
"""Open dialog to recreate a DatasetExpression / DatasetRange."""
dialog = DataCreate2DDialog(mainwindow, document)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.23.1/veusz/dialogs/exceptiondialog.py new/veusz-1.23.2/veusz/dialogs/exceptiondialog.py
--- old/veusz-1.23.1/veusz/dialogs/exceptiondialog.py 2015-04-05 14:38:55.000000000 +0200
+++ new/veusz-1.23.2/veusz/dialogs/exceptiondialog.py 2015-11-22 14:05:29.000000000 +0100
@@ -15,7 +15,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
##############################################################################
-
+
'''Dialog to pop up if an exception occurs in Veusz.
This allows the user to send a bug report in via email.'''
@@ -29,7 +29,7 @@
import numpy
import sip
-from ..compat import citems, curlrequest
+from ..compat import citems, curlrequest, cexceptionuser
from .. import qtall as qt4
from .. import utils
from .veuszdialog import VeuszDialog
@@ -38,6 +38,8 @@
"""Translate text."""
return qt4.QCoreApplication.translate(context, text, disambiguation)
+_emailUrl ='http://barmag.net/veusz-mail.php'
+
_reportformat = \
'''Veusz version: %s
Python version: %s
@@ -63,25 +65,28 @@
%s
'''
+def createReportText(exception):
+ return _reportformat % (
+ utils.version(),
+ sys.version,
+ sys.platform,
+ numpy.__version__,
+ qt4.qVersion(),
+ qt4.PYQT_VERSION_STR,
+ sip.SIP_VERSION_STR,
+ time.strftime('%a, %d %b %Y %H:%M:%S +0000', time.gmtime()),
+ cexceptionuser(exception),
+ )
+
class ExceptionSendDialog(VeuszDialog):
"""Dialog to send debugging report."""
-
+
def __init__(self, exception, parent):
VeuszDialog.__init__(self, parent, 'exceptionsend.ui')
# debugging report text
- self.text = _reportformat % (
- utils.version(),
- sys.version,
- sys.platform,
- numpy.__version__,
- qt4.qVersion(),
- qt4.PYQT_VERSION_STR,
- sip.SIP_VERSION_STR,
- time.strftime('%a, %d %b %Y %H:%M:%S +0000', time.gmtime()),
- exception
- )
+ self.text = createReportText(exception)
self.detailstosend.setPlainText(self.text)
def accept(self):
@@ -98,9 +103,8 @@
try:
# send the message
- curlrequest.urlopen('http://barmag.net/veusz-mail.php',
+ curlrequest.urlopen(_emailUrl,
'message=%s' % text)
-
except:
# something went wrong...
qt4.QMessageBox.critical(None, _("Veusz"),
@@ -170,7 +174,7 @@
class ExceptionDialog(VeuszDialog):
"""Choose an exception to send to developers."""
-
+
ignore_exceptions = set()
def __init__(self, exception, parent):
@@ -189,9 +193,13 @@
self.erroriconlabel.setPixmap(icon.pixmap(32))
self.ignoreSessionButton.clicked.connect(self.ignoreSessionSlot)
-
+ self.saveButton.clicked.connect(self.saveButtonSlot)
+
self.checkVeuszVersion()
+ if not _emailUrl:
+ self.okButton.hide()
+
def checkVeuszVersion(self):
"""See whether there is a later version of veusz and inform the
user."""
@@ -225,12 +233,21 @@
d = ExceptionSendDialog(self.backtrace, self)
if d.exec_() == qt4.QDialog.Accepted:
VeuszDialog.accept(self)
-
+
def ignoreSessionSlot(self):
"""Ignore exception for session."""
ExceptionDialog.ignore_exceptions.add(self.fmtexcept)
self.reject()
+ def saveButtonSlot(self):
+ filename = qt4.QFileDialog.getSaveFileName(self, 'Save File')
+ if filename:
+ f = open(filename, 'w')
+ f.write(createReportText(self.backtrace))
+ f.close()
+
+ self.close()
+
def exec_(self):
"""Exec dialog if exception is not ignored."""
if self.fmtexcept not in ExceptionDialog.ignore_exceptions:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.23.1/veusz/document/datasets.py new/veusz-1.23.2/veusz/document/datasets.py
--- old/veusz-1.23.1/veusz/document/datasets.py 2015-06-14 12:15:17.000000000 +0200
+++ new/veusz-1.23.2/veusz/document/datasets.py 2015-11-22 11:15:10.000000000 +0100
@@ -1692,14 +1692,19 @@
Dataset2DBase.__init__(self)
+ if xstep is None or ystep is None:
+ raise DatasetException('Steps are not set')
+
self.xstep = xstep
self.ystep = ystep
self.expr = expr
- self.xrange = (self.xstep[0] - self.xstep[2]*0.5,
- self.xstep[1] + self.xstep[2]*0.5)
- self.yrange = (self.ystep[0] - self.ystep[2]*0.5,
- self.ystep[1] + self.ystep[2]*0.5)
+ self.xrange = (
+ self.xstep[0] - self.xstep[2]*0.5,
+ self.xstep[1] + self.xstep[2]*0.5)
+ self.yrange = (
+ self.ystep[0] - self.ystep[2]*0.5,
+ self.ystep[1] + self.ystep[2]*0.5)
self.xedge = self.yedge = self.xcent = self.ycent = None
self.cacheddata = None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.23.1/veusz/document/doc.py new/veusz-1.23.2/veusz/document/doc.py
--- old/veusz-1.23.1/veusz/document/doc.py 2015-06-08 19:39:31.000000000 +0200
+++ new/veusz-1.23.2/veusz/document/doc.py 2015-11-22 11:35:07.000000000 +0100
@@ -36,7 +36,7 @@
except ImportError:
h5py = None
-from ..compat import crange, citems, cvalues, cstr, cexec, CStringIO
+from ..compat import crange, citems, cvalues, cstr, cexec, CStringIO, cexecfile
from .. import qtall as qt4
from . import widgetfactory
@@ -415,7 +415,7 @@
for plugin in pluginlist:
try:
- cexec(compile(open(plugin).read(), plugin, 'exec'), dict())
+ cexecfile(plugin, {})
except Exception:
err = _('Error loading plugin %s\n\n%s') % (
plugin, traceback.format_exc())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.23.1/veusz/document/loader.py new/veusz-1.23.2/veusz/document/loader.py
--- old/veusz-1.23.1/veusz/document/loader.py 2015-04-22 19:41:20.000000000 +0200
+++ new/veusz-1.23.2/veusz/document/loader.py 2015-11-22 13:02:21.000000000 +0100
@@ -28,7 +28,7 @@
from .. import setting
from .. import utils
-from ..compat import cexec, cstr, cstrerror, cbytes
+from ..compat import cexec, cstr, cstrerror, cbytes, cexceptionuser
from .commandinterface import CommandInterface
from . import datasets
@@ -69,7 +69,7 @@
def genexception(exc):
info = sys.exc_info()
backtrace = ''.join(traceback.format_exception(*info))
- return LoadError(cstr(exc), backtrace=backtrace)
+ return LoadError(cexceptionuser(exc), backtrace=backtrace)
# compile script and check for security (if reqd)
unsafe = [setting.transient_settings['unsafe_mode']]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.23.1/veusz/plugins/datasetplugin.py new/veusz-1.23.2/veusz/plugins/datasetplugin.py
--- old/veusz-1.23.1/veusz/plugins/datasetplugin.py 2015-06-12 20:18:17.000000000 +0200
+++ new/veusz-1.23.2/veusz/plugins/datasetplugin.py 2015-11-22 10:53:56.000000000 +0100
@@ -20,7 +20,7 @@
"""Plugins for creating datasets."""
-from __future__ import division
+from __future__ import division, print_function
import numpy as N
from . import field
@@ -212,7 +212,7 @@
# class to pass to plugin to give parameters
class DatasetPluginHelper(object):
"""Helpers to get existing datasets for plugins."""
-
+
def __init__(self, doc):
"""Construct helper object to pass to DatasetPlugins."""
self._doc = doc
@@ -287,7 +287,7 @@
if isinstance(ds, document.DatasetDateTime):
return DatasetDateTime(name, data=ds.data)
elif ds.dimensions == 1:
- return Dataset1D(name, data=ds.data, serr=ds.serr,
+ return Dataset1D(name, data=ds.data, serr=ds.serr,
perr=ds.perr, nerr=ds.nerr)
elif ds.dimensions == 2:
return Dataset2D(name, ds.data,
@@ -327,7 +327,7 @@
doc - document instance
fields - fields to pass to plugin
"""
-
+
self.plugin = plugin
self.document = doc
self.helper = DatasetPluginHelper(doc)
@@ -487,7 +487,7 @@
f = N.isfinite(d.data)
if errortype == 'symmetric' and d.serr is not None:
- serr[f] += d.serr[f]**2
+ serr[f] += d.serr[f]**2
elif errortype == 'asymmetric':
if d.serr is not None:
v = (d.serr[f])**2
@@ -521,7 +521,7 @@
f = f[:length]
if errortype == 'symmetric' and d.serr is not None:
- serr[f] += (d.serr[f]/d.data[f])**2
+ serr[f] += (d.serr[f]/d.data[f])**2
elif errortype == 'asymmetric':
if d.serr is not None:
v = (d.serr[f]/d.data[f])**2
@@ -548,7 +548,7 @@
description_short = _('Multiply dataset by a constant')
description_full = _('Multiply a dataset by a factor. '
'Error bars are also scaled.')
-
+
def __init__(self):
"""Define fields."""
self.fields = [
@@ -579,7 +579,7 @@
description_short = _('Add a constant to a dataset')
description_full = _('Add a dataset by adding a value. '
'Error bars remain the same.')
-
+
def __init__(self):
"""Define fields."""
self.fields = [
@@ -948,7 +948,7 @@
description_short = _('Subtract two datasets')
description_full = _('Subtract two datasets. '
'Combined error bars are also calculated.')
-
+
def __init__(self):
"""Define fields."""
self.fields = [
@@ -1063,7 +1063,7 @@
description_short = _('Multiply two or more datasets')
description_full = _('Multiply two or more datasets. '
'Combined error bars are also calculated.')
-
+
def __init__(self):
"""Define fields."""
self.fields = [
@@ -1103,7 +1103,7 @@
' between two datasets')
description_full = _('Divide or compute fractional difference'
' between two datasets')
-
+
def __init__(self):
"""Define fields."""
self.fields = [
@@ -1162,9 +1162,9 @@
data = data / maxval
# divide error bars
serr = perr = nerr = None
- if inds.serr: serr = inds.serr / maxval
- if inds.perr: perr = inds.perr / maxval
- if inds.nerr: nerr = inds.nerr / maxval
+ if inds.serr is not None: serr = inds.serr / maxval
+ if inds.perr is not None: perr = inds.perr / maxval
+ if inds.nerr is not None: nerr = inds.nerr / maxval
self.dsout.update(data=data, serr=serr, perr=perr, nerr=nerr)
@@ -1198,9 +1198,9 @@
data = data / tot
# divide error bars
serr = perr = nerr = None
- if inds.serr: serr = inds.serr / tot
- if inds.perr: perr = inds.perr / tot
- if inds.nerr: nerr = inds.nerr / tot
+ if inds.serr is not None: serr = inds.serr / tot
+ if inds.perr is not None: perr = inds.perr / tot
+ if inds.nerr is not None: nerr = inds.nerr / tot
self.dsout.update(data=data, serr=serr, perr=perr, nerr=nerr)
@@ -1427,7 +1427,7 @@
description_short = _('Filter a dataset using an expression')
description_full = _('Filter a dataset using an expression, '
'e.g. "x>10" or "(x>1) & (y<2)"')
-
+
def __init__(self):
"""Define fields."""
self.fields = [
@@ -1482,7 +1482,7 @@
description_full = _('Compute moving average for regularly spaced data.'
'Average is computed either\nside of each data point '
'by number of points given.')
-
+
def __init__(self):
"""Define fields."""
self.fields = [
@@ -1493,7 +1493,7 @@
default=True),
field.FieldDataset('ds_out', _('Output dataset')),
]
-
+
def updateDatasets(self, fields, helper):
"""Do shifting of dataset."""
ds_in = helper.getDataset(fields['ds_in'])
@@ -1873,6 +1873,68 @@
self.dsout.update(data=data)
+class ClipPlugin(_OneOutputDatasetPlugin):
+ """Compute moving average for dataset."""
+
+ menu = (_('Compute'), _('Clipped dataset'),)
+ name = 'Clip'
+ description_short = _('Clip data between a minimum and maximum')
+ description_full = _('Clip data points to minimum and/or maximum values')
+
+ def __init__(self):
+ """Define fields."""
+ self.fields = [
+ field.FieldDataset('ds_in', _('Input dataset')),
+ field.FieldFloat('minimum', _('Minimum'), default=0.),
+ field.FieldBool('disablemin', _('Disable minimum')),
+ field.FieldFloat('maximum', _('Maximum'), default=1.),
+ field.FieldBool('disablemax', _('Disable maximum')),
+ field.FieldBool('cliperrs', _('Clip error bars'), default=True),
+ field.FieldDataset('ds_out', _('Output dataset')),
+ ]
+
+ def updateDatasets(self, fields, helper):
+ """Do shifting of dataset."""
+ ds_in = helper.getDataset(fields['ds_in'])
+ data = N.array(ds_in.data)
+ perr = getattr(ds_in, 'perr')
+ nerr = getattr(ds_in, 'nerr')
+ serr = getattr(ds_in, 'serr')
+
+ cliperrs = fields['cliperrs']
+ # force asymmetric errors if clipping error bars
+ if cliperrs and serr is not None and (nerr is None or perr is None):
+ perr = serr
+ nerr = -serr
+ serr = None
+
+ # we have to clip the ranges, so calculate these first
+ upper = (data+perr) if (cliperrs and perr is not None) else None
+ lower = (data+nerr) if (cliperrs and nerr is not None) else None
+
+ # note: this preserves nan values
+ if not fields['disablemin']:
+ minv = fields['minimum']
+ data[data<minv] = minv
+ if upper is not None:
+ upper[upper<minv] = minv
+ if lower is not None:
+ lower[lower<minv] = minv
+ if not fields['disablemax']:
+ maxv = fields['maximum']
+ data[data>maxv] = maxv
+ if upper is not None:
+ upper[upper>maxv] = maxv
+ if lower is not None:
+ lower[lower>maxv] = maxv
+
+ if upper is not None:
+ perr = upper-data
+ if lower is not None:
+ nerr = lower-data
+
+ self.dsout.update(data=data, serr=serr, perr=perr, nerr=nerr)
+
datasetpluginregistry += [
AddDatasetPlugin,
AddDatasetsPlugin,
@@ -1887,6 +1949,7 @@
MeanDatasetPlugin,
ExtremesDatasetPlugin,
CumulativePlugin,
+ ClipPlugin,
ConcatenateDatasetPlugin,
InterleaveDatasetPlugin,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.23.1/veusz/utils/textrender.py new/veusz-1.23.2/veusz/utils/textrender.py
--- old/veusz-1.23.1/veusz/utils/textrender.py 2015-04-05 14:38:55.000000000 +0200
+++ new/veusz-1.23.2/veusz/utils/textrender.py 2015-11-28 16:32:26.000000000 +0100
@@ -1004,7 +1004,7 @@
def __init__(self, children):
try:
self.colorname = children[0].text
- except AttributeError:
+ except (AttributeError, IndexError):
self.colorname = ''
self.children = children[1:]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.23.1/veusz/utils/version.py new/veusz-1.23.2/veusz/utils/version.py
--- old/veusz-1.23.1/veusz/utils/version.py 2015-04-05 14:38:55.000000000 +0200
+++ new/veusz-1.23.2/veusz/utils/version.py 2015-07-09 20:01:34.000000000 +0200
@@ -29,21 +29,22 @@
from . import utilfuncs
-def version():
- """Return the version number as a string."""
-
- try:
- f = open( os.path.join(utilfuncs.resourceDirectory, 'VERSION') )
- except EnvironmentError:
- sys.stderr.write('''
-Failed to find VERSION file.
+_errmsg = """Failed to find VERSION file.
This is probably because the resource files are not installed in the
python module directory. You may need to set the environment variable
VEUSZ_RESOURCE_DIR or add a "resources" symlink in the main veusz
module directory pointing to the directory where resources are
located. See INSTALL for details.
-'''.lstrip())
- sys.exit(1)
+"""
- return f.readline().strip()
+def version():
+ """Return the version number as a string."""
+
+ filename = os.path.join(utilfuncs.resourceDirectory, "VERSION")
+ try:
+ with open(filename) as f:
+ return f.readline().strip()
+ except EnvironmentError:
+ sys.stderr.write(_errmsg)
+ sys.exit(1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.23.1/veusz/widgets/axisfunction.py new/veusz-1.23.2/veusz/widgets/axisfunction.py
--- old/veusz-1.23.1/veusz/widgets/axisfunction.py 2015-04-05 14:38:55.000000000 +0200
+++ new/veusz-1.23.2/veusz/widgets/axisfunction.py 2015-08-11 16:11:44.000000000 +0200
@@ -508,7 +508,7 @@
def _linearInterpolWarning(self, vals, xcoords, ycoords):
'''Linear interpolation, giving out of bounds warning.'''
- if any(vals < xcoords[0]) or any(vals > xcoords[-1]):
+ if N.any(vals < xcoords[0]) or N.any(vals > xcoords[-1]):
self.document.log(
_('Warning: values exceed bounds in axis-function'))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.23.1/veusz/widgets/axisticks.py new/veusz-1.23.2/veusz/widgets/axisticks.py
--- old/veusz-1.23.1/veusz/widgets/axisticks.py 2015-04-05 14:38:55.000000000 +0200
+++ new/veusz-1.23.2/veusz/widgets/axisticks.py 2015-11-22 12:30:21.000000000 +0100
@@ -54,8 +54,11 @@
is tuple as returned in self.interval after calling getTicks()
"""
- self.minval = minval
- self.maxval = maxval
+ # clip to sensible range
+ self.minval = max(min(minval, 1e100), -1e100)
+ self.maxval = max(min(maxval, 1e100), -1e100)
+
+ # tick parameters
self.numticks = numticks
self.numminorticks = numminorticks
self.logaxis = logaxis
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.23.1/veusz/widgets/boxplot.py new/veusz-1.23.2/veusz/widgets/boxplot.py
--- old/veusz-1.23.1/veusz/widgets/boxplot.py 2015-04-22 19:41:20.000000000 +0200
+++ new/veusz-1.23.2/veusz/widgets/boxplot.py 2015-11-14 14:08:33.000000000 +0100
@@ -405,7 +405,7 @@
datasets = [ s.get(x).getData(doc) for x in
('whiskermin', 'whiskermax', 'boxmin',
'boxmax', 'mean', 'median') ]
- if N.any((d is None for d in datasets)):
+ if any((d is None for d in datasets)):
return
# get axes widgets
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.23.1/veusz/windows/plotwindow.py new/veusz-1.23.2/veusz/windows/plotwindow.py
--- old/veusz-1.23.1/veusz/windows/plotwindow.py 2015-04-22 19:41:20.000000000 +0200
+++ new/veusz-1.23.2/veusz/windows/plotwindow.py 2015-10-27 19:35:12.000000000 +0100
@@ -1,6 +1,6 @@
# plotwindow.py
# the main window for showing plots
-
+
# Copyright (C) 2004 Jeremy S. Sanders
# Email: Jeremy Sanders <jeremy(a)jeremysanders.net>
#
@@ -527,7 +527,7 @@
pt1.x(), pt1.y(), widgets.Graph)
if widget is None:
return
-
+
# convert points on plotter to points on axis for each axis
# we also add a neighbouring pixel for the rounding calculation
xpts = N.array( [pt1.x(), pt2.x(), pt1.x()+1, pt2.x()-1] )
@@ -535,7 +535,7 @@
# build up operation list to do zoom
operations = []
-
+
axes = {}
# iterate over children, to look for plotters
for c in [i for i in widget.children if
@@ -853,7 +853,7 @@
def locateClickWidget(self, x, y):
"""Work out which widget was clicked, and if necessary send
a sigWidgetClicked(widget) signal."""
-
+
if self.document.getNumberPages() == 0:
return
@@ -907,7 +907,7 @@
# print >>sys.stderr, "updating"
self.pickeritem.hide()
-
+
self.pagenumber = min( self.document.getNumberPages() - 1,
self.pagenumber )
self.oldpagenumber = self.pagenumber
@@ -1077,10 +1077,10 @@
if aspectwin > aspectplot:
# take account of scroll bar
width -= self.verticalScrollBar().width()
-
+
mult = width / r.width()
self.setZoomFactor(self.zoomfactor * mult)
-
+
def slotViewZoomHeight(self):
"""Make the zoom factor so that the plot fills the whole width."""
@@ -1094,7 +1094,7 @@
if aspectwin < aspectplot:
# take account of scroll bar
height -= self.horizontalScrollBar().height()
-
+
mult = height / r.height()
self.setZoomFactor(self.zoomfactor * mult)
@@ -1115,7 +1115,7 @@
def slotViewPreviousPage(self):
"""View the previous page."""
self.setPageNumber( self.pagenumber - 1 )
-
+
def slotViewNextPage(self):
"""View the next page."""
self.setPageNumber( self.pagenumber + 1 )
@@ -1135,7 +1135,7 @@
modecnvt = { self.vzactions['view.select'] : 'select',
self.vzactions['view.pick'] : 'pick',
self.vzactions['view.zoomgraph'] : 'graphzoom' }
-
+
# close the current picker
self.pickeritem.hide()
self.sigPickerEnabled.emit(False)
@@ -1145,14 +1145,12 @@
if self.clickmode == 'select':
self.pixmapitem.unsetCursor()
- #self.label.setCursor(qt4.Qt.ArrowCursor)
elif self.clickmode == 'graphzoom':
- self.pixmapitem.unsetCursor()
- #self.label.setCursor(qt4.Qt.CrossCursor)
+ self.pixmapitem.setCursor(qt4.Qt.CrossCursor)
elif self.clickmode == 'pick':
self.pixmapitem.setCursor(qt4.Qt.CrossCursor)
self.sigPickerEnabled.emit(True)
-
+
def getClick(self):
"""Return a click point from the graph."""
@@ -1173,7 +1171,7 @@
pt.x(), pt.y(), widgets.Graph)
if widget is None:
return []
-
+
# convert points on plotter to points on axis for each axis
xpts = N.array( [pt.x()] )
ypts = N.array( [pt.y()] )
1
0
Hello community,
here is the log from the commit of package python3-pyparsing for openSUSE:Factory checked in at 2016-01-05 09:41:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-pyparsing (Old)
and /work/SRC/openSUSE:Factory/.python3-pyparsing.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-pyparsing"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-pyparsing/python3-pyparsing.changes 2015-11-22 11:00:20.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python3-pyparsing.new/python3-pyparsing.changes 2016-01-05 09:41:51.000000000 +0100
@@ -1,0 +2,21 @@
+Thu Dec 31 19:58:42 UTC 2015 - arun(a)gmx.de
+
+- update to version 2.0.7:
+ * Simplified string representation of Forward class, to avoid memory
+ and performance errors while building ParseException
+ messages. Thanks, Will McGugan, Andrea Censi, and Martijn Vermaat
+ for the bug reports and test code.
+ * Cleaned up additional issues from enhancing the error messages for
+ Or and MatchFirst, handling Unicode values in expressions. Fixes
+ Unicode encoding issues in Python 2, thanks to Evan Hubinger for
+ the bug report.
+ * Fixed implementation of dir() for ParseResults - was leaving out
+ all the defined methods and just adding the custom results names.
+ * Fixed bug in ignore() that was introduced in pyparsing 1.5.3, that
+ would not accept a string literal as the ignore expression.
+ * Added new example parseTabularData.py to illustrate parsing of
+ data formatted in columns, with detection of empty cells.
+ * Updated a number of examples to more current Python and pyparsing
+ forms.
+
+-------------------------------------------------------------------
Old:
----
pyparsing-2.0.6.tar.gz
New:
----
pyparsing-2.0.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-pyparsing.spec ++++++
--- /var/tmp/diff_new_pack.VTDHNg/_old 2016-01-05 09:41:51.000000000 +0100
+++ /var/tmp/diff_new_pack.VTDHNg/_new 2016-01-05 09:41:51.000000000 +0100
@@ -17,7 +17,7 @@
Name: python3-pyparsing
-Version: 2.0.6
+Version: 2.0.7
Release: 0
Url: http://pyparsing.wikispaces.com/
Summary: Grammar Parser Library for Python
++++++ pyparsing-2.0.6.tar.gz -> pyparsing-2.0.7.tar.gz ++++++
++++ 9852 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package python3-aiohttp for openSUSE:Factory checked in at 2016-01-05 09:41:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-aiohttp (Old)
and /work/SRC/openSUSE:Factory/.python3-aiohttp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-aiohttp"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-aiohttp/python3-aiohttp.changes 2015-11-28 20:05:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python3-aiohttp.new/python3-aiohttp.changes 2016-01-05 09:41:49.000000000 +0100
@@ -1,0 +2,40 @@
+Thu Dec 31 19:54:48 UTC 2015 - arun(a)gmx.de
+
+- update to version 0.20.1:
+ * Raise RuntimeError is Timeout context manager was used outside of
+ task context.
+ * Add number of bytes to stream.read_nowait #700
+ * Use X-FORWARDED-PROTO for wsgi.url_scheme when available
+
+- changes from version 0.20.0:
+ * Extend list of web exceptions, add HTTPMisdirectedRequest,
+ HTTPUpgradeRequired, HTTPPreconditionRequired,
+ HTTPTooManyRequests, HTTPRequestHeaderFieldsTooLarge,
+ HTTPVariantAlsoNegotiates, HTTPNotExtended,
+ HTTPNetworkAuthenticationRequired status codes #644
+ * Do not remove AUTHORIZATION header by WSGI handler #649
+ * Fix broken support for https proxies with authentication #617
+ * Get REMOTE_* and SEVER_* http vars from headers when listening on
+ unix socket #654
+ * Add HTTP 308 support #663
+ * Add Tf format (time to serve request in seconds, %06f format) to
+ access log #669
+ * Remove one and a half years long deprecated
+ ClientResponse.read_and_close() method
+ * Optimize chunked encoding: use a single syscall instead of 3 calls
+ on sending chunked encoded data
+ * Use TCP_CORK and TCP_NODELAY to optimize network latency and
+ throughput #680
+ * Websocket XOR performance improved #687
+ * Avoid sending cookie attributes in Cookie header #613
+ * Round server timeouts to seconds for grouping pending calls. That
+ leads to less amount of poller syscalls e.g epoll.poll(). #702
+ * Close connection on websocket handshake error #703
+ * Implement class based views #684
+ * Add headers parameter to ws_connect() #709
+ * Drop unused function parse_remote_addr() #708
+ * Close session on exception #707
+ * Store http code and headers in WSServerHandshakeError #706
+ * Make some low-level message properties readonly #710
+
+-------------------------------------------------------------------
Old:
----
aiohttp-0.19.0.tar.gz
New:
----
aiohttp-0.20.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-aiohttp.spec ++++++
--- /var/tmp/diff_new_pack.2u0kdY/_old 2016-01-05 09:41:50.000000000 +0100
+++ /var/tmp/diff_new_pack.2u0kdY/_new 2016-01-05 09:41:50.000000000 +0100
@@ -17,7 +17,7 @@
Name: python3-aiohttp
-Version: 0.19.0
+Version: 0.20.1
Release: 0
Url: https://pypi.python.org/pypi/aiohttp
Summary: Http client/server for asyncio
++++++ aiohttp-0.19.0.tar.gz -> aiohttp-0.20.1.tar.gz ++++++
++++ 6441 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package python3-Markups for openSUSE:Factory checked in at 2016-01-05 09:41:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-Markups (Old)
and /work/SRC/openSUSE:Factory/.python3-Markups.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-Markups"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-Markups/python3-Markups.changes 2015-12-16 17:45:03.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python3-Markups.new/python3-Markups.changes 2016-01-05 09:41:48.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Dec 30 18:38:33 UTC 2015 - arun(a)gmx.de
+
+- update to version 1.0.1:
+ * The Textile markup now uses the recommended python-textile API.
+ * Fixed warnings during installation.
+ * Python-Markdown Math extension updated to the latest version.
+
+-------------------------------------------------------------------
Old:
----
Markups-1.0.0.tar.gz
New:
----
Markups-1.0.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-Markups.spec ++++++
--- /var/tmp/diff_new_pack.a1EsSP/_old 2016-01-05 09:41:49.000000000 +0100
+++ /var/tmp/diff_new_pack.a1EsSP/_new 2016-01-05 09:41:49.000000000 +0100
@@ -17,7 +17,7 @@
Name: python3-Markups
-Version: 1.0.0
+Version: 1.0.1
Release: 0
Summary: A wrapper around various text markups
License: BSD-3-Clause
++++++ Markups-1.0.0.tar.gz -> Markups-1.0.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-1.0.0/.travis.yml new/Markups-1.0.1/.travis.yml
--- old/Markups-1.0.0/.travis.yml 2015-12-13 15:07:42.000000000 +0100
+++ new/Markups-1.0.1/.travis.yml 2015-12-14 15:20:58.000000000 +0100
@@ -6,5 +6,6 @@
- "3.3"
- "3.4"
- "3.5"
+ - "pypy"
install: pip install Markdown docutils textile
script: python -m unittest discover -s tests -v
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-1.0.0/MANIFEST.in new/Markups-1.0.1/MANIFEST.in
--- old/Markups-1.0.0/MANIFEST.in 2015-08-07 20:37:13.000000000 +0200
+++ new/Markups-1.0.1/MANIFEST.in 2015-12-13 20:19:35.000000000 +0100
@@ -1,6 +1,5 @@
include LICENSE
include README.rst
include changelog
-include examples/example-template.html
recursive-include docs *.rst conf.py
-recursive-include tests *.py *.rst *.html
+recursive-include tests *.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-1.0.0/Markups.egg-info/PKG-INFO new/Markups-1.0.1/Markups.egg-info/PKG-INFO
--- old/Markups-1.0.0/Markups.egg-info/PKG-INFO 2015-12-13 17:23:25.000000000 +0100
+++ new/Markups-1.0.1/Markups.egg-info/PKG-INFO 2015-12-22 15:37:40.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: Markups
-Version: 1.0.0
+Version: 1.0.1
Summary: A wrapper around various text markups
Home-page: https://github.com/retext-project/pymarkups
Author: Dmitry Shachnev
@@ -48,7 +48,7 @@
.. _GitHub: https://github.com/retext-project/pymarkups
Platform: UNKNOWN
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
Classifier: License :: OSI Approved :: BSD License
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-1.0.0/PKG-INFO new/Markups-1.0.1/PKG-INFO
--- old/Markups-1.0.0/PKG-INFO 2015-12-13 17:23:25.000000000 +0100
+++ new/Markups-1.0.1/PKG-INFO 2015-12-22 15:37:41.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: Markups
-Version: 1.0.0
+Version: 1.0.1
Summary: A wrapper around various text markups
Home-page: https://github.com/retext-project/pymarkups
Author: Dmitry Shachnev
@@ -48,7 +48,7 @@
.. _GitHub: https://github.com/retext-project/pymarkups
Platform: UNKNOWN
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
Classifier: License :: OSI Approved :: BSD License
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-1.0.0/changelog new/Markups-1.0.1/changelog
--- old/Markups-1.0.0/changelog 2015-12-13 17:22:27.000000000 +0100
+++ new/Markups-1.0.1/changelog 2015-12-22 15:32:16.000000000 +0100
@@ -1,3 +1,10 @@
+Version 1.0.1, 2015-12-22
+=========================
+
+* The Textile markup now uses the recommended python-textile API.
+* Fixed warnings during installation.
+* Python-Markdown Math extension updated to the latest version.
+
Version 1.0, 2015-12-13
=======================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-1.0.0/markups/__init__.py new/Markups-1.0.1/markups/__init__.py
--- old/Markups-1.0.0/markups/__init__.py 2015-12-13 17:22:27.000000000 +0100
+++ new/Markups-1.0.1/markups/__init__.py 2015-12-22 13:58:08.000000000 +0100
@@ -10,7 +10,7 @@
from markups.restructuredtext import ReStructuredTextMarkup
from markups.textile import TextileMarkup
-__version_tuple__ = (1, 0, 0)
+__version_tuple__ = (1, 0, 1)
__version__ = '.'.join(map(str, __version_tuple__))
builtin_markups = [MarkdownMarkup, ReStructuredTextMarkup, TextileMarkup]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-1.0.0/markups/mdx_mathjax.py new/Markups-1.0.1/markups/mdx_mathjax.py
--- old/Markups-1.0.0/markups/mdx_mathjax.py 2015-08-07 20:37:13.000000000 +0200
+++ new/Markups-1.0.1/markups/mdx_mathjax.py 2015-12-13 19:48:30.000000000 +0100
@@ -40,7 +40,6 @@
node.text = markdown.util.AtomicString(m.group(3))
return node
- configs = self.getConfigs()
inlinemathpatterns = (
markdown.inlinepatterns.Pattern(r'(?<!\\|\$)(\$)([^\$]+)(\$)'), # $...$
markdown.inlinepatterns.Pattern(r'(?<!\\)(\\\()(.+?)(\\\))') # \(...\)
@@ -50,7 +49,7 @@
markdown.inlinepatterns.Pattern(r'(?<!\\)(\\\[)(.+?)(\\\])'), # \[...\]
markdown.inlinepatterns.Pattern(r'(?<!\\)(\\begin{([a-z]+?\*?)})(.+?)(\\end{\3})')
)
- if not configs['enable_dollar_delimiter']:
+ if not self.getConfig('enable_dollar_delimiter'):
inlinemathpatterns = inlinemathpatterns[1:]
for i, pattern in enumerate(inlinemathpatterns):
pattern.handleMatch = handle_match_inline
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-1.0.0/markups/textile.py new/Markups-1.0.1/markups/textile.py
--- old/Markups-1.0.0/markups/textile.py 2015-12-13 14:02:42.000000000 +0100
+++ new/Markups-1.0.1/markups/textile.py 2015-12-22 15:28:11.000000000 +0100
@@ -31,8 +31,8 @@
def __init__(self, filename=None):
AbstractMarkup.__init__(self, filename)
- from textile.core import Textile
- self.parser = Textile()
+ from textile import textile
+ self.textile = textile
def get_document_body(self, text):
- return self.parser.parse(text)
+ return self.textile(text)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-1.0.0/setup.cfg new/Markups-1.0.1/setup.cfg
--- old/Markups-1.0.0/setup.cfg 2015-12-13 17:23:25.000000000 +0100
+++ new/Markups-1.0.1/setup.cfg 2015-12-22 15:37:41.000000000 +0100
@@ -1,5 +1,5 @@
[egg_info]
-tag_date = 0
-tag_build =
tag_svn_revision = 0
+tag_build =
+tag_date = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Markups-1.0.0/setup.py new/Markups-1.0.1/setup.py
--- old/Markups-1.0.0/setup.py 2015-12-13 17:16:09.000000000 +0100
+++ new/Markups-1.0.1/setup.py 2015-12-13 17:25:33.000000000 +0100
@@ -11,7 +11,8 @@
with open(join(dirname(__file__), 'README.rst')) as readme_file:
long_description = '\n' + readme_file.read()
-classifiers = ['Development Status :: 4 - Beta',
+classifiers = [
+ 'Development Status :: 5 - Production/Stable',
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Programming Language :: Python',
1
0
Hello community,
here is the log from the commit of package python3-cffi for openSUSE:Factory checked in at 2016-01-05 09:41:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-cffi (Old)
and /work/SRC/openSUSE:Factory/.python3-cffi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-cffi"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-cffi/python3-cffi.changes 2015-11-23 07:30:21.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python3-cffi.new/python3-cffi.changes 2016-01-05 09:41:47.000000000 +0100
@@ -1,0 +2,41 @@
+Wed Dec 30 18:36:16 UTC 2015 - arun(a)gmx.de
+
+- update to version 1.4.2:
+ * Nothing changed from v1.4.1.
+
+- changes from version 1.4.1:
+ * Fix the compilation failure of cffi on CPython 3.5.0. (3.5.1
+ works; some detail changed that makes some underscore-starting
+ macros disappear from view of extension modules, and I worked
+ around it, thinking it changed in all 3.5 versions—but no: it was
+ only in 3.5.1.)
+
+- changes from version 1.4.0:
+ * A better way to do callbacks has been added (faster and more
+ portable, and usually cleaner). It is a mechanism for the
+ out-of-line API mode that replaces the dynamic creation of
+ callback objects (i.e. C functions that invoke Python) with the
+ static declaration in cdef() of which callbacks are needed. This
+ is more C-like, in that you have to structure your code around the
+ idea that you get a fixed number of function pointers, instead of
+ creating them on-the-fly.
+ * ffi.compile() now takes an optional verbose argument. When True,
+ distutils prints the calls to the compiler.
+ * ffi.compile() used to fail if given sources with a path that
+ includes "..". Fixed.
+ * ffi.init_once() added. See docs.
+ * dir(lib) now works on libs returned by ffi.dlopen() too.
+ * Cleaned up and modernized the content of the demo subdirectory in
+ the sources (thanks matti!).
+ * ffi.new_handle() is now guaranteed to return unique void * values,
+ even if called twice on the same object. Previously, in that case,
+ CPython would return two cdata objects with the same void *
+ value. This change is useful to add and remove handles from a
+ global dict (or set) without worrying about duplicates. It already
+ used to work like that on PyPy. This change can break code that
+ used to work on CPython by relying on the object to be kept alive
+ by other means than keeping the result of ffi.new_handle()
+ alive. (The corresponding warning in the docs of ffi.new_handle()
+ has been here since v0.8!)
+
+-------------------------------------------------------------------
Old:
----
cffi-1.3.1.tar.gz
New:
----
cffi-1.4.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-cffi.spec ++++++
--- /var/tmp/diff_new_pack.AYcbsq/_old 2016-01-05 09:41:48.000000000 +0100
+++ /var/tmp/diff_new_pack.AYcbsq/_new 2016-01-05 09:41:48.000000000 +0100
@@ -17,7 +17,7 @@
Name: python3-cffi
-Version: 1.3.1
+Version: 1.4.2
Release: 0
Summary: Foreign Function Interface for Python calling C code
License: MIT
++++++ cffi-1.3.1.tar.gz -> cffi-1.4.2.tar.gz ++++++
++++ 3225 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package gajim for openSUSE:Factory checked in at 2016-01-05 09:41:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gajim (Old)
and /work/SRC/openSUSE:Factory/.gajim.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gajim"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gajim/gajim.changes 2015-09-30 05:52:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gajim.new/gajim.changes 2016-01-05 09:41:45.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Dec 29 05:32:40 UTC 2015 - sor.alexei(a)meowr.ru
+
+- Update to 0.16.5:
+ * Improve MAM implementation.
+ * Improve security on connexion and for roster managment.
+ * Ability for emoticons to be sorted in menu.
+
+-------------------------------------------------------------------
Old:
----
gajim-0.16.4.tar.gz
New:
----
gajim-0.16.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gajim.spec ++++++
--- /var/tmp/diff_new_pack.xRnRE4/_old 2016-01-05 09:41:46.000000000 +0100
+++ /var/tmp/diff_new_pack.xRnRE4/_new 2016-01-05 09:41:46.000000000 +0100
@@ -18,13 +18,13 @@
%define _version 0.16
Name: gajim
-Version: 0.16.4
+Version: 0.16.5
Release: 0
Summary: Full-featured XMPP client written in Python and Gtk2
License: GPL-3.0+
Group: Productivity/Networking/Talk/Clients
-Url: http://gajim.org/
-Source: http://gajim.org/downloads/%{_version}/%{name}-%{version}.tar.gz
+Url: https://gajim.org/
+Source: https://gajim.org/downloads/%{_version}/%{name}-%{version}.tar.gz
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: fdupes
@@ -126,7 +126,7 @@
%{_bindir}/%{name}*
%{_datadir}/%{name}/
%{python_sitelib}/%{name}/
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/%{name}*.desktop
%{_datadir}/icons/hicolor/*/*/*
%{_mandir}/man?/%{name}*%{?ext_man}
++++++ gajim-0.16.4.tar.gz -> gajim-0.16.5.tar.gz ++++++
++++ 253670 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package plasma5-desktop for openSUSE:Factory checked in at 2016-01-05 09:41:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma5-desktop (Old)
and /work/SRC/openSUSE:Factory/.plasma5-desktop.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-desktop"
Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma5-desktop/plasma5-desktop.changes 2016-01-03 13:27:27.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.plasma5-desktop.new/plasma5-desktop.changes 2016-01-05 09:41:42.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Jan 4 07:53:46 UTC 2016 - mlin(a)suse.com
+
+- Add pkgconfig(xft) and pkgconfig(xi), seems it was affected by
+ libcanberra-devel changes too.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma5-desktop.spec ++++++
--- /var/tmp/diff_new_pack.thrcUU/_old 2016-01-05 09:41:43.000000000 +0100
+++ /var/tmp/diff_new_pack.thrcUU/_new 2016-01-05 09:41:43.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package plasma5-desktop
#
-# 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
@@ -89,6 +89,8 @@
BuildRequires: pkgconfig(xcb-image)
BuildRequires: pkgconfig(xcb-shm)
BuildRequires: pkgconfig(xcursor)
+BuildRequires: pkgconfig(xft)
+BuildRequires: pkgconfig(xi)
BuildRequires: pkgconfig(xorg-evdev)
BuildRequires: pkgconfig(xorg-server)
BuildRequires: pkgconfig(xorg-synaptics)
@@ -212,7 +214,9 @@
%dir %{_kf5_htmldir}/en
%dir %{_kf5_htmldir}
%doc %{_kf5_htmldir}/en/*/
-%{_kf5_sharedir}/icons/*/*/*/*.*
+%dir %{_kf5_sharedir}/icons/hicolor/*/
+%dir %{_kf5_sharedir}/icons/hicolor/*/*/
+%{_kf5_sharedir}/icons/hicolor/*/*/*.*
%{_kf5_configkcfgdir}/
%{_kf5_sharedir}/kcm_componentchooser/
%{_kf5_sharedir}/kcm_phonon/
1
0
Hello community,
here is the log from the commit of package MozillaThunderbird for openSUSE:Factory checked in at 2016-01-05 09:41:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/MozillaThunderbird (Old)
and /work/SRC/openSUSE:Factory/.MozillaThunderbird.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaThunderbird"
Changes:
--------
--- /work/SRC/openSUSE:Factory/MozillaThunderbird/MozillaThunderbird.changes 2015-12-27 01:59:49.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/MozillaThunderbird.changes 2016-01-05 09:41:31.000000000 +0100
@@ -1,0 +2,10 @@
+Tue Dec 29 20:30:59 UTC 2015 - wr(a)rosenauer.org
+
+- update to Thunderbird 38.5.1
+ * requires NSS 3.20.2 to fix
+ MFSA 2015-150/CVE-2015-7575 (bmo#1158489)
+ MD5 signatures accepted within TLS 1.2 ServerKeyExchange in
+ server signature
+- explicitely require libXcomposite-devel
+
+-------------------------------------------------------------------
Old:
----
l10n-38.5.0.tar.xz
thunderbird-38.5.0-source.tar.xz
New:
----
l10n-38.5.1.tar.xz
thunderbird-38.5.1-source.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MozillaThunderbird.spec ++++++
--- /var/tmp/diff_new_pack.FkokNH/_old 2016-01-05 09:41:42.000000000 +0100
+++ /var/tmp/diff_new_pack.FkokNH/_new 2016-01-05 09:41:42.000000000 +0100
@@ -17,7 +17,7 @@
#
-%define mainversion 38.5.0
+%define mainversion 38.5.1
%define update_channel release
%if %suse_version > 1210
@@ -38,12 +38,13 @@
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: hunspell-devel
+BuildRequires: libXcomposite-devel
BuildRequires: libcurl-devel
BuildRequires: libgnomeui-devel
BuildRequires: libidl-devel
BuildRequires: libnotify-devel
BuildRequires: mozilla-nspr-devel >= 4.10.10
-BuildRequires: mozilla-nss-devel >= 3.19.2.1
+BuildRequires: mozilla-nss-devel >= 3.20.2
BuildRequires: python
BuildRequires: startup-notification-devel
BuildRequires: unzip
++++++ compare-locales.tar.xz ++++++
++++++ create-tar.sh ++++++
--- /var/tmp/diff_new_pack.FkokNH/_old 2016-01-05 09:41:42.000000000 +0100
+++ /var/tmp/diff_new_pack.FkokNH/_new 2016-01-05 09:41:42.000000000 +0100
@@ -2,8 +2,8 @@
CHANNEL="esr38"
BRANCH="releases/comm-$CHANNEL"
-RELEASE_TAG="THUNDERBIRD_38_5_0_RELEASE"
-VERSION="38.5.0"
+RELEASE_TAG="THUNDERBIRD_38_5_1_RELEASE"
+VERSION="38.5.1"
echo "cloning $BRANCH..."
hg clone http://hg.mozilla.org/$BRANCH thunderbird
++++++ l10n-38.5.0.tar.xz -> l10n-38.5.1.tar.xz ++++++
/work/SRC/openSUSE:Factory/MozillaThunderbird/l10n-38.5.0.tar.xz /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/l10n-38.5.1.tar.xz differ: char 26, line 1
++++++ thunderbird-38.5.0-source.tar.xz -> thunderbird-38.5.1-source.tar.xz ++++++
/work/SRC/openSUSE:Factory/MozillaThunderbird/thunderbird-38.5.0-source.tar.xz /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/thunderbird-38.5.1-source.tar.xz differ: char 26, line 1
1
0
Hello community,
here is the log from the commit of package unoconv for openSUSE:Factory checked in at 2016-01-05 09:40:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/unoconv (Old)
and /work/SRC/openSUSE:Factory/.unoconv.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unoconv"
Changes:
--------
--- /work/SRC/openSUSE:Factory/unoconv/unoconv.changes 2014-11-05 16:26:35.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.unoconv.new/unoconv.changes 2016-01-05 09:41:30.000000000 +0100
@@ -1,0 +2,21 @@
+Tue Dec 29 21:11:36 UTC 2015 - adam(a)mizerski.pl
+
+- Always include all patches. Just apply them conditionally.
+
+-------------------------------------------------------------------
+Mon Dec 28 11:09:46 UTC 2015 - adam(a)mizerski.pl
+
+- update to 0.7
+ - Changes are in CHANGELOG.md and ChangeLog files.
+- pulled patches from Fedora:
+ - 0001-libreoffice-or-OO.o-has-never-had-wps-export.patch
+ - 0001-make-LaTeX-export-usable-with-writer2latex-ext.patch
+ - 0001-python3-added-compatibility.patch
+ - this is an update/replacement for unoconv-python3.patch
+ - 0001-Updated-ChangeLog.patch
+ - 0001-update-FSF-address.patch
+ - tweaked last line to make it appliable on unoconv
+ - 0002-remove-export-formats-dropped-by-LibreOffice.patch
+- made python3 patch be applied also for openSUSE Leap (boo#954814)
+
+-------------------------------------------------------------------
Old:
----
unoconv-0.6.tar.gz
unoconv-python3.patch
New:
----
0001-Updated-ChangeLog.patch
0001-libreoffice-or-OO.o-has-never-had-wps-export.patch
0001-make-LaTeX-export-usable-with-writer2latex-ext.patch
0001-python3-added-compatibility.patch
0001-update-FSF-address.patch
0002-remove-export-formats-dropped-by-LibreOffice.patch
unoconv-0.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ unoconv.spec ++++++
--- /var/tmp/diff_new_pack.7J3O0o/_old 2016-01-05 09:41:31.000000000 +0100
+++ /var/tmp/diff_new_pack.7J3O0o/_new 2016-01-05 09:41:31.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package unoconv
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,16 +17,20 @@
Name: unoconv
-Version: 0.6
+Version: 0.7
Release: 0
Summary: Tool to convert between any document format supported by LibreOffice
License: GPL-2.0
Group: Productivity/File utilities
Url: http://dag.wieers.com/home-made/unoconv/
Source: http://dag.wieers.com/home-made/unoconv/unoconv-%{version}.tar.gz
-%if 0%{?suse_version} >= 1320
-# PATCH-FIX-UPSTREAM unoconv-python3.patch dimstar(a)opensuse.org -- Port to python3, patch from Fedora
-Patch0: unoconv-python3.patch
+Patch0: 0001-python3-added-compatibility.patch
+Patch1: 0001-update-FSF-address.patch
+Patch2: 0001-make-LaTeX-export-usable-with-writer2latex-ext.patch
+Patch3: 0001-libreoffice-or-OO.o-has-never-had-wps-export.patch
+Patch4: 0002-remove-export-formats-dropped-by-LibreOffice.patch
+Patch5: 0001-Updated-ChangeLog.patch
+%if 0%{?suse_version} >= 1315
Requires: python >= 3.0
%endif
Requires: libreoffice-pyuno
@@ -48,9 +52,14 @@
%prep
%setup -q
-%if 0%{?suse_version} >= 1320
+%if 0%{?suse_version} >= 1315
%patch0 -p1
%endif
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
@@ -61,7 +70,7 @@
%files
%defattr(-, root, root, 0755)
-%doc AUTHORS ChangeLog COPYING README.asciidoc WISHLIST doc/*.txt
+%doc AUTHORS CHANGELOG.md ChangeLog COPYING README.adoc doc/*.adoc
%doc %{_mandir}/man1/unoconv.1*
%{_bindir}/*
++++++ 0001-Updated-ChangeLog.patch ++++++
>From b02c77cc669715858a2e6a658cb1988e5e89cf3b Mon Sep 17 00:00:00 2001
From: Dag Wieers <dag(a)wieers.com>
Date: Thu, 9 Jul 2015 01:47:52 +0200
Subject: [PATCH] Updated ChangeLog
---
ChangeLog | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 0c21fb4..7ca8755 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
* 0.7 - released 2015-07-09
--
+- Ported to Python 3 (Riccardo Magliocchetti)
+- Update Indexes (eg. TOC) during conversion (Peter Demin)
+- Added XLSX support (Josias Montag)
+- Fix output to non-existing directory
+- Ensure that LibreOfficeDev release are using new long options (Chia-liang Kao)
+- Set output format based on output filename extension (Patrick McAndrew)
+- Accept 'office' as binary on MacOSX (Andreas Jung)
+- Added Microsoft WPS import filter (Josias Montag)
+- Fix --stdout output on Python 3 (Caolán McNamara)
+- Added -F/--field option to update user fields during conversion (Raphaël Pinson)
+- Added OpenOffice search path on MacOSX (Vittal Aithal)
+- Cycle through all images references before conversion
+- Added --preserve option to preserve timestamp and permissions (Vincent Bernat)
+- Added --stdin option to read from standard input
+- Accept remote URLs as input filename
+- Fix exit code 81 and recover from initial failure (Daniel Vandersluis)
+- Improve documentation related to error codes and using unoconv with Nginx/Apache/PHP
+
* 0.6 - released 2012-09-10
- Implement debugging output (-vvv)
--
2.1.0
++++++ 0001-libreoffice-or-OO.o-has-never-had-wps-export.patch ++++++
>From aa46d3cbcec14ae46a176165852089558c524ff2 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon(a)redhat.com>
Date: Fri, 10 Jul 2015 12:55:13 +0200
Subject: [PATCH] libreoffice (or OO.o) has never had wps export
---
unoconv | 1 -
1 file changed, 1 deletion(-)
diff --git a/unoconv b/unoconv
index 2e56d3c..1158374 100755
--- a/unoconv
+++ b/unoconv
@@ -377,7 +377,6 @@ fmts.add('document', 'uot', 'uot', 'Unified Office Format text','UOF text') ###
fmts.add('document', 'vor', 'vor', 'StarWriter 5.0 Template', 'StarWriter 5.0 Vorlage/Template') ### 6
fmts.add('document', 'vor4', 'vor', 'StarWriter 4.0 Template', 'StarWriter 4.0 Vorlage/Template') ### 5
fmts.add('document', 'vor3', 'vor', 'StarWriter 3.0 Template', 'StarWriter 3.0 Vorlage/Template') ### 4
-fmts.add('document', 'wps', 'wps', 'Microsoft Works', 'MS_Works')
fmts.add('document', 'xhtml', 'html', 'XHTML Document', 'XHTML Writer File') ### 33
### WebDocument
--
2.1.0
++++++ 0001-make-LaTeX-export-usable-with-writer2latex-ext.patch ++++++
>From 7b17d0160d9bd940e40c906684646ad7e4024c24 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon(a)redhat.com>
Date: Sat, 19 Apr 2014 11:18:41 +0200
Subject: [PATCH 1/2] make LaTeX export usable with writer2latex ext.
---
unoconv | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/unoconv b/unoconv
index 30e6706..dd73799 100755
--- a/unoconv
+++ b/unoconv
@@ -344,7 +344,7 @@ class FmtList:
fmts = FmtList()
### TextDocument
-fmts.add('document', 'bib', 'bib', 'BibTeX', 'BibTeX_Writer') ### 22
+fmts.add('document', 'bib', 'bib', 'BibTeX', 'org.openoffice.da.writer2bibtex') ### 22
fmts.add('document', 'doc', 'doc', 'Microsoft Word 97/2000/XP', 'MS Word 97') ### 29
fmts.add('document', 'doc6', 'doc', 'Microsoft Word 6.0', 'MS WinWord 6.0') ### 24
fmts.add('document', 'doc95', 'doc', 'Microsoft Word 95', 'MS Word 95') ### 28
@@ -353,7 +353,7 @@ fmts.add('document', 'docx', 'docx', 'Microsoft Office Open XML', 'Office Open X
fmts.add('document', 'docx7', 'docx', 'Microsoft Office Open XML', 'MS Word 2007 XML')
fmts.add('document', 'fodt', 'fodt', 'OpenDocument Text (Flat XML)', 'OpenDocument Text Flat XML')
fmts.add('document', 'html', 'html', 'HTML Document (OpenOffice.org Writer)', 'HTML (StarWriter)') ### 3
-fmts.add('document', 'latex', 'ltx', 'LaTeX 2e', 'LaTeX_Writer') ### 31
+fmts.add('document', 'latex', 'ltx', 'LaTeX 2e', 'org.openoffice.da.writer2latex') ### 31
fmts.add('document', 'mediawiki', 'txt', 'MediaWiki', 'MediaWiki')
fmts.add('document', 'odt', 'odt', 'ODF Text Document', 'writer8') ### 10
fmts.add('document', 'ooxml', 'xml', 'Microsoft Office Open XML', 'MS Word 2003 XML') ### 11
--
1.9.0
++++++ 0001-python3-added-compatibility.patch ++++++
>From 21b9a845ac7e8805b41d7dab1a6fbf8076689ae8 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Sat, 19 Apr 2014 12:06:27 +0200
Subject: [PATCH] 0001-python3-added-compatibility.3.patch
---
unoconv | 248 ++++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 139 insertions(+), 109 deletions(-)
diff --git a/unoconv b/unoconv
index 30e6706..a13db44 100755
--- a/unoconv
+++ b/unoconv
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
### This program is free software; you can redistribute it and/or modify
### it under the terms of the GNU General Public License as published by
--
1.9.0
++++++ 0001-update-FSF-address.patch ++++++
>From 4be0b90f1935120e4f9196b6fc126248079cbf11 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon(a)redhat.com>
Date: Mon, 5 Nov 2012 15:08:24 +0100
Subject: [PATCH] update FSF address
---
COPYING | 41 ++++++++++++++++++++---------------------
unoconv | 3 ++-
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/COPYING b/COPYING
index d60c31a..d159169 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,12 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
-
- GNU GENERAL PUBLIC LICENSE
+
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
diff --git a/unoconv b/unoconv
index 30e6706..e4a1ac8 100755
--- a/unoconv
+++ b/unoconv
@@ -11,7 +11,8 @@
###
### You should have received a copy of the GNU General Public License
### along with this program; if not, write to the Free Software
-### Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+### Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+### MA 02110-1301 USA.
### Copyright 2007-2010 Dag Wieers <dag(a)wieers.com>
from __future__ import print_function
--
1.7.11.7
++++++ 0002-remove-export-formats-dropped-by-LibreOffice.patch ++++++
>From da17429f0deed3999ffeb98fc0f3688c6e413765 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon(a)redhat.com>
Date: Sat, 19 Apr 2014 11:26:26 +0200
Subject: [PATCH 2/2] remove export formats dropped by LibreOffice
---
unoconv | 32 --------------------------------
1 file changed, 32 deletions(-)
diff --git a/unoconv b/unoconv
index dd73799..a5d29da 100755
--- a/unoconv
+++ b/unoconv
@@ -358,21 +358,13 @@ fmts.add('document', 'mediawiki', 'txt', 'MediaWiki', 'MediaWiki')
fmts.add('document', 'odt', 'odt', 'ODF Text Document', 'writer8') ### 10
fmts.add('document', 'ooxml', 'xml', 'Microsoft Office Open XML', 'MS Word 2003 XML') ### 11
fmts.add('document', 'ott', 'ott', 'Open Document Text', 'writer8_template') ### 21
-fmts.add('document', 'pdb', 'pdb', 'AportisDoc (Palm)', 'AportisDoc Palm DB')
fmts.add('document', 'pdf', 'pdf', 'Portable Document Format', 'writer_pdf_Export') ### 18
-fmts.add('document', 'psw', 'psw', 'Pocket Word', 'PocketWord File')
fmts.add('document', 'rtf', 'rtf', 'Rich Text Format', 'Rich Text Format') ### 16
-fmts.add('document', 'sdw', 'sdw', 'StarWriter 5.0', 'StarWriter 5.0') ### 23
-fmts.add('document', 'sdw4', 'sdw', 'StarWriter 4.0', 'StarWriter 4.0') ### 2
-fmts.add('document', 'sdw3', 'sdw', 'StarWriter 3.0', 'StarWriter 3.0') ### 20
fmts.add('document', 'stw', 'stw', 'Open Office.org 1.0 Text Document Template', 'writer_StarOffice_XML_Writer_Template') ### 9
fmts.add('document', 'sxw', 'sxw', 'Open Office.org 1.0 Text Document', 'StarOffice XML (Writer)') ### 1
fmts.add('document', 'text', 'txt', 'Text Encoded', 'Text (encoded)') ### 26
fmts.add('document', 'txt', 'txt', 'Text', 'Text') ### 34
fmts.add('document', 'uot', 'uot', 'Unified Office Format text','UOF text') ### 27
-fmts.add('document', 'vor', 'vor', 'StarWriter 5.0 Template', 'StarWriter 5.0 Vorlage/Template') ### 6
-fmts.add('document', 'vor4', 'vor', 'StarWriter 4.0 Template', 'StarWriter 4.0 Vorlage/Template') ### 5
-fmts.add('document', 'vor3', 'vor', 'StarWriter 3.0 Template', 'StarWriter 3.0 Vorlage/Template') ### 4
fmts.add('document', 'xhtml', 'html', 'XHTML Document', 'XHTML Writer File') ### 33
### WebDocument
@@ -382,14 +374,9 @@ fmts.add('web', 'html', 'html', 'HTML Document', 'HTML') ### 2
fmts.add('web', 'html', 'html', 'HTML Document Template', 'writerweb8_writer_template') ### 13
fmts.add('web', 'mediawiki', 'txt', 'MediaWiki', 'MediaWiki_Web') ### 9
fmts.add('web', 'pdf', 'pdf', 'PDF - Portable Document Format', 'writer_web_pdf_Export') ### 10
-fmts.add('web', 'sdw3', 'sdw', 'StarWriter 3.0 (OpenOffice.org Writer/Web)', 'StarWriter 3.0 (StarWriter/Web)') ### 3
-fmts.add('web', 'sdw4', 'sdw', 'StarWriter 4.0 (OpenOffice.org Writer/Web)', 'StarWriter 4.0 (StarWriter/Web)') ### 4
-fmts.add('web', 'sdw', 'sdw', 'StarWriter 5.0 (OpenOffice.org Writer/Web)', 'StarWriter 5.0 (StarWriter/Web)') ### 5
fmts.add('web', 'txt', 'txt', 'OpenOffice.org Text (OpenOffice.org Writer/Web)', 'writerweb8_writer') ### 12
fmts.add('web', 'text10', 'txt', 'OpenOffice.org 1.0 Text Document (OpenOffice.org Writer/Web)', 'writer_web_StarOffice_XML_Writer') ### 15
fmts.add('web', 'text', 'txt', 'Text (OpenOffice.org Writer/Web)', 'Text (StarWriter/Web)') ### 8
-fmts.add('web', 'vor4', 'vor', 'StarWriter/Web 4.0 Template', 'StarWriter/Web 4.0 Vorlage/Template') ### 6
-fmts.add('web', 'vor', 'vor', 'StarWriter/Web 5.0 Template', 'StarWriter/Web 5.0 Vorlage/Template') ### 7
### Spreadsheet
fmts.add('spreadsheet', 'csv', 'csv', 'Text CSV', 'Text - txt - csv (StarCalc)') ### 16
@@ -401,17 +388,10 @@ fmts.add('spreadsheet', 'ods', 'ods', 'ODF Spreadsheet', 'calc8') ### 15
fmts.add('spreadsheet', 'ooxml', 'xml', 'Microsoft Excel 2003 XML', 'MS Excel 2003 XML') ### 23
fmts.add('spreadsheet', 'ots', 'ots', 'ODF Spreadsheet Template', 'calc8_template') ### 14
fmts.add('spreadsheet', 'pdf', 'pdf', 'Portable Document Format', 'calc_pdf_Export') ### 34
-fmts.add('spreadsheet', 'pxl', 'pxl', 'Pocket Excel', 'Pocket Excel')
-fmts.add('spreadsheet', 'sdc', 'sdc', 'StarCalc 5.0', 'StarCalc 5.0') ### 31
-fmts.add('spreadsheet', 'sdc4', 'sdc', 'StarCalc 4.0', 'StarCalc 4.0') ### 11
-fmts.add('spreadsheet', 'sdc3', 'sdc', 'StarCalc 3.0', 'StarCalc 3.0') ### 29
fmts.add('spreadsheet', 'slk', 'slk', 'SYLK', 'SYLK') ### 35
fmts.add('spreadsheet', 'stc', 'stc', 'OpenOffice.org 1.0 Spreadsheet Template', 'calc_StarOffice_XML_Calc_Template') ### 2
fmts.add('spreadsheet', 'sxc', 'sxc', 'OpenOffice.org 1.0 Spreadsheet', 'StarOffice XML (Calc)') ### 3
fmts.add('spreadsheet', 'uos', 'uos', 'Unified Office Format spreadsheet', 'UOF spreadsheet') ### 9
-fmts.add('spreadsheet', 'vor3', 'vor', 'StarCalc 3.0 Template', 'StarCalc 3.0 Vorlage/Template') ### 18
-fmts.add('spreadsheet', 'vor4', 'vor', 'StarCalc 4.0 Template', 'StarCalc 4.0 Vorlage/Template') ### 19
-fmts.add('spreadsheet', 'vor', 'vor', 'StarCalc 5.0 Template', 'StarCalc 5.0 Vorlage/Template') ### 20
fmts.add('spreadsheet', 'xhtml', 'xhtml', 'XHTML', 'XHTML Calc File') ### 26
fmts.add('spreadsheet', 'xls', 'xls', 'Microsoft Excel 97/2000/XP', 'MS Excel 97') ### 12
fmts.add('spreadsheet', 'xls5', 'xls', 'Microsoft Excel 5.0', 'MS Excel 5.0/95') ### 8
@@ -443,12 +423,7 @@ fmts.add('graphics', 'svg', 'svg', 'Scalable Vector Graphics', 'draw_svg_Export'
fmts.add('graphics', 'svm', 'svm', 'StarView Metafile', 'draw_svm_Export') ### 55
fmts.add('graphics', 'swf', 'swf', 'Macromedia Flash (SWF)', 'draw_flash_Export') ### 23
fmts.add('graphics', 'sxd', 'sxd', 'OpenOffice.org 1.0 Drawing', 'StarOffice XML (Draw)') ### 26
-fmts.add('graphics', 'sxd3', 'sxd', 'StarDraw 3.0', 'StarDraw 3.0') ### 40
-fmts.add('graphics', 'sxd5', 'sxd', 'StarDraw 5.0', 'StarDraw 5.0') ### 44
-fmts.add('graphics', 'sxw', 'sxw', 'StarOffice XML (Draw)', 'StarOffice XML (Draw)')
fmts.add('graphics', 'tiff', 'tiff', 'Tagged Image File Format', 'draw_tif_Export') ### 13
-fmts.add('graphics', 'vor', 'vor', 'StarDraw 5.0 Template', 'StarDraw 5.0 Vorlage') ### 36
-fmts.add('graphics', 'vor3', 'vor', 'StarDraw 3.0 Template', 'StarDraw 3.0 Vorlage') ### 35
fmts.add('graphics', 'wmf', 'wmf', 'Windows Metafile', 'draw_wmf_Export') ### 8
fmts.add('graphics', 'xhtml', 'xhtml', 'XHTML', 'XHTML Draw File') ### 45
fmts.add('graphics', 'xpm', 'xpm', 'X PixMap', 'draw_xpm_Export') ### 19
@@ -479,9 +454,6 @@ fmts.add('presentation', 'ppt', 'ppt', 'Microsoft PowerPoint 97/2000/XP', 'MS Po
fmts.add('presentation', 'pwp', 'pwp', 'PlaceWare', 'placeware_Export') ### 30
fmts.add('presentation', 'ras', 'ras', 'Sun Raster Image', 'impress_ras_Export') ### 27
fmts.add('presentation', 'sda', 'sda', 'StarDraw 5.0 (OpenOffice.org Impress)', 'StarDraw 5.0 (StarImpress)') ### 8
-fmts.add('presentation', 'sdd', 'sdd', 'StarImpress 5.0', 'StarImpress 5.0') ### 6
-fmts.add('presentation', 'sdd3', 'sdd', 'StarDraw 3.0 (OpenOffice.org Impress)', 'StarDraw 3.0 (StarImpress)') ### 42
-fmts.add('presentation', 'sdd4', 'sdd', 'StarImpress 4.0', 'StarImpress 4.0') ### 37
fmts.add('presentation', 'sxd', 'sxd', 'OpenOffice.org 1.0 Drawing (OpenOffice.org Impress)', 'impress_StarOffice_XML_Draw') ### 31
fmts.add('presentation', 'sti', 'sti', 'OpenOffice.org 1.0 Presentation Template', 'impress_StarOffice_XML_Impress_Template') ### 5
fmts.add('presentation', 'svg', 'svg', 'Scalable Vector Graphics', 'impress_svg_Export') ### 14
@@ -490,10 +462,6 @@ fmts.add('presentation', 'swf', 'swf', 'Macromedia Flash (SWF)', 'impress_flash_
fmts.add('presentation', 'sxi', 'sxi', 'OpenOffice.org 1.0 Presentation', 'StarOffice XML (Impress)') ### 41
fmts.add('presentation', 'tiff', 'tiff', 'Tagged Image File Format', 'impress_tif_Export') ### 12
fmts.add('presentation', 'uop', 'uop', 'Unified Office Format presentation', 'UOF presentation') ### 4
-fmts.add('presentation', 'vor', 'vor', 'StarImpress 5.0 Template', 'StarImpress 5.0 Vorlage') ### 40
-fmts.add('presentation', 'vor3', 'vor', 'StarDraw 3.0 Template (OpenOffice.org Impress)', 'StarDraw 3.0 Vorlage (StarImpress)') ###1
-fmts.add('presentation', 'vor4', 'vor', 'StarImpress 4.0 Template', 'StarImpress 4.0 Vorlage') ### 39
-fmts.add('presentation', 'vor5', 'vor', 'StarDraw 5.0 Template (OpenOffice.org Impress)', 'StarDraw 5.0 Vorlage (StarImpress)') ### 2
fmts.add('presentation', 'wmf', 'wmf', 'Windows Metafile', 'impress_wmf_Export') ### 11
fmts.add('presentation', 'xhtml', 'xml', 'XHTML', 'XHTML Impress File') ### 33
fmts.add('presentation', 'xpm', 'xpm', 'X PixMap', 'impress_xpm_Export') ### 10
--
1.9.0
++++++ unoconv-0.6.tar.gz -> unoconv-0.7.tar.gz ++++++
++++ 4308 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2016-01-05 09:40:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old)
and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaFirefox"
Changes:
--------
--- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2015-12-27 01:57:14.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2016-01-05 09:41:17.000000000 +0100
@@ -1,0 +2,14 @@
+Tue Dec 29 20:29:35 UTC 2015 - wr(a)rosenauer.org
+
+- update to Firefox 43.0.3
+ * requires NSS 3.20.2 to fix
+ MFSA 2015-150/CVE-2015-7575 (bmo#1158489)
+ MD5 signatures accepted within TLS 1.2 ServerKeyExchange in
+ server signature
+ * various changes to support Windows update (SHA-1 vs. SHA-2)
+ * workaround Youtube user agent detection issue (bmo#1233970)
+- fix file download regression for multi user systems
+ (bmo#1233434) (mozilla-bmo1233434.patch)
+- explicitely requires libXcomposite-devel
+
+-------------------------------------------------------------------
Old:
----
firefox-43.0-source.tar.xz
l10n-43.0.tar.xz
New:
----
firefox-43.0.3-source.tar.xz
l10n-43.0.3.tar.xz
mozilla-bmo1233434.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MozillaFirefox.spec ++++++
--- /var/tmp/diff_new_pack.Os2ddw/_old 2016-01-05 09:41:29.000000000 +0100
+++ /var/tmp/diff_new_pack.Os2ddw/_new 2016-01-05 09:41:29.000000000 +0100
@@ -19,9 +19,9 @@
# changed with every update
%define major 43
-%define mainver %major.0
+%define mainver %major.0.3
%define update_channel release
-%define releasedate 2015121300
+%define releasedate 2015122500
# general build definitions
%if "%{update_channel}" != "aurora"
@@ -69,6 +69,7 @@
BuildRequires: dbus-1-glib-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
+BuildRequires: libXcomposite-devel
BuildRequires: libcurl-devel
BuildRequires: libgnomeui-devel
BuildRequires: libidl-devel
@@ -77,7 +78,7 @@
BuildRequires: libproxy-devel
BuildRequires: makeinfo
BuildRequires: mozilla-nspr-devel >= 4.10.10
-BuildRequires: mozilla-nss-devel >= 3.19.4
+BuildRequires: mozilla-nss-devel >= 3.20.2
BuildRequires: nss-shared-helper-devel
BuildRequires: python-devel
BuildRequires: startup-notification-devel
@@ -90,6 +91,17 @@
BuildRequires: pkgconfig(gstreamer-app-%gstreamer_ver)
BuildRequires: pkgconfig(gstreamer-plugins-base-%gstreamer_ver)
BuildRequires: pkgconfig(libpulse)
+# libavcodec is already used if available for H.264 but
+# explicitely loaded by FF. For proper H.264 support the
+# openSUSE delivered version is not sufficient but currently
+# prevents even the use of the GStreamer method
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1234157
+# to get H.264 working correctly libavcodec from packman
+# is required. As of today the following recommends will
+# pull in libavcodec52 from packman since it's the only
+# package providing libavcodec but it's not loaded from
+# Firefox as the minimal version is 53
+#Recommends: libavcodec
%if 0%{?gstreamer} == 1
Requires: libgstreamer-1_0-0
Recommends: gstreamer-fluendo-mp3
@@ -147,6 +159,7 @@
Patch8: mozilla-openaes-decl.patch
Patch10: mozilla-no-stdcxx-check.patch
Patch11: mozilla-libproxy.patch
+Patch12: mozilla-bmo1233434.patch
# Firefox/browser
Patch101: firefox-kde.patch
Patch102: firefox-no-default-ualocale.patch
@@ -256,6 +269,7 @@
%patch8 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
# Firefox
%patch101 -p1
%patch102 -p1
++++++ compare-locales.tar.xz ++++++
++++++ create-tar.sh ++++++
--- /var/tmp/diff_new_pack.Os2ddw/_old 2016-01-05 09:41:29.000000000 +0100
+++ /var/tmp/diff_new_pack.Os2ddw/_new 2016-01-05 09:41:29.000000000 +0100
@@ -2,8 +2,8 @@
CHANNEL="release"
BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_43_0_RELEASE"
-VERSION="43.0"
+RELEASE_TAG="FIREFOX_43_0_3_RELEASE"
+VERSION="43.0.3"
# mozilla
if [ -d mozilla ]; then
++++++ firefox-43.0-source.tar.xz -> firefox-43.0.3-source.tar.xz ++++++
/work/SRC/openSUSE:Factory/MozillaFirefox/firefox-43.0-source.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-43.0.3-source.tar.xz differ: char 26, line 1
++++++ l10n-43.0.tar.xz -> l10n-43.0.3.tar.xz ++++++
/work/SRC/openSUSE:Factory/MozillaFirefox/l10n-43.0.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-43.0.3.tar.xz differ: char 26, line 1
++++++ mozilla-bmo1233434.patch ++++++
# HG changeset patch
# User Aidin Gharibnavaz <aidin(a)aidinhut.com>
# Date 1450550460 -12600
# Node ID 07ec362866977f37e638fc88e3079621fd7aef96
# Parent cb66ffeb6725e8344818e8e2f707ae2eaeb953b4
Bug 1233434 - Fixing download failure on a multi-user GNU/Linux machine. r?bagder
diff -r cb66ffeb6725 -r 07ec36286697 uriloader/exthandler/nsExternalHelperAppService.cpp
--- a/uriloader/exthandler/nsExternalHelperAppService.cpp Tue Dec 15 14:45:06 2015 +0100
+++ b/uriloader/exthandler/nsExternalHelperAppService.cpp Sat Dec 19 22:11:00 2015 +0330
@@ -416,12 +416,12 @@
const char* userName = PR_GetEnv("USERNAME");
if (!userName || !*userName) {
userName = PR_GetEnv("USER");
- if (!userName || !*userName) {
- userName = PR_GetEnv("LOGNAME");
- }
- else {
- userName = "mozillaUser";
- }
+ }
+ if (!userName || !*userName) {
+ userName = PR_GetEnv("LOGNAME");
+ }
+ if (!userName || !*userName) {
+ userName = "mozillaUser";
}
nsAutoString userDir;
@@ -447,7 +447,12 @@
rv = finalPath->GetPermissions(&permissions);
NS_ENSURE_SUCCESS(rv, rv);
- if (permissions == PR_IRWXU) {
+ // Ensuring the path is writable by the current user.
+ bool isWritable;
+ rv = finalPath->IsWritable(&isWritable);
+ NS_ENSURE_SUCCESS(rv, rv);
+
+ if (permissions == PR_IRWXU && isWritable) {
dir = finalPath;
break;
}
++++++ source-stamp.txt ++++++
--- /var/tmp/diff_new_pack.Os2ddw/_old 2016-01-05 09:41:29.000000000 +0100
+++ /var/tmp/diff_new_pack.Os2ddw/_new 2016-01-05 09:41:29.000000000 +0100
@@ -1,2 +1,2 @@
-REV=fc05d86dc310
+REV=f227eec41a24
REPO=http://hg.mozilla.org/releases/mozilla-release
1
0
Hello community,
here is the log from the commit of package gdm for openSUSE:Factory checked in at 2016-01-05 09:40:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gdm (Old)
and /work/SRC/openSUSE:Factory/.gdm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gdm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gdm/gdm.changes 2015-11-28 15:18:50.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gdm.new/gdm.changes 2016-01-05 09:41:12.000000000 +0100
@@ -1,0 +2,9 @@
+Tue Dec 29 11:39:32 UTC 2015 - zaitor(a)opensuse.org
+
+- Replace libcanberra-devel for pkgconfig(libcanberra-gtk3)
+ BuildRequires: It's what configure looks for and needed now that
+ libcanberra-devel was split.
+- Add explicit pkgconfig(gtk+-3.0) BuildRequires: It used to be
+ pulled in by libcanberra-devel
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gdm.spec ++++++
--- /var/tmp/diff_new_pack.vywO3l/_old 2016-01-05 09:41:13.000000000 +0100
+++ /var/tmp/diff_new_pack.vywO3l/_new 2016-01-05 09:41:13.000000000 +0100
@@ -71,7 +71,6 @@
BuildRequires: libXdmcp-devel
BuildRequires: libXi-devel
BuildRequires: libXinerama-devel
-BuildRequires: libcanberra-devel
BuildRequires: pam-devel
BuildRequires: pwdutils
BuildRequires: tcpd-devel
@@ -80,6 +79,8 @@
BuildRequires: xorg-x11-server
BuildRequires: xorg-x11-server-extra
BuildRequires: pkgconfig(accountsservice)
+BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(libcanberra-gtk3)
%if %{with_systemd}
BuildRequires: pkgconfig(libsystemd)
%endif
1
0
Hello community,
here is the log from the commit of package gnome-packagekit for openSUSE:Factory checked in at 2016-01-05 09:40:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-packagekit (Old)
and /work/SRC/openSUSE:Factory/.gnome-packagekit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-packagekit"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-packagekit/gnome-packagekit.changes 2015-11-23 07:29:42.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gnome-packagekit.new/gnome-packagekit.changes 2016-01-05 09:41:07.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Dec 29 11:19:36 UTC 2015 - zaitor(a)opensuse.org
+
+- Replace libcanberra-devel for pkgconfig(libcanberra-gtk3)
+ BuildRequires: Needed now that libcanberra-devel has been split,
+ and it is what configure looks for.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-packagekit.spec ++++++
--- /var/tmp/diff_new_pack.X6kEf3/_old 2016-01-05 09:41:08.000000000 +0100
+++ /var/tmp/diff_new_pack.X6kEf3/_new 2016-01-05 09:41:08.000000000 +0100
@@ -37,7 +37,6 @@
BuildRequires: gettext-devel
BuildRequires: gnome-menus-devel
BuildRequires: intltool
-BuildRequires: libcanberra-devel
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
BuildRequires: yelp-tools
@@ -45,6 +44,7 @@
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.15.3
BuildRequires: pkgconfig(gudev-1.0)
+BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libnotify)
%if %{with_systemd}
BuildRequires: pkgconfig(libsystemd-login)
1
0
Hello community,
here is the log from the commit of package gnome-shell for openSUSE:Factory checked in at 2016-01-05 09:40:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-shell (Old)
and /work/SRC/openSUSE:Factory/.gnome-shell.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-shell"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-shell/gnome-shell.changes 2015-11-28 15:18:55.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gnome-shell.new/gnome-shell.changes 2016-01-05 09:41:02.000000000 +0100
@@ -1,0 +2,15 @@
+Tue Dec 29 11:31:44 UTC 2015 - zaitor(a)opensuse.org
+
+- Replace pkgconfig(libcanberra-gtk) for
+ pkgconfig(libcanberra-gtk3) BuildRequires: It's what configure
+ looks for and needed now that libcanberra-devel was split.
+
+-------------------------------------------------------------------
+Sat Dec 12 14:25:50 UTC 2015 - zaitor(a)opensuse.org
+
+- Add gnome-shell-logindialog-fixes.patch: Fix misc login dialog
+ issues.
+- Add gnome-shell-alt-tab-hdpi-fixes.patch: Fix tiny preview in
+ alt-tab when using HiDPI screens.
+
+-------------------------------------------------------------------
New:
----
gnome-shell-alt-tab-hdpi-fixes.patch
gnome-shell-logindialog-fixes.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-shell.spec ++++++
--- /var/tmp/diff_new_pack.38009d/_old 2016-01-05 09:41:03.000000000 +0100
+++ /var/tmp/diff_new_pack.38009d/_new 2016-01-05 09:41:03.000000000 +0100
@@ -26,6 +26,10 @@
Source: http://download.gnome.org/sources/gnome-shell/3.18/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar(a)opensuse.org -- create private connections if the user is not authorized
Patch1: gnome-shell-private-connection.patch
+# PATCH-FIX-UPSTREAM gnome-shell-logindialog-fixes.patch zaitor(a)opensuse.org -- 2 commits from upstream fixing misc logindialog issues.
+Patch2: gnome-shell-logindialog-fixes.patch
+# PATCH-FIX-UPSTREAM gnome-shell-alt-tab-hdpi-fixes.patch zaitor(a)opensuse.org -- Fix tiny previews in alt-tab when using hidpi screens.
+Patch3: gnome-shell-alt-tab-hdpi-fixes.patch
BuildRequires: docbook-xsl-stylesheets
BuildRequires: gcc-c++
BuildRequires: intltool
@@ -51,7 +55,7 @@
BuildRequires: pkgconfig(gtk+-3.0) >= 3.15.0
BuildRequires: pkgconfig(json-glib-1.0) >= 0.13.2
BuildRequires: pkgconfig(libcanberra)
-BuildRequires: pkgconfig(libcanberra-gtk)
+BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libcroco-0.6) >= 0.6.8
BuildRequires: pkgconfig(libedataserver-1.2) >= 3.5.3
BuildRequires: pkgconfig(libgnome-menu-3.0) >= 3.5.3
@@ -152,6 +156,8 @@
%prep
%setup -q
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
translation-update-upstream
%build
++++++ gnome-shell-alt-tab-hdpi-fixes.patch ++++++
>From 491e511a9699dad4fce75cf2468067b7ab0b8c64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner(a)gnome.org>
Date: Thu, 26 Nov 2015 00:04:11 +0100
Subject: altTab: Fix window-switcher on HiDPI displays
We need to take the scale factor into account to avoid tiny window
previews on HiDPI.
https://bugzilla.gnome.org/show_bug.cgi?id=758676
---
js/ui/altTab.js | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/js/ui/altTab.js b/js/ui/altTab.js
index 8765f19..7029bf7 100644
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@@ -685,15 +685,17 @@ const WindowIcon = new Lang.Class({
this._icon.destroy_all_children();
+ let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
+
switch (mode) {
case AppIconMode.THUMBNAIL_ONLY:
size = WINDOW_PREVIEW_SIZE;
- this._icon.add_actor(_createWindowClone(mutterWindow, WINDOW_PREVIEW_SIZE));
+ this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
break;
case AppIconMode.BOTH:
size = WINDOW_PREVIEW_SIZE;
- this._icon.add_actor(_createWindowClone(mutterWindow, WINDOW_PREVIEW_SIZE));
+ this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
if (this.app)
this._icon.add_actor(this._createAppIcon(this.app,
@@ -705,7 +707,7 @@ const WindowIcon = new Lang.Class({
this._icon.add_actor(this._createAppIcon(this.app, size));
}
- this._icon.set_size(size, size);
+ this._icon.set_size(size * scaleFactor, size * scaleFactor);
},
_createAppIcon: function(app, size) {
--
cgit v0.11.2
++++++ gnome-shell-logindialog-fixes.patch ++++++
>From 293bc9839424fd5498ba96e946d17818ad33d18c Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro(a)igalia.com>
Date: Mon, 23 Nov 2015 17:21:49 -0600
Subject: loginDialog: Fix TypeError when user is deleted
LoginDialog has a private _user, but UserListItem has a public user.
Easy to get wrong since _user would be the right thing to type in 90% of
this file.
---
js/gdm/loginDialog.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index b400d79..4150649 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -96,7 +96,7 @@ const UserListItem = new Lang.Class({
},
_onDestroy: function() {
- this._user.disconnect(this._userChangedId);
+ this.user.disconnect(this._userChangedId);
},
_onClicked: function() {
--
cgit v0.11.2
>From 3001f3376c9ad92c5b5b2b129b001a5d67caaea6 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro(a)igalia.com>
Date: Mon, 23 Nov 2015 18:24:19 -0600
Subject: loginDialog: Reconsider user for user list when user changes
Generally a user-changed operation will be uninteresting, but if the
user is currently in the user list and the account changes to locked, we
want to remove it from the list, or if the user is not in the list and
the account changed to unlocked, we want to add it to the list. This
fixes the case where a new user account created in gnome-control-center
does not appear in the user list. The password mode is set in the new
account immediately after it is created, but the operations are not
atomic, so the login dialog considers the new user account when it is
still locked and rejects it from being displayed, then immediately
afterwards the account is unlocked. This commit causes the login dialog
to show the account when this occurs.
The containsUser() check here is not strictly necessary, but reduces
spurious calls to addUser() and removeUser(), since there's no easy way
to check if the locked status of the account has changed (as it's much
easier to connect to one signal on the UserManager than to
notify::locked on each User object).
https://bugzilla.gnome.org/show_bug.cgi?id=758568
---
js/gdm/loginDialog.js | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 4150649..46eeb83 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -212,6 +212,10 @@ const UserList = new Lang.Class({
return item;
},
+ containsUser: function(user) {
+ return this._items[user.get_user_name()] != null;
+ },
+
addUser: function(user) {
if (!user.is_loaded)
return;
@@ -1126,6 +1130,10 @@ const LoginDialog = new Lang.Class({
this._userManager.disconnect(this._userRemovedId);
this._userRemovedId = 0;
}
+ if (this._userChangedId) {
+ this._userManager.disconnect(this._userChangedId);
+ this._userChangedId = 0;
+ }
this._textureCache.disconnect(this._updateLogoTextureId);
Main.layoutManager.disconnect(this._startupCompleteId);
if (this._settings) {
@@ -1172,6 +1180,14 @@ const LoginDialog = new Lang.Class({
this._userList.removeUser(user);
}));
+ this._userChangedId = this._userManager.connect('user-changed',
+ Lang.bind(this, function(userManager, user) {
+ if (this._userList.containsUser(user) && user.locked)
+ this._userList.removeUser(user);
+ else if (!this._userList.containsUser(user) && !user.locked)
+ this._userList.addUser(user);
+ }));
+
return GLib.SOURCE_REMOVE;
},
--
cgit v0.11.2
1
0
Hello community,
here is the log from the commit of package libcanberra for openSUSE:Factory checked in at 2016-01-05 09:40:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcanberra (Old)
and /work/SRC/openSUSE:Factory/.libcanberra.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcanberra"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libcanberra/libcanberra.changes 2015-11-08 14:35:47.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libcanberra.new/libcanberra.changes 2016-01-05 09:41:00.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Dec 28 16:43:10 UTC 2015 - zaitor(a)opensuse.org
+
+- Split out libcanberra-gtk-devel and libcanberra-gtk3-devel
+ sub-packages, this will make it possible for us to build
+ dependant packages without having to pull in both gtk2 and gtk3.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcanberra.spec ++++++
--- /var/tmp/diff_new_pack.GlQE6w/_old 2016-01-05 09:41:01.000000000 +0100
+++ /var/tmp/diff_new_pack.GlQE6w/_new 2016-01-05 09:41:01.000000000 +0100
@@ -188,19 +188,48 @@
%package devel
Summary: Portable sound event library -- Development files
Group: Development/Libraries/C and C++
-Requires: libcanberra-gtk0 = %{version}
Requires: libcanberra0 = %{version}
+
+%description devel
+libcanberra is an implementation of the XDG Sound Theme and Name
+Specifications, for generating event sounds on free desktops, such as
+GNOME. It comes with several backends (ALSA, PulseAudio, null) and is
+designed to be portable.
+
+This package provides the development files for libcanberra.
+
%if %build_gtk3
+
+%package -n libcanberra-gtk3-devel
+Summary: Portable sound event library -- Development files
+Group: Development/Libraries/C and C++
+Requires: libcanberra-devel
Requires: libcanberra-gtk3-0 = %{version}
+Requires: libcanberra0 = %{version}
%endif
-%description devel
+%description -n libcanberra-gtk3-devel
libcanberra is an implementation of the XDG Sound Theme and Name
Specifications, for generating event sounds on free desktops, such as
GNOME. It comes with several backends (ALSA, PulseAudio, null) and is
designed to be portable.
-This package provides the development files for libcanberra.
+This package provides the development files for libcanberra-gtk3
+
+%package -n libcanberra-gtk-devel
+Summary: Portable sound event library -- Development files
+Group: Development/Libraries/C and C++
+Requires: libcanberra-devel
+Requires: libcanberra-gtk0 = %{version}
+Requires: libcanberra0 = %{version}
+
+%description -n libcanberra-gtk-devel
+libcanberra is an implementation of the XDG Sound Theme and Name
+Specifications, for generating event sounds on free desktops, such as
+GNOME. It comes with several backends (ALSA, PulseAudio, null) and is
+designed to be portable.
+
+This package provides the development files for libcanberra-gtk2
%prep
%setup -q
@@ -294,21 +323,26 @@
%dir %{_datadir}/gdm/autostart/LoginWindow
%{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
+%files -n libcanberra-gtk-devel
+%defattr(-,root,root)
+%{_libdir}/libcanberra-gtk.so
+%{_libdir}/pkgconfig/libcanberra-gtk.pc
+
+%if %build_gtk3
+
+%files -n libcanberra-gtk3-devel
+%defattr(-,root,root)
+%{_libdir}/libcanberra-gtk3.so
+%{_libdir}/pkgconfig/libcanberra-gtk3.pc
+%endif
+
%files devel
%defattr(-,root,root)
%doc %{_datadir}/gtk-doc/html/libcanberra
%{_includedir}/canberra.h
%{_includedir}/canberra-gtk.h
%{_libdir}/libcanberra.so
-%{_libdir}/libcanberra-gtk.so
-%if %build_gtk3
-%{_libdir}/libcanberra-gtk3.so
-%endif
%{_libdir}/pkgconfig/libcanberra.pc
-%{_libdir}/pkgconfig/libcanberra-gtk.pc
-%if %build_gtk3
-%{_libdir}/pkgconfig/libcanberra-gtk3.pc
-%endif
%dir %{_datadir}/vala
%dir %{_datadir}/vala/vapi
%{_datadir}/vala/vapi/*.vapi
1
0
Hello community,
here is the log from the commit of package xorg-cf-files for openSUSE:Factory checked in at 2016-01-05 09:40:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xorg-cf-files (Old)
and /work/SRC/openSUSE:Factory/.xorg-cf-files.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-cf-files"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xorg-cf-files/xorg-cf-files.changes 2013-08-19 13:35:18.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xorg-cf-files.new/xorg-cf-files.changes 2016-01-05 09:40:59.000000000 +0100
@@ -1,0 +2,12 @@
+Tue Dec 22 17:40:26 UTC 2015 - tobias.johannes.klausmann(a)mni.thm.de
+
+- Update to version 1.0.6:
+ + configure: Drop AM_MAINTAINER_MODE
+ + autogen.sh: Honor NOCONFIGURE=1
+ + Remove very out of date OS2 DLL mappings for no-longer-shipped makedef.cmd
+ + sun.cf: limit SysV man page sections to Solaris 2.0-11
+ + sun.cf: Sun Studio 12.0 & later compilers prefer -m32/-m64
+ + README: reword status section
+ + Remove os2def.db from EXTRA_DIST
+
+-------------------------------------------------------------------
Old:
----
xorg-cf-files-1.0.5.tar.bz2
New:
----
xorg-cf-files-1.0.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-cf-files.spec ++++++
--- /var/tmp/diff_new_pack.3alChK/_old 2016-01-05 09:41:00.000000000 +0100
+++ /var/tmp/diff_new_pack.3alChK/_new 2016-01-05 09:41:00.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xorg-cf-files
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: xorg-cf-files
-Version: 1.0.5
+Version: 1.0.6
Release: 0
Summary: Data files for the imake utility
License: MIT
++++++ xorg-cf-files-1.0.5.tar.bz2 -> xorg-cf-files-1.0.6.tar.bz2 ++++++
++++ 9264 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package libXi for openSUSE:Factory checked in at 2016-01-05 09:40:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libXi (Old)
and /work/SRC/openSUSE:Factory/.libXi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libXi"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libXi/libXi.changes 2015-09-24 06:12:50.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libXi.new/libXi.changes 2016-01-05 09:40:58.000000000 +0100
@@ -1,0 +2,11 @@
+Tue Dec 22 17:34:13 UTC 2015 - tobias.johannes.klausmann(a)mni.thm.de
+
+- Update to version 1.7.6:
+ One significant change here: libXi was using raw serial numbers in event
+ cookies, the one read off the wire. All other events don't use that number
+ but a Xlib-internal serial number which is similar but not always the same.
+ This could cause events to look out of order. With this release, libXi is
+ now using the same serial number for event cookies as it uses for all other
+ events.
+
+-------------------------------------------------------------------
Old:
----
libXi-1.7.5.tar.bz2
New:
----
libXi-1.7.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libXi.spec ++++++
--- /var/tmp/diff_new_pack.g0TZX6/_old 2016-01-05 09:40:59.000000000 +0100
+++ /var/tmp/diff_new_pack.g0TZX6/_new 2016-01-05 09:40:59.000000000 +0100
@@ -18,7 +18,7 @@
Name: libXi
%define lname libXi6
-Version: 1.7.5
+Version: 1.7.6
Release: 0
Summary: X Input Extension library
License: MIT
++++++ libXi-1.7.5.tar.bz2 -> libXi-1.7.6.tar.bz2 ++++++
++++ 25908 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.5/ChangeLog new/libXi-1.7.6/ChangeLog
--- old/libXi-1.7.5/ChangeLog 2015-09-09 17:17:33.000000000 +0200
+++ new/libXi-1.7.6/ChangeLog 2015-12-22 02:21:12.000000000 +0100
@@ -1,3 +1,44 @@
+commit 2286282f965064176b3b1492646c6e2e0f4ab7dd
+Author: Peter Hutterer <peter.hutterer(a)who-t.net>
+Date: Tue Dec 22 11:20:01 2015 +1000
+
+ libXi 1.7.6
+
+ Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+
+commit 13f25bfb55f4a0bc1f614cbf9b0b13a50ecad8a0
+Author: Javier Pello <javier.pello(a)urjc.es>
+Date: Wed Oct 7 12:41:01 2015 +0200
+
+ Fix const compiler warnings
+
+ When invoking Data, Data16 and Data32 from XChangeDeviceProperty,
+ we must cast the data pointer to the right type, but we do not need
+ to cast constness away. This change allows to enable -Wcast-qual on
+ the build and have it complete without warnings.
+
+ Signed-off-by: Javier Pello <javier.pello(a)urjc.es>
+ Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+
+commit 380861589690bcbe8b04b7a2c23b5dd5d10c4bf8
+Author: Peter Hutterer <peter.hutterer(a)who-t.net>
+Date: Mon Oct 19 11:46:41 2015 +1000
+
+ Don't use raw serial numbers in XIEvents
+
+ cookie->serial is an Xlib contoction, provided by _XSetLastRequestRead(). This
+ serial may be different to the raw serial number from the wire protocol.
+ This causes issues when the raw serial is used to e.g. compare the event to
+ other non-XI events.
+
+ Use the cookie's serial number instead.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=756649
+
+ See also https://bugs.freedesktop.org/show_bug.cgi?id=64687
+
+ Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+
commit f180dff710dc54d00e0e26b84de053151f8f207e
Author: Peter Hutterer <peter.hutterer(a)who-t.net>
Date: Thu Sep 10 01:16:19 2015 +1000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.5/configure.ac new/libXi-1.7.6/configure.ac
--- old/libXi-1.7.5/configure.ac 2015-09-09 17:14:59.000000000 +0200
+++ new/libXi-1.7.6/configure.ac 2015-12-22 02:19:42.000000000 +0100
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXi], [1.7.5],
+AC_INIT([libXi], [1.7.6],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXi])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([src/config.h])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.5/src/XChDProp.c new/libXi-1.7.6/src/XChDProp.c
--- old/libXi-1.7.5/src/XChDProp.c 2010-09-07 07:21:04.000000000 +0200
+++ new/libXi-1.7.6/src/XChDProp.c 2015-11-03 00:12:31.000000000 +0100
@@ -74,7 +74,7 @@
len = ((long)nelements + 3) >> 2;
if (dpy->bigreq_size || req->length + len <= (unsigned) 65535) {
SetReqLen(req, len, len);
- Data (dpy, (char *)data, nelements);
+ Data (dpy, (_Xconst char *)data, nelements);
} /* else force BadLength */
break;
@@ -83,7 +83,7 @@
if (dpy->bigreq_size || req->length + len <= (unsigned) 65535) {
SetReqLen(req, len, len);
len = (long)nelements << 1;
- Data16 (dpy, (short *) data, len);
+ Data16 (dpy, (_Xconst short *) data, len);
} /* else force BadLength */
break;
@@ -92,7 +92,7 @@
if (dpy->bigreq_size || req->length + len <= (unsigned) 65535) {
SetReqLen(req, len, len);
len = (long)nelements << 2;
- Data32 (dpy, (long *) data, len);
+ Data32 (dpy, (_Xconst long *) data, len);
} /* else force BadLength */
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.5/src/XExtInt.c new/libXi-1.7.6/src/XExtInt.c
--- old/libXi-1.7.5/src/XExtInt.c 2014-11-03 06:28:36.000000000 +0100
+++ new/libXi-1.7.6/src/XExtInt.c 2015-10-19 03:46:32.000000000 +0200
@@ -1521,7 +1521,7 @@
out = next_block(&ptr_lib, sizeof(XIDeviceEvent));
out->display = cookie->display;
out->type = in->type;
- out->serial = in->sequenceNumber;
+ out->serial = cookie->serial;
out->extension = in->extension;
out->evtype = in->evtype;
out->send_event = ((in->type & 0x80) != 0);
@@ -1794,7 +1794,7 @@
cookie->data = out = malloc(sizeof(XIDeviceChangedEvent) + len);
out->type = in->type;
- out->serial = in->sequenceNumber;
+ out->serial = cookie->serial;
out->display = cookie->display;
out->extension = in->extension;
out->evtype = in->evtype;
@@ -1827,7 +1827,7 @@
out->info = (XIHierarchyInfo*)&out[1];
out->display = cookie->display;
out->type = in->type;
- out->serial = in->sequenceNumber;
+ out->serial = cookie->serial;
out->extension = in->extension;
out->evtype = in->evtype;
out->send_event = ((in->type & 0x80) != 0);
@@ -1868,7 +1868,7 @@
out = next_block(&ptr, sizeof(XIRawEvent));
out->type = in->type;
- out->serial = in->sequenceNumber;
+ out->serial = cookie->serial;
out->display = cookie->display;
out->extension = in->extension;
out->evtype = in->evtype;
@@ -1919,7 +1919,7 @@
out->buttons.mask = (unsigned char*)&out[1];
out->type = in->type;
- out->serial = in->sequenceNumber;
+ out->serial = cookie->serial;
out->display = cookie->display;
out->extension = in->extension;
out->evtype = in->evtype;
@@ -1962,7 +1962,7 @@
cookie->data = out;
out->type = in->type;
- out->serial = in->sequenceNumber;
+ out->serial = cookie->serial;
out->extension = in->extension;
out->evtype = in->evtype;
out->send_event = ((in->type & 0x80) != 0);
@@ -1983,7 +1983,7 @@
cookie->data = out;
out->type = in->type;
- out->serial = in->sequenceNumber;
+ out->serial = cookie->serial;
out->display = cookie->display;
out->extension = in->extension;
out->evtype = in->evtype;
@@ -2011,7 +2011,7 @@
out->display = cookie->display;
out->type = in->type;
- out->serial = in->sequenceNumber;
+ out->serial = cookie->serial;
out->extension = in->extension;
out->evtype = in->evtype;
out->send_event = ((in->type & 0x80) != 0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.5/src/config.h.in new/libXi-1.7.6/src/config.h.in
--- old/libXi-1.7.5/src/config.h.in 2015-09-09 17:15:28.000000000 +0200
+++ new/libXi-1.7.6/src/config.h.in 2015-12-22 02:20:15.000000000 +0100
@@ -30,8 +30,7 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Name of package */
1
0
Hello community,
here is the log from the commit of package bluez for openSUSE:Factory checked in at 2016-01-05 09:40:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bluez (Old)
and /work/SRC/openSUSE:Factory/.bluez.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bluez"
Changes:
--------
--- /work/SRC/openSUSE:Factory/bluez/bluez.changes 2015-11-11 10:28:56.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.bluez.new/bluez.changes 2016-01-05 09:40:56.000000000 +0100
@@ -1,0 +2,12 @@
+Mon Dec 28 08:27:37 UTC 2015 - seife+obs(a)b1-systems.com
+
+- update to version 5.37:
+ * Fix issue with registering external profiles.
+ * Fix issue with connecting external profiles.
+ * Fix issue with GATT service changed handling.
+ * Fix issue with not emitting GattServices update.
+ * Convert to unified HID over GATT profile support.
+ * Convert to KeyboardDisplay as default IO capability.
+ * Install btattach utility by default.
+
+-------------------------------------------------------------------
Old:
----
bluez-5.36.tar.xz
New:
----
bluez-5.37.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bluez.spec ++++++
--- /var/tmp/diff_new_pack.iXRH4G/_old 2016-01-05 09:40:57.000000000 +0100
+++ /var/tmp/diff_new_pack.iXRH4G/_new 2016-01-05 09:40:57.000000000 +0100
@@ -24,7 +24,7 @@
BuildRequires: systemd-devel
BuildRequires: pkgconfig(dbus-1) >= 1.6
%{?systemd_requires}
-Version: 5.36
+Version: 5.37
Release: 0
Summary: Bluetooth Stack for Linux
License: GPL-2.0+
@@ -119,13 +119,14 @@
# END FIXME
%build
-# autoreconf -fiv
+# --enable-experimental is needed or btattach does not build (bug?)
%configure --with-pic \
--enable-pie \
--enable-library \
--enable-tools \
--enable-cups \
--enable-test \
+ --enable-experimental \
--enable-datafiles
make %{?_smp_mflags} all V=1
@@ -156,7 +157,7 @@
%check
%if ! 0%{?qemu_user_space_build}
-make check
+make %{?_smp_mflags} check
%endif
%clean
@@ -187,6 +188,7 @@
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog README dbus-apis
%{_bindir}/bluemoon
+%{_bindir}/btattach
%{_bindir}/hcitool
%{_bindir}/l2ping
%{_bindir}/rfcomm
@@ -204,6 +206,7 @@
%{_bindir}/hcidump
%{_bindir}/bccmd
%{_prefix}/lib/udev/
+%doc %{_mandir}/man1/btattach.1.gz
%doc %{_mandir}/man1/hcidump.1.gz
%doc %{_mandir}/man1/hciattach.1.gz
%doc %{_mandir}/man1/hciconfig.1.gz
++++++ bluez-5.36.tar.xz -> bluez-5.37.tar.xz ++++++
++++ 17816 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package gnome-session for openSUSE:Factory checked in at 2016-01-05 09:40:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-session (Old)
and /work/SRC/openSUSE:Factory/.gnome-session.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-session"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-session/gnome-session.changes 2015-11-12 19:37:37.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gnome-session.new/gnome-session.changes 2016-01-05 09:40:54.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Nov 26 03:09:47 UTC 2015 - zaitor(a)opensuse.org
+
+- Add gnome-session-autostart-app-give-every-app-journal-id.patch:
+ Give every app it's own journald-id. Patch from upstream.
+
+-------------------------------------------------------------------
New:
----
gnome-session-autostart-app-give-every-app-journal-id.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-session.spec ++++++
--- /var/tmp/diff_new_pack.4VyvEE/_old 2016-01-05 09:40:55.000000000 +0100
+++ /var/tmp/diff_new_pack.4VyvEE/_new 2016-01-05 09:40:55.000000000 +0100
@@ -30,6 +30,8 @@
Source2: gnome.desktop
# PATCH-FIX-UPSTREAM gnome-session-ice-auth-for-suid.patch hpj(a)novell.com -- Carries ICE auth over to other UIDs in this session using an env var.
Patch0: gnome-session-ice-auth-for-suid.patch
+# PATCH-FIX-UPSTREAM gnome-session-autostart-app-give-every-app-journal-id.patch zaitor(a)opensuse.org -- Patch from upstream git.
+Patch1: gnome-session-autostart-app-give-every-app-journal-id.patch
BuildRequires: fdupes
BuildRequires: gnome-common
BuildRequires: hicolor-icon-theme
@@ -119,6 +121,7 @@
# Disabled, as it fails
#translation-update-upstream
%patch0 -p1
+%patch1 -p1
%build
NOCONFIGURE=1 gnome-autogen.sh
++++++ gnome-session-autostart-app-give-every-app-journal-id.patch ++++++
>From 5449174a1618cc7637f8c3a96c0eeae679c55248 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode(a)redhat.com>
Date: Thu, 5 Nov 2015 09:41:16 -0500
Subject: autostart-app: give ever app its own journal id
Right now all session output gets attributed to
gnome-session which isn't very useful.
This commit makes sure launched apps each get
their own journal identifier.
https://bugzilla.gnome.org/show_bug.cgi?id=757571
---
gnome-session/gsm-autostart-app.c | 44 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 43 insertions(+), 1 deletion(-)
diff --git a/gnome-session/gsm-autostart-app.c b/gnome-session/gsm-autostart-app.c
index 75008fe..08a434b 100644
--- a/gnome-session/gsm-autostart-app.c
+++ b/gnome-session/gsm-autostart-app.c
@@ -32,6 +32,11 @@
#include <gconf/gconf-client.h>
#endif
+#ifdef HAVE_SYSTEMD
+#include <systemd/sd-journal.h>
+#include <systemd/sd-daemon.h>
+#endif
+
#include "gsm-autostart-app.h"
#include "gsm-util.h"
@@ -1014,6 +1019,34 @@ app_launched (GAppLaunchContext *ctx,
app->priv->startup_id = sn_id;
}
+#ifdef HAVE_SYSTEMD
+static void
+on_child_setup (GsmAutostartApp *app)
+{
+ int standard_output, standard_error;
+
+ /* The FALSE means programs aren't expected to prefix each
+ * line with <n> prefix to specify priority.
+ */
+ standard_output = sd_journal_stream_fd (app->priv->desktop_id,
+ LOG_INFO,
+ FALSE);
+ standard_error = sd_journal_stream_fd (app->priv->desktop_id,
+ LOG_WARNING,
+ FALSE);
+
+ if (standard_output >= 0) {
+ dup2 (standard_output, STDOUT_FILENO);
+ close (standard_output);
+ }
+
+ if (standard_error >= 0) {
+ dup2 (standard_error, STDERR_FILENO);
+ close (standard_error);
+ }
+}
+#endif
+
static gboolean
autostart_app_start_spawn (GsmAutostartApp *app,
GError **error)
@@ -1022,6 +1055,8 @@ autostart_app_start_spawn (GsmAutostartApp *app,
GError *local_error;
const char *startup_id;
GAppLaunchContext *ctx;
+ GSpawnChildSetupFunc child_setup_func = NULL;
+ gpointer child_setup_data = NULL;
guint handler;
startup_id = gsm_app_peek_startup_id (GSM_APP (app));
@@ -1041,12 +1076,19 @@ autostart_app_start_spawn (GsmAutostartApp *app,
g_app_launch_context_setenv (ctx, "DESKTOP_AUTOSTART_ID", startup_id);
}
+#ifdef HAVE_SYSTEMD
+ if (sd_booted () > 0) {
+ child_setup_func = (GSpawnChildSetupFunc) on_child_setup;
+ child_setup_data = app;
+ }
+#endif
+
handler = g_signal_connect (ctx, "launched", G_CALLBACK (app_launched), app);
success = g_desktop_app_info_launch_uris_as_manager (app->priv->app_info,
NULL,
ctx,
G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH,
- NULL, NULL,
+ child_setup_func, child_setup_data,
NULL, NULL,
&local_error);
g_signal_handler_disconnect (ctx, handler);
--
cgit v0.11.2
1
0
Hello community,
here is the log from the commit of package libpst for openSUSE:Factory checked in at 2016-01-05 09:40:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libpst (Old)
and /work/SRC/openSUSE:Factory/.libpst.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libpst"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libpst/libpst.changes 2015-09-24 06:13:23.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libpst.new/libpst.changes 2016-01-05 09:40:53.000000000 +0100
@@ -1,0 +2,6 @@
+Sun Dec 27 20:03:58 UTC 2015 - zaitor(a)opensuse.org
+
+- Update to version 0.6.66:
+ + Added Content-ID header support.
+
+-------------------------------------------------------------------
Old:
----
libpst-0.6.65.tar.gz
New:
----
libpst-0.6.66.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libpst.spec ++++++
--- /var/tmp/diff_new_pack.6R835J/_old 2016-01-05 09:40:54.000000000 +0100
+++ /var/tmp/diff_new_pack.6R835J/_new 2016-01-05 09:40:54.000000000 +0100
@@ -18,7 +18,7 @@
Name: libpst
-Version: 0.6.65
+Version: 0.6.66
Release: 0
Summary: A library for reading PST files
License: GPL-2.0+
++++++ libpst-0.6.65.tar.gz -> libpst-0.6.66.tar.gz ++++++
/work/SRC/openSUSE:Factory/libpst/libpst-0.6.65.tar.gz /work/SRC/openSUSE:Factory/.libpst.new/libpst-0.6.66.tar.gz differ: char 5, line 1
1
0
Hello community,
here is the log from the commit of package php5 for openSUSE:Factory checked in at 2016-01-05 09:40:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php5 (Old)
and /work/SRC/openSUSE:Factory/.php5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5"
Changes:
--------
--- /work/SRC/openSUSE:Factory/php5/php5.changes 2015-12-27 01:59:29.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2016-01-05 09:40:50.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Dec 28 12:33:09 UTC 2015 - pgajdos(a)suse.com
+
+- updated to 5.6.16: Several bugs have been fixed.
+
+-------------------------------------------------------------------
Old:
----
php-5.6.15.tar.xz
php-5.6.15.tar.xz.asc
New:
----
php-5.6.16.tar.xz
php-5.6.16.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php5.spec ++++++
--- /var/tmp/diff_new_pack.rjqfYW/_old 2016-01-05 09:40:52.000000000 +0100
+++ /var/tmp/diff_new_pack.rjqfYW/_new 2016-01-05 09:40:52.000000000 +0100
@@ -46,7 +46,7 @@
%define need_libxml2_hack %(if [ -e %{_includedir}/libxml/parser.h ]; then if grep -q XML_PARSE_OLDSAX %{_includedir}/libxml/parser.h; then echo 1; else echo 0; fi; else echo 0; fi)
Name: php5
-Version: 5.6.15
+Version: 5.6.16
Release: 0
Summary: PHP5 Core Files
License: PHP-3.01
++++++ php-5.6.15.tar.xz -> php-5.6.16.tar.xz ++++++
/work/SRC/openSUSE:Factory/php5/php-5.6.15.tar.xz /work/SRC/openSUSE:Factory/.php5.new/php-5.6.16.tar.xz differ: char 27, line 1
1
0
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</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
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
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
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