May 2014 - openSUSE Commits - openSUSE Mailing Lists

commit libkcddb4 for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package libkcddb4 for openSUSE:Factory checked in at 2014-05-22 06:50:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkcddb4 (Old) and /work/SRC/openSUSE:Factory/.libkcddb4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkcddb4" Changes: -------- --- /work/SRC/openSUSE:Factory/libkcddb4/libkcddb4.changes 2014-04-18 12:35:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkcddb4.new/libkcddb4.changes 2014-05-22 06:51:09.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:49:22 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- libkcddb-4.13.0.tar.xz New: ---- libkcddb-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkcddb4.spec ++++++ --- /var/tmp/diff_new_pack.N9t9sF/_old 2014-05-22 06:51:10.000000000 +0200 +++ /var/tmp/diff_new_pack.N9t9sF/_new 2014-05-22 06:51:10.000000000 +0200 @@ -26,7 +26,7 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Version: 4.13.0 +Version: 4.13.1 Release: 0 Source0: libkcddb-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ libkcddb-4.13.0.tar.xz -> libkcddb-4.13.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcddb-4.13.0/kcmcddb/libkcddb.desktop new/libkcddb-4.13.1/kcmcddb/libkcddb.desktop --- old/libkcddb-4.13.0/kcmcddb/libkcddb.desktop 2014-02-24 05:37:52.000000000 +0100 +++ new/libkcddb-4.13.1/kcmcddb/libkcddb.desktop 2014-05-04 09:35:03.000000000 +0200 @@ -28,6 +28,7 @@ Name[ia]=Recuperationde CDDB Name[is]=CDDB-sækni Name[it]=Recupero CDDB +Name[ja]=CDDB 検索 Name[kk]=CDDB деректерді алу Name[km]=ការទៅយក CDDB Name[ko]=CDDB 가져오기 @@ -75,6 +76,7 @@ GenericName[ia]=Configuration de CDDB GenericName[is]=Stillingar CDDB GenericName[it]=Configurazione CDDB +GenericName[ja]=CDDB の設定 GenericName[kk]=CDDB конфигурациясы GenericName[km]=ការកំណត់រចនាសម្ព័ន្ធ CDDB GenericName[ko]=CDDB 설정 @@ -123,6 +125,7 @@ Comment[ia]=Configura le Recuperation de CDDB Comment[is]=Stilla CDDB sækni Comment[it]=Configura il recupero CDDB +Comment[ja]=CDDB 検索の設定 Comment[kk]=CDDB деректер алуды баптау Comment[km]=កំណត់រចនាសម្ព័ន្ធការទៅយក CDDB Comment[ko]=CDDB 가져오기 설정 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libkcompactdisc4 for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package libkcompactdisc4 for openSUSE:Factory checked in at 2014-05-22 06:50:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkcompactdisc4 (Old) and /work/SRC/openSUSE:Factory/.libkcompactdisc4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkcompactdisc4" Changes: -------- --- /work/SRC/openSUSE:Factory/libkcompactdisc4/libkcompactdisc4.changes 2014-04-18 12:35:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkcompactdisc4.new/libkcompactdisc4.changes 2014-05-22 06:51:08.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:49:15 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- libkcompactdisc-4.13.0.tar.xz New: ---- libkcompactdisc-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkcompactdisc4.spec ++++++ --- /var/tmp/diff_new_pack.7AACCo/_old 2014-05-22 06:51:09.000000000 +0200 +++ /var/tmp/diff_new_pack.7AACCo/_new 2014-05-22 06:51:09.000000000 +0200 @@ -23,7 +23,7 @@ Summary: KDE CD Library License: GPL-2.0+ Group: System/GUI/KDE -Version: 4.13.0 +Version: 4.13.1 Release: 0 Source0: libkcompactdisc-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ libkcompactdisc-4.13.0.tar.xz -> libkcompactdisc-4.13.1.tar.xz ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit okular for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package okular for openSUSE:Factory checked in at 2014-05-22 06:50:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/okular (Old) and /work/SRC/openSUSE:Factory/.okular.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "okular" Changes: -------- --- /work/SRC/openSUSE:Factory/okular/okular.changes 2014-05-02 14:01:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.okular.new/okular.changes 2014-05-22 06:51:06.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:49:07 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- okular-4.13.0.tar.xz New: ---- okular-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okular.spec ++++++ --- /var/tmp/diff_new_pack.AlydfR/_old 2014-05-22 06:51:07.000000000 +0200 +++ /var/tmp/diff_new_pack.AlydfR/_new 2014-05-22 06:51:07.000000000 +0200 @@ -17,7 +17,7 @@ Name: okular -Version: 4.13.0 +Version: 4.13.1 Release: 0 Summary: Document Viewer License: GPL-2.0+ ++++++ okular-4.13.0.tar.xz -> okular-4.13.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.13.0/VERSION new/okular-4.13.1/VERSION --- old/okular-4.13.0/VERSION 2014-04-10 00:01:39.000000000 +0200 +++ new/okular-4.13.1/VERSION 2014-05-04 19:43:44.000000000 +0200 @@ -1 +1 @@ -okular v0.19.0 +okular v0.19.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.13.0/core/utils.cpp new/okular-4.13.1/core/utils.cpp --- old/okular-4.13.0/core/utils.cpp 2014-04-10 00:01:39.000000000 +0200 +++ new/okular-4.13.1/core/utils.cpp 2014-05-04 19:43:44.000000000 +0200 @@ -16,11 +16,13 @@ #include <QDesktopWidget> #include <QImage> #include <QIODevice> +#include <cmath> #ifdef Q_WS_X11 #include "config-okular.h" #if HAVE_LIBKSCREEN #include <kscreen/config.h> + #include <kscreen/edid.h> #endif #include <QX11Info> #endif @@ -100,40 +102,55 @@ // Firstly try to retrieve DPI via LibKScreen #if HAVE_LIBKSCREEN KScreen::Config* config = KScreen::Config::current(); - KScreen::OutputList outputs = config->outputs(); - QPoint globalPos = widgetOnScreen->parentWidget() ? - widgetOnScreen->mapToGlobal(widgetOnScreen->pos()): - widgetOnScreen->pos(); - QRect widgetRect(globalPos, widgetOnScreen->size()); - - KScreen::Output* selectedOutput = 0; - int maxArea = 0; - Q_FOREACH(KScreen::Output *output, outputs) - { - if (output->currentMode()) + if (config) { + KScreen::OutputList outputs = config->outputs(); + QPoint globalPos = widgetOnScreen->parentWidget() ? + widgetOnScreen->mapToGlobal(widgetOnScreen->pos()): + widgetOnScreen->pos(); + QRect widgetRect(globalPos, widgetOnScreen->size()); + + KScreen::Output* selectedOutput = 0; + int maxArea = 0; + Q_FOREACH(KScreen::Output *output, outputs) { - QRect outputRect(output->pos(),output->currentMode()->size()); - QRect intersection = outputRect.intersected(widgetRect); - int area = intersection.width()*intersection.height(); - if (area > maxArea) + if (output->currentMode()) { - maxArea = area; - selectedOutput = output; + QRect outputRect(output->pos(),output->currentMode()->size()); + QRect intersection = outputRect.intersected(widgetRect); + int area = intersection.width()*intersection.height(); + if (area > maxArea) + { + maxArea = area; + selectedOutput = output; + } } } - } - if (selectedOutput) - { - kDebug() << "Found widget at output #" << selectedOutput->id(); - QRect outputRect(selectedOutput->pos(),selectedOutput->currentMode()->size()); - QSize szMM = selectedOutput->sizeMm(); - kDebug() << "Output size is " << szMM; - if (szMM.width() > 0 && szMM.height() > 0 && outputRect.width() > 0 && outputRect.height() > 0) { - QSizeF res(static_cast<qreal>(outputRect.width())*25.4/szMM.width(), - static_cast<qreal>(outputRect.height())*25.4/szMM.height()); - kDebug() << "Output DPI is " << res; - return res; + if (selectedOutput) + { + kDebug() << "Found widget at output #" << selectedOutput->id(); + QRect outputRect(selectedOutput->pos(),selectedOutput->currentMode()->size()); + QSize szMM = selectedOutput->sizeMm(); + kDebug() << "Output size is " << szMM; + if (selectedOutput->edid()) { + kDebug() << "EDID WxH: " << selectedOutput->edid()->width() << 'x' << selectedOutput->edid()->height(); + } + if (szMM.width() > 0 && szMM.height() > 0 && outputRect.width() > 0 && outputRect.height() > 0 + && selectedOutput->edid() + && std::abs(static_cast<int>(selectedOutput->edid()->width()*10) - szMM.width()) < 10 + && std::abs(static_cast<int>(selectedOutput->edid()->height()*10) - szMM.height()) < 10) + { + // sizes in EDID seem to be consistent + QSizeF res(static_cast<qreal>(outputRect.width())*25.4/szMM.width(), + static_cast<qreal>(outputRect.height())*25.4/szMM.height()); + if (!selectedOutput->isHorizontal()) + { + kDebug() << "Output is vertical, transposing DPI rect"; + res.transpose(); + } + kDebug() << "Output DPI is " << res; + return res; + } } } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.13.0/core/version.h new/okular-4.13.1/core/version.h --- old/okular-4.13.0/core/version.h 2014-04-10 00:01:39.000000000 +0200 +++ new/okular-4.13.1/core/version.h 2014-05-04 19:43:44.000000000 +0200 @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.19.0" +#define OKULAR_VERSION_STRING "0.19.1" #define OKULAR_VERSION_MAJOR 0 #define OKULAR_VERSION_MINOR 19 -#define OKULAR_VERSION_RELEASE 0 +#define OKULAR_VERSION_RELEASE 1 #define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define OKULAR_VERSION \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.13.0/part.cpp new/okular-4.13.1/part.cpp --- old/okular-4.13.0/part.cpp 2014-04-10 00:01:39.000000000 +0200 +++ new/okular-4.13.1/part.cpp 2014-05-04 19:43:44.000000000 +0200 @@ -446,12 +446,10 @@ m_pageSizeLabel = new PageSizeLabel( m_bottomBar, m_document ); bottomBarLayout->setMargin( 0 ); bottomBarLayout->setSpacing( 0 ); - bottomBarLayout->addWidget( m_pageSizeLabel->antiWidget() ); bottomBarLayout->addItem( new QSpacerItem( 5, 5, QSizePolicy::Expanding, QSizePolicy::Minimum ) ); m_miniBarLogic = new MiniBarLogic( this, m_document ); m_miniBar = new MiniBar( m_bottomBar, m_miniBarLogic ); bottomBarLayout->addWidget( m_miniBar ); - bottomBarLayout->addItem( new QSpacerItem( 5, 5, QSizePolicy::Expanding, QSizePolicy::Minimum ) ); bottomBarLayout->addWidget( m_pageSizeLabel ); rightLayout->addWidget( m_bottomBar ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.13.0/ui/pagesizelabel.cpp new/okular-4.13.1/ui/pagesizelabel.cpp --- old/okular-4.13.0/ui/pagesizelabel.cpp 2014-04-10 00:01:39.000000000 +0200 +++ new/okular-4.13.1/ui/pagesizelabel.cpp 2014-05-04 19:43:44.000000000 +0200 @@ -12,9 +12,9 @@ #include "core/document.h" PageSizeLabel::PageSizeLabel( QWidget * parent, Okular::Document * document ) - : QLabel( parent ), m_document( document ), - m_antiWidget( NULL ) + : KSqueezedTextLabel( parent ), m_document( document ) { + setAlignment( Qt::AlignRight ); } PageSizeLabel::~PageSizeLabel() @@ -22,52 +22,15 @@ m_document->removeObserver( this ); } -QWidget *PageSizeLabel::antiWidget() -{ - if (!m_antiWidget) - { - m_antiWidget = new QWidget(qobject_cast<QWidget*>(parent())); - m_antiWidget->resize(0, 0); - } - return m_antiWidget; -} - -void PageSizeLabel::notifySetup( const QVector< Okular::Page * > & pageVector, int setupFlags ) -{ - // only process data when document changes - if ( !( setupFlags & Okular::DocumentObserver::DocumentChanged ) ) - return; - - // if document is closed or all pages have size hide widget - int pages = pageVector.count(); - if ( pages < 1 || m_document->allPagesSize().isValid() ) - { - hide(); - if ( m_antiWidget ) - m_antiWidget->hide(); - return; - } - else - { - show(); - if ( m_antiWidget ) - m_antiWidget->show(); - } -} - void PageSizeLabel::notifyCurrentPageChanged( int previousPage, int currentPage ) { Q_UNUSED( previousPage ) - if (isVisible()) + // if the document is opened + if ( m_document->pages() > 0 && !m_document->allPagesSize().isValid() ) { - // if the document is opened - if ( m_document->pages() > 0 ) - { - setText( m_document->pageSizeString( currentPage ) ); - m_antiWidget->setFixedSize( sizeHint() ); - } - } + setText( m_document->pageSizeString( currentPage ) ); + } } #include "pagesizelabel.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.13.0/ui/pagesizelabel.h new/okular-4.13.1/ui/pagesizelabel.h --- old/okular-4.13.0/ui/pagesizelabel.h 2014-04-10 00:01:39.000000000 +0200 +++ new/okular-4.13.1/ui/pagesizelabel.h 2014-05-04 19:43:44.000000000 +0200 @@ -10,7 +10,7 @@ #ifndef _OKULAR_PAGESIZELABEL_H_ #define _OKULAR_PAGESIZELABEL_H_ -#include <qlabel.h> +#include <ksqueezedtextlabel.h> #include "core/observer.h" @@ -21,7 +21,7 @@ /** * @short A widget to display page size. */ -class PageSizeLabel : public QLabel, public Okular::DocumentObserver +class PageSizeLabel : public KSqueezedTextLabel, public Okular::DocumentObserver { Q_OBJECT @@ -29,15 +29,11 @@ PageSizeLabel( QWidget *parent, Okular::Document * document ); ~PageSizeLabel(); - QWidget *antiWidget(); - // [INHERITED] from DocumentObserver - void notifySetup( const QVector< Okular::Page * > & pages, int setupFlags ); void notifyCurrentPageChanged( int previous, int current ); private: Okular::Document * m_document; - QWidget *m_antiWidget; }; #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit step for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package step for openSUSE:Factory checked in at 2014-05-22 06:50:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/step (Old) and /work/SRC/openSUSE:Factory/.step.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "step" Changes: -------- --- /work/SRC/openSUSE:Factory/step/step.changes 2014-04-18 12:35:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.step.new/step.changes 2014-05-22 06:51:03.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:48:59 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- step-4.13.0.tar.xz New: ---- step-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ step.spec ++++++ --- /var/tmp/diff_new_pack.JVVIJS/_old 2014-05-22 06:51:05.000000000 +0200 +++ /var/tmp/diff_new_pack.JVVIJS/_new 2014-05-22 06:51:05.000000000 +0200 @@ -17,7 +17,7 @@ Name: step -Version: 4.13.0 +Version: 4.13.1 Release: 0 Summary: An interactive physics simulator License: GPL-2.0+ ++++++ step-4.13.0.tar.xz -> step-4.13.1.tar.xz ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rocs for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package rocs for openSUSE:Factory checked in at 2014-05-22 06:50:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rocs (Old) and /work/SRC/openSUSE:Factory/.rocs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rocs" Changes: -------- --- /work/SRC/openSUSE:Factory/rocs/rocs.changes 2014-04-18 12:35:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rocs.new/rocs.changes 2014-05-22 06:51:00.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:48:52 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- rocs-4.13.0.tar.xz New: ---- rocs-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rocs.spec ++++++ --- /var/tmp/diff_new_pack.3pEkZn/_old 2014-05-22 06:51:01.000000000 +0200 +++ /var/tmp/diff_new_pack.3pEkZn/_new 2014-05-22 06:51:01.000000000 +0200 @@ -17,7 +17,7 @@ Name: rocs -Version: 4.13.0 +Version: 4.13.1 Release: 0 Summary: Graph Theory IDE License: GPL-3.0+ ++++++ rocs-4.13.0.tar.xz -> rocs-4.13.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.13.0/RocsCore/DataStructures/LinkedList/rocs_ListStructure.desktop new/rocs-4.13.1/RocsCore/DataStructures/LinkedList/rocs_ListStructure.desktop --- old/rocs-4.13.0/RocsCore/DataStructures/LinkedList/rocs_ListStructure.desktop 2014-04-09 21:18:53.000000000 +0200 +++ new/rocs-4.13.1/RocsCore/DataStructures/LinkedList/rocs_ListStructure.desktop 2014-04-24 10:03:40.000000000 +0200 @@ -33,6 +33,7 @@ Name[lv]=Saistīts saraksts Name[mr]=लिंक केलेली यादी Name[nb]=Lenket liste +Name[nds]=Verbunnen List Name[nl]=Gekoppelde lijst Name[pl]=Dowiązana lista Name[pt]=Lista Ligada diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.13.0/RocsCore/DataStructures/RootedTree/rocs_RootedTreeStructure.desktop new/rocs-4.13.1/RocsCore/DataStructures/RootedTree/rocs_RootedTreeStructure.desktop --- old/rocs-4.13.0/RocsCore/DataStructures/RootedTree/rocs_RootedTreeStructure.desktop 2014-04-09 21:18:53.000000000 +0200 +++ new/rocs-4.13.1/RocsCore/DataStructures/RootedTree/rocs_RootedTreeStructure.desktop 2014-04-24 10:03:40.000000000 +0200 @@ -32,6 +32,7 @@ Name[ko]=루트가 있는 트리 Name[lv]=Iesakņots koks Name[nb]=Tre med rot +Name[nds]=Wörtelboom Name[nl]=Boomstructuur met basis Name[pl]=Główne drzewo Name[pt]=Árvore com Raiz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.13.0/RocsCore/LoadSave/Plugins/dotFileFormat/rocs_dotfileformatplugin.desktop new/rocs-4.13.1/RocsCore/LoadSave/Plugins/dotFileFormat/rocs_dotfileformatplugin.desktop --- old/rocs-4.13.0/RocsCore/LoadSave/Plugins/dotFileFormat/rocs_dotfileformatplugin.desktop 2014-04-09 21:18:53.000000000 +0200 +++ new/rocs-4.13.1/RocsCore/LoadSave/Plugins/dotFileFormat/rocs_dotfileformatplugin.desktop 2014-04-24 10:03:40.000000000 +0200 @@ -28,6 +28,7 @@ Name[km]=កម្មវិធីជំនួយឯកសារក្រាហ្វ Rocs DOT Name[ko]=Rocs DOT 그래프 파일 플러그인 Name[nb]=Rocs programtillegg for DOT-graf-fil +Name[nds]=DOT-Grafikdateimoduul för Rocs Name[nl]=Plugin voor Rocs DOT grafiekbestand Name[pl]=Wtyczka pliku grafu Rocs DOT Name[pt]='Plugin' de Grafos em DOT do Rocs @@ -60,6 +61,7 @@ Comment[km]=អាន និងសរសេរឯកសារក្រាហ្វ Graphviz (DOT) Comment[ko]=Graphviz 그래프 문서(DOT) 파일 읽고 쓰기 Comment[nb]=Les og skriv Graphviz grafdokumenter (DOT) +Comment[nds]=Graphviz-Dateien (DOT) lesen un schrieven Comment[nl]=Lezen en schrijven van Graphviz grafiekbestanden (DOT) Comment[pl]=Czytaj i zapisuj dokumenty grafów Graphviz (DOT) Comment[pt]=Ler e gravar documentos de grafos do Graphviz (DOT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.13.0/RocsCore/LoadSave/Plugins/gmlFileFormat/rocs_gmlfileformatplugin.desktop new/rocs-4.13.1/RocsCore/LoadSave/Plugins/gmlFileFormat/rocs_gmlfileformatplugin.desktop --- old/rocs-4.13.0/RocsCore/LoadSave/Plugins/gmlFileFormat/rocs_gmlfileformatplugin.desktop 2014-04-09 21:18:53.000000000 +0200 +++ new/rocs-4.13.1/RocsCore/LoadSave/Plugins/gmlFileFormat/rocs_gmlfileformatplugin.desktop 2014-04-24 10:03:40.000000000 +0200 @@ -28,6 +28,7 @@ Name[km]=កម្មវិធីជំនួយឯកសារ Rocs GML Name[ko]=Rocs GML 그래프 파일 플러그인 Name[nb]=Rocs GML graf-fil-programtillegg +Name[nds]=GML-Grafikdateimoduul för Rocs Name[nl]=Plugin voor Rocs GML grafiekbestand Name[pl]=Wtyczka plików grafów Rocs GML Name[pt]='Plugin' de Grafos em GML do Rocs @@ -59,6 +60,7 @@ Comment[km]=អាន និងសរសេរឯកសារ Graph Markup ។ Comment[ko]=Graph 마크업 언어(GML) 파일을 읽고 쓰기 Comment[nb]=Les og skriv dokumenter i Graph Markup Language (GML) +Comment[nds]="Graph Markup Language (GML)"-Dateien lesen un schrieven Comment[nl]=Lezen en schrijven van Graph Markup Language documenten (GML) Comment[pl]=Czytaj i zapisuj dokumenty Graph Markup Language (GML) Comment[pt]=Ler e gravar ficheiros no formato GML (Graph Markup Language) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.13.0/RocsCore/LoadSave/Plugins/kmlFileFormat/rocs_kmlfileformatplugin.desktop new/rocs-4.13.1/RocsCore/LoadSave/Plugins/kmlFileFormat/rocs_kmlfileformatplugin.desktop --- old/rocs-4.13.0/RocsCore/LoadSave/Plugins/kmlFileFormat/rocs_kmlfileformatplugin.desktop 2014-04-09 21:18:53.000000000 +0200 +++ new/rocs-4.13.1/RocsCore/LoadSave/Plugins/kmlFileFormat/rocs_kmlfileformatplugin.desktop 2014-04-24 10:03:40.000000000 +0200 @@ -28,6 +28,7 @@ Name[km]=កម្មវិធីជំនួយឯកសារក្រាហ្វ Rocs KML Name[ko]=Rocs KML 그래프 파일 플러그인 Name[nb]=Rocs KML graf-fil-programtillegg +Name[nds]=KML-Grafikdateimoduul för Rocs Name[nl]=Plugin voor Rocs KML grafiekbestand Name[pl]=Wtyczka pliku grafu Rocs KML Name[pt]='Plugin' de Grafos em KML do Rocs @@ -59,6 +60,7 @@ Comment[km]=អាន និងសរសេរឯកសារភាសា Keyhole Markup (KML) Comment[ko]=Keyhole 마크업 언어(KML) 파일을 읽고 쓰기 Comment[nb]=Les og skriv dokumenter i Keyhole Markup Language (KML) +Comment[nds]="Keyhole Markup Language (KML)"-Dateien lesen un schrieven Comment[nl]=Lezen en schrijven van Keyhole Markup Language documenten (KML) Comment[pl]=Czytaj i zapisuj dokumenty Keyhole Markup Language (KML) Comment[pt]=Ler e gravar ficheiros no formato KML (Keyhole Markup Language) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.13.0/RocsCore/LoadSave/Plugins/tgfFileFormat/rocs_tgffileformatplugin.desktop new/rocs-4.13.1/RocsCore/LoadSave/Plugins/tgfFileFormat/rocs_tgffileformatplugin.desktop --- old/rocs-4.13.0/RocsCore/LoadSave/Plugins/tgfFileFormat/rocs_tgffileformatplugin.desktop 2014-04-09 21:18:53.000000000 +0200 +++ new/rocs-4.13.1/RocsCore/LoadSave/Plugins/tgfFileFormat/rocs_tgffileformatplugin.desktop 2014-04-24 10:03:40.000000000 +0200 @@ -28,6 +28,7 @@ Name[km]=កម្មវិធីជំនួយឯកសារក្រាហ្វ Rocs TGF Name[ko]=Rocs TGF 그래프 파일 플러그인 Name[nb]=Rocs TGF graf-fil-programtillegg +Name[nds]=TGF-Grafikdateimoduul för Rocs Name[nl]=Plugin voor Rocs TGF grafiekbestand Name[pl]=Wtyczka pliku grafu Rocs TGF Name[pt]='Plugin' de Grafos em TGF do Rocs @@ -58,6 +59,7 @@ Comment[km]=អាន និងសរសេរឯកសារក្រាហ្វជា Trivial Graph Format (TGF) Comment[ko]=Trivial 그래프 형식(TGF) 파일 읽고 쓰기 Comment[nb]=Les og skriv grafdokumenter i Trivial Graph Format (TGF) +Comment[nds]="Trivial Graph Format (TGF)"-Dateien lesen un schrieven Comment[nl]=Lezen en schrijven van Trivial Graph Format documenten (TGF) Comment[pl]=Czytaj i zapisuj dokumenty grafów w Trivial Graph Format (TGF) Comment[pt]=Ler e gravar documentos de grafos no formato TGF (Trivial Graph Format) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.13.0/RocsCore/LoadSave/Plugins/tikzFileFormat/rocs_tikzfileformatplugin.desktop new/rocs-4.13.1/RocsCore/LoadSave/Plugins/tikzFileFormat/rocs_tikzfileformatplugin.desktop --- old/rocs-4.13.0/RocsCore/LoadSave/Plugins/tikzFileFormat/rocs_tikzfileformatplugin.desktop 2014-04-09 21:18:53.000000000 +0200 +++ new/rocs-4.13.1/RocsCore/LoadSave/Plugins/tikzFileFormat/rocs_tikzfileformatplugin.desktop 2014-04-24 10:03:40.000000000 +0200 @@ -27,6 +27,7 @@ Name[km]=កម្មវិធីជំនួយនាំចេញឯកសារក្រាហ្វ Rocs PGF/TikZ Name[ko]=Rocs PGF/TikZ 그래프 파일 내보내기 플러그인 Name[nb]=Rocs programtillegg for eksport av PGF/TikX-graf-filer +Name[nds]=PGF/TikZ-Grafikdateimoduul för Rocs Name[nl]=Plugin voor exporteren van Rocs PGF/TikZ grafiekbestanden Name[pl]=Wtyczka eksportu plików grafów Rocs PGF/TikZ Name[pt]='Plugin' de Exportação de Grafos em PGF/TikZ @@ -57,6 +58,7 @@ Comment[km]=សរសេរឯកសារក្រាហ្វជាទ្រង់ទ្រាយ PGF/TikZ សម្រាប់ប្រើក្នុងឯកសារ LaTeX Comment[ko]=LaTeX 문서에 사용하기 위한 PGF/TikZ 파일로 그래프 문서 작성 Comment[nb]=Skriver grafdokumenter i PGF/TikZ-format til bruk i LaTeX-dokumenter +Comment[nds]=Grafikdokmenten in PGF/TikZ-Formaat för't Bruken binnen LaTeX-Dokmenten schrieven Comment[nl]=Schrijft grafiekdocumenten in PGF/TikZ-formaat die in LaTeX-documenten worden gebruikt. Comment[pl]=Zapisuje dokumenty grafów w formacie PGF/TikZ do wykorzystania w dokumentach LaTeX Comment[pt]=Grava os documentos dos grafos no formato PGF/TikZ, para poder usar em documentos de LaTeX -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit parley for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package parley for openSUSE:Factory checked in at 2014-05-22 06:50:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/parley (Old) and /work/SRC/openSUSE:Factory/.parley.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "parley" Changes: -------- --- /work/SRC/openSUSE:Factory/parley/parley.changes 2014-05-06 17:42:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.parley.new/parley.changes 2014-05-22 06:50:58.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:48:36 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- parley-4.13.0.tar.xz New: ---- parley-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ parley.spec ++++++ --- /var/tmp/diff_new_pack.fSfLx3/_old 2014-05-22 06:51:00.000000000 +0200 +++ /var/tmp/diff_new_pack.fSfLx3/_new 2014-05-22 06:51:00.000000000 +0200 @@ -17,7 +17,7 @@ Name: parley -Version: 4.13.0 +Version: 4.13.1 Release: 0 Summary: Vocabulary Trainer License: GPL-2.0+ ++++++ parley-4.13.0.tar.xz -> parley-4.13.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/parley/parley-4.13.0.tar.xz /work/SRC/openSUSE:Factory/.parley.new/parley-4.13.1.tar.xz differ: char 27, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit marble for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package marble for openSUSE:Factory checked in at 2014-05-22 06:50:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/marble (Old) and /work/SRC/openSUSE:Factory/.marble.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "marble" Changes: -------- --- /work/SRC/openSUSE:Factory/marble/marble.changes 2014-05-02 15:11:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.marble.new/marble.changes 2014-05-22 06:50:57.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:48:06 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- marble-4.13.0.tar.xz New: ---- marble-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ marble.spec ++++++ --- /var/tmp/diff_new_pack.vXxjCS/_old 2014-05-22 06:50:58.000000000 +0200 +++ /var/tmp/diff_new_pack.vXxjCS/_new 2014-05-22 06:50:58.000000000 +0200 @@ -19,7 +19,7 @@ %define _so 18 Name: marble -Version: 4.13.0 +Version: 4.13.1 Release: 0 Summary: Generic map viewer License: LGPL-2.1+ ++++++ marble-4.13.0.tar.xz -> marble-4.13.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/marble/marble-4.13.0.tar.xz /work/SRC/openSUSE:Factory/.marble.new/marble-4.13.1.tar.xz differ: char 27, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kwordquiz for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package kwordquiz for openSUSE:Factory checked in at 2014-05-22 06:50:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwordquiz (Old) and /work/SRC/openSUSE:Factory/.kwordquiz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kwordquiz" Changes: -------- --- /work/SRC/openSUSE:Factory/kwordquiz/kwordquiz.changes 2014-04-18 12:35:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kwordquiz.new/kwordquiz.changes 2014-05-22 06:50:54.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:47:53 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- kwordquiz-4.13.0.tar.xz New: ---- kwordquiz-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwordquiz.spec ++++++ --- /var/tmp/diff_new_pack.5hALo7/_old 2014-05-22 06:50:55.000000000 +0200 +++ /var/tmp/diff_new_pack.5hALo7/_new 2014-05-22 06:50:55.000000000 +0200 @@ -17,7 +17,7 @@ Name: kwordquiz -Version: 4.13.0 +Version: 4.13.1 Release: 0 Summary: Vocabulary Trainer License: GPL-2.0+ ++++++ kwordquiz-4.13.0.tar.xz -> kwordquiz-4.13.1.tar.xz ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kturtle for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package kturtle for openSUSE:Factory checked in at 2014-05-22 06:50:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kturtle (Old) and /work/SRC/openSUSE:Factory/.kturtle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kturtle" Changes: -------- --- /work/SRC/openSUSE:Factory/kturtle/kturtle.changes 2014-04-18 12:35:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kturtle.new/kturtle.changes 2014-05-22 06:50:52.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:47:46 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- kturtle-4.13.0.tar.xz New: ---- kturtle-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kturtle.spec ++++++ --- /var/tmp/diff_new_pack.fGrrGk/_old 2014-05-22 06:50:53.000000000 +0200 +++ /var/tmp/diff_new_pack.fGrrGk/_new 2014-05-22 06:50:53.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: Amusements/Teaching/Mathematics Url: http://edu.kde.org -Version: 4.13.0 +Version: 4.13.1 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRequires: libkde4-devel ++++++ kturtle-4.13.0.tar.xz -> kturtle-4.13.1.tar.xz ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ktouch for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package ktouch for openSUSE:Factory checked in at 2014-05-22 06:50:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktouch (Old) and /work/SRC/openSUSE:Factory/.ktouch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ktouch" Changes: -------- --- /work/SRC/openSUSE:Factory/ktouch/ktouch.changes 2014-04-18 12:35:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ktouch.new/ktouch.changes 2014-05-22 06:50:50.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:47:36 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- ktouch-4.13.0.tar.xz New: ---- ktouch-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktouch.spec ++++++ --- /var/tmp/diff_new_pack.cx8AW3/_old 2014-05-22 06:50:51.000000000 +0200 +++ /var/tmp/diff_new_pack.cx8AW3/_new 2014-05-22 06:50:51.000000000 +0200 @@ -17,7 +17,7 @@ Name: ktouch -Version: 4.13.0 +Version: 4.13.1 Release: 0 Summary: Touch Typing Tutor License: GPL-2.0+ ++++++ ktouch-4.13.0.tar.xz -> ktouch-4.13.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktouch-4.13.0/README new/ktouch-4.13.1/README --- old/ktouch-4.13.0/README 2014-03-17 10:00:14.000000000 +0100 +++ new/ktouch-4.13.1/README 2014-04-28 15:40:19.000000000 +0200 @@ -28,4 +28,6 @@ To run KTouch, additional libraries have to installed. * KDE-runtime >= 4.10.0 * kqtquickcharts >= 4.12.0 (git://anongit.kde.org/kqtquickcharts) + * kde-workspace >= 4.10.0 (optional, for keyboard layout configuration + from within the application) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktouch-4.13.0/src/mainwindow.cpp new/ktouch-4.13.1/src/mainwindow.cpp --- old/ktouch-4.13.0/src/mainwindow.cpp 2014-03-17 10:00:14.000000000 +0100 +++ new/ktouch-4.13.1/src/mainwindow.cpp 2014-04-28 15:40:19.000000000 +0200 @@ -53,6 +53,8 @@ #else #endif +const QString keyboardKCMName = "kcm_keyboard"; + MainWindow::MainWindow(QWidget* parent): KMainWindow(parent), m_view(new QDeclarativeView(this)), @@ -173,7 +175,7 @@ QPointer<KCMultiDialog> kcm = new KCMultiDialog(this); kcm->setWindowTitle(i18n("Configure Keyboard")); - kcm->addModule("kcm_keyboard"); + kcm->addModule(keyboardKCMName); kcm->exec(); delete kcm; @@ -199,9 +201,12 @@ #ifdef KTOUCH_BUILD_WITH_X11 - KAction* configureKeyboardAction = new KAction(i18n("Configure Keyboard..."), this); - m_menu->addAction(configureKeyboardAction); - connect(configureKeyboardAction, SIGNAL(triggered()), SLOT(configureKeyboard())); + if (testKCMAvailibility(keyboardKCMName)) + { + KAction* configureKeyboardAction = new KAction(i18n("Configure Keyboard..."), this); + m_menu->addAction(configureKeyboardAction); + connect(configureKeyboardAction, SIGNAL(triggered()), SLOT(configureKeyboard())); + } #else m_menu->addMenu(m_keyboardLayoutMenu); #endif @@ -220,3 +225,15 @@ m_view->setResizeMode(QDeclarativeView::SizeRootObjectToView); m_view->setSource(QUrl::fromLocalFile(KGlobal::dirs()->findResource("appdata", "qml/main.qml"))); } + +bool MainWindow::testKCMAvailibility(const QString& name) +{ + KService::Ptr service = KService::serviceByStorageId(name + ".desktop"); + + if (!service) + { + return false; + } + + return service->hasServiceType("KCModule") && !service->noDisplay(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktouch-4.13.0/src/mainwindow.h new/ktouch-4.13.1/src/mainwindow.h --- old/ktouch-4.13.0/src/mainwindow.h 2014-03-17 10:00:14.000000000 +0100 +++ new/ktouch-4.13.1/src/mainwindow.h 2014-04-28 15:40:19.000000000 +0200 @@ -61,6 +61,7 @@ void setFullscreen(bool fullscreen); private: void init(); + bool testKCMAvailibility(const QString& name); QDeclarativeView* m_view; KActionCollection* m_actionCollection; QMenu* m_menu; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0