diff -Nru kig-14.12.2/debian/changelog kig-14.12.3/debian/changelog --- kig-14.12.2/debian/changelog 2015-02-10 17:34:02.000000000 +0000 +++ kig-14.12.3/debian/changelog 2015-03-13 21:30:47.000000000 +0000 @@ -1,3 +1,18 @@ +kig (4:14.12.3-0ubuntu1) vivid; urgency=medium + + * New upstream release + + -- Scarlett Clark Fri, 13 Mar 2015 14:30:47 -0700 + +kig (4:14.12.2-1) experimental; urgency=medium + + * Prepare Debian release. + * Update build dependencies to build against experimental and to + follow cmake. + * Update copyright information. + + -- Maximiliano Curia Wed, 18 Feb 2015 22:11:28 +0100 + kig (4:14.12.2-0ubuntu1) vivid; urgency=medium * New upstream release diff -Nru kig-14.12.2/debian/control kig-14.12.3/debian/control --- kig-14.12.2/debian/control 2015-02-10 17:34:01.000000000 +0000 +++ kig-14.12.3/debian/control 2015-03-13 21:30:46.000000000 +0000 @@ -5,22 +5,29 @@ Uploaders: Eshat Cakar , Sune Vuorela , Maximiliano Curia -Build-Depends: cmake, +Build-Depends: cmake (>= 2.8.12), debhelper (>= 9), - extra-cmake-modules, + extra-cmake-modules (>= 1.6.0), kdoctools-dev, + kinit-dev, libboost-python-dev, + libkf5archive-dev, + libkf5configwidgets-dev, + libkf5emoticons-dev, + libkf5i18n-dev, + libkf5iconthemes-dev, + libkf5itemmodels-dev, libkf5kdelibs4support-dev, libkf5parts-dev, libkf5texteditor-dev, libqt5svg5-dev, pkg-config, - pkg-kde-tools (>= 0.12) + pkg-kde-tools (>> 0.15.15) Standards-Version: 3.9.6 XS-Testsuite: autopkgtest Homepage: http://edu.kde.org/ -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/kig.git -Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/kig.git +Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/kig.git +Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/kig.git Package: kig Architecture: any diff -Nru kig-14.12.2/debian/copyright kig-14.12.3/debian/copyright --- kig-14.12.2/debian/copyright 2015-02-10 17:34:01.000000000 +0000 +++ kig-14.12.3/debian/copyright 2015-03-13 21:30:46.000000000 +0000 @@ -4,11 +4,48 @@ Source: ftp.kde.org Files: * -Copyright: 2002-2004, Dominique Devriese - 2004-2005, Pino Toscano - 2003, Maurizio Paolini +Copyright: 2002, Anders Lund + 2012, David E. Narvaez + 2012, David E. Narvaez + 2002-2004, Dominique Devriese + 1989-1991, Free Software Foundation, Inc + 1999-2003, Ilya Baran + 2000, Marc Bartsch + 2002-2005, Maurizio Paolini + 2001-2002, Peter Dimov + 2009, Petr Gajdos + 2009, Petr Gajdos and + 2004, Pino Toscano + 2007, Pino Toscano + 2004-2006, Pino Toscano + 2010-2011, Raoul Bourquin + 2012, Raoul Bourquin (PGF/TikZ exporter part) + 2010-2011, Raoul Bourquin (asymptote exporter part) + 1996-2002, the KDE developers License: GPL-2+ +Files: modes/linkslabel.cpp + modes/linkslabel.h +Copyright: 2002, Dominique Devriese +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA + . + On Debian systems, the full text of the GNU Lesser General Public License + version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1'. + Files: cmake/* Copyright: 2006, Pino Toscano, License: BSD-3-clause @@ -70,6 +107,5 @@ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA . - On Debian systems, the full text of the GNU General Public - License version 2 can be found in the file - `/usr/share/common-licenses/GPL-2'. + On Debian systems, the full text of the GNU General Public License version 2 + can be found in the file `/usr/share/common-licenses/GPL-2'. diff -Nru kig-14.12.2/debian/rules kig-14.12.3/debian/rules --- kig-14.12.2/debian/rules 2015-02-10 17:34:01.000000000 +0000 +++ kig-14.12.3/debian/rules 2015-03-13 21:30:46.000000000 +0000 @@ -1,5 +1,6 @@ #!/usr/bin/make -f -include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk +include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk -.PHONY: override_dh_auto_test +override_dh_auto_test: + # Disable dh_auto_test at build time diff -Nru kig-14.12.2/debian/watch kig-14.12.3/debian/watch --- kig-14.12.2/debian/watch 2015-02-10 17:34:01.000000000 +0000 +++ kig-14.12.3/debian/watch 2015-03-13 21:30:46.000000000 +0000 @@ -1,3 +1,2 @@ version=3 http://download.kde.org/stable/applications/([\d.]+)/src/kig-([\d.]+).tar.xz -http://download.kde.org/unstable/applications/([\d.]+)/src/kig-([\d.]+).tar.xz diff -Nru kig-14.12.2/kig/main.cpp kig-14.12.3/kig/main.cpp --- kig-14.12.2/kig/main.cpp 2015-01-18 08:33:03.000000000 +0000 +++ kig-14.12.3/kig/main.cpp 2015-02-22 11:05:37.000000000 +0000 @@ -55,7 +55,7 @@ QCoreApplication::setApplicationName( "kig" ); QCoreApplication::setApplicationVersion( i18n( KIGVERSION ) ); QCoreApplication::setOrganizationDomain( i18n( "kde.org" ) ); - + KAboutData::setApplicationData( about ); KLocalizedString::setApplicationDomain("kig"); about.setupCommandLine( &parser ); diff -Nru kig-14.12.2/kig.appdata.xml kig-14.12.3/kig.appdata.xml --- kig-14.12.2/kig.appdata.xml 2015-01-18 08:33:03.000000000 +0000 +++ kig-14.12.3/kig.appdata.xml 2015-02-22 11:05:37.000000000 +0000 @@ -3,6 +3,7 @@ kig.desktop CC0-1.0 Kig + Kig Kig Kig Kig @@ -22,8 +23,10 @@ Kig Kig xxKigxx + Kig 數學_Kig Interactive Geometry + Interaktivna Geometrija Geometria interactiva Interaktivní geometrie Interaktive Geometrie @@ -46,6 +49,7 @@ 交互式幾何作圖

Kig is an interactive mathematics software for learning and teaching geometry. It allows to explore mathematical figures and concepts using the computer and also can serve as a drawing tool for mathematical figures. Constructions can be made with points, vectors, lines, and polygons and all elements can be modified directly by using the mouse. Kig helps teachers and students to make conjectures and to understand how to prove geometric theorems.

+

Kig je interaktivni matematika softver za učenje i nastavu geometrije. On omogućava da istražite matematičke figure i koncepte koristeći računar i takođe može da posluži kao sredstvo za crtanje za matematičke likovee. Konstrukcije mogu biti napravljeni sa tačkama, vektorima, linijama i poligona i svi elementi mogu izmijeniti pomoću miša. Kig pomaže nastavnicmai i učenici da naprave pretpostavke i da shvate kako se dokazuje geometrijske teoreme.

El és un programari matemàtic interactiu per aprendre i ensenyar geometria. Permet explorar figures matemàtiques i conceptes usant l'ordinador i també pot servir com una eina de dibuix per figures matemàtiques. Les construccions es poden fer amb punts, vectors, línies, i polígons i tots els elements es poden modificar directament usant el ratolí. El Kig ajuda els mestres i els estudiants a fer conjectures i a entendre com demostrar els teoremes geomètrics.

Kig is an interactive mathematics software for learning and teaching geometry. It allows to explore mathematical figures and concepts using the computer and also can serve as a drawing tool for mathematical figures. Constructions can be made with points, vectors, lines, and polygons and all elements can be modified directly by using the mouse. Kig helps teachers and students to make conjectures and to understand how to prove geometric theorems.

Kig es un software matemático interactivo para el aprendizaje y la enseñanza de la geometría. Permite explorar figuras matemáticas y conceptos usando un equipo informático, además de servir como herramienta de dibujo de figuras matemáticas. Puede realizar construcciones con puntos, vectores, líneas y polígonos, y permite modificar todos estos elementos directamente usando el ratón. Kig ayuda a los profesores y a los estudiantes a hacer conjeturas y a entender cómo probar teoremas geométricos.

diff -Nru kig-14.12.2/modes/typesdialog.cpp kig-14.12.3/modes/typesdialog.cpp --- kig-14.12.2/modes/typesdialog.cpp 2015-01-18 08:33:03.000000000 +0000 +++ kig-14.12.3/modes/typesdialog.cpp 2015-02-22 11:05:37.000000000 +0000 @@ -341,24 +341,22 @@ mpart( part ) { setWindowTitle( i18n( "Manage Types" ) ); - QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel|QDialogButtonBox::Help); - QWidget *mainWidget = new QWidget(this); + QDialogButtonBox *buttonBox = new QDialogButtonBox( QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Help ); + QWidget *mainWidget = new QWidget( this ); QVBoxLayout *mainLayout = new QVBoxLayout; - setLayout(mainLayout); - mainLayout->addWidget(mainWidget); - QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); - okButton->setDefault(true); - okButton->setShortcut(Qt::CTRL | Qt::Key_Return); - connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept())); - connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject())); - //PORTING SCRIPT: WARNING mainLayout->addWidget(buttonBox) must be last item in layout. Please move it. - mainLayout->addWidget(buttonBox); + setLayout( mainLayout ); + mainLayout->addWidget( mainWidget ); + QPushButton *okButton = buttonBox->button( QDialogButtonBox::Ok ); + okButton->setDefault( true ); + okButton->setShortcut( Qt::CTRL | Qt::Key_Return ); + connect(buttonBox, SIGNAL( accepted() ), this, SLOT( accept() ) ); + connect(buttonBox, SIGNAL( rejected() ), this, SLOT( reject() ) ); + mainLayout->addWidget( buttonBox ); - QWidget* base = new QWidget( this ); //PORTING: Verify that widget was added to mainLayout setMainWidget( base ); mtypeswidget = new Ui_TypesWidget(); - mtypeswidget->setupUi( base ); - base->layout()->setMargin( 0 ); + mtypeswidget->setupUi( mainWidget ); + mainWidget->layout()->setMargin( 0 ); // model creation and usage mmodel = new TypesModel( mtypeswidget->typeList );