[debian-edu-commits] debian-edu/sankore.git (#31) - master (branch) updated: debian/3.1_git20120517-0miry1-29-g7bdc8b8
Miriam Ruiz
miriam at alioth.debian.org
Thu Mar 7 19:14:46 UTC 2013
The branch, master has been updated
via 7bdc8b823a08a3ac238b5721444850dd356a3761 (commit)
from d6cd55ad493b1f77126cfa1bc7bcb569828f5213 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7bdc8b823a08a3ac238b5721444850dd356a3761
Author: Miriam Ruiz <miriam at debian.org>
Date: Thu Mar 7 20:10:38 2013 +0100
New Upstream Release, Refreshed patches, Changed my email address
Release corresponding to git commits:
Sankore-3.1: 3d5330fb193ff74ff115466e92c9d91122f824a1
Sankore-ThirdParty: 735e68f1b75c5ece90f5c1d50798e1d07eca51a9
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 15 ++
debian/control | 2 +-
debian/copyright | 20 ++-
debian/patches/UBDesktopPropertyPalette.patch | 18 ++
debian/patches/UBGraphicsAristo.patch | 260 +++++++++++++++++++++++++
debian/patches/absolute_dirs.patch | 22 +--
debian/patches/build_opts.patch | 23 +--
debian/patches/includes.patch | 26 +++
debian/patches/qt_pre_4.7.patch | 53 +++--
debian/patches/series | 3 +
10 files changed, 384 insertions(+), 58 deletions(-)
create mode 100644 debian/patches/UBDesktopPropertyPalette.patch
create mode 100644 debian/patches/UBGraphicsAristo.patch
create mode 100644 debian/patches/includes.patch
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 6208632..6389d5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+sankore (2.00~git20130131-1) UNRELEASED; urgency=low
+
+ [ Miriam Ruiz ]
+ * New upstream release, obtained from git, corresponding to commits:
+ + Sankore-3.1: 3d5330fb193ff74ff115466e92c9d91122f824a1
+ + Sankore-ThirdParty: 735e68f1b75c5ece90f5c1d50798e1d07eca51a9
+ * Refreshed patches, and added two new:
+ + UBDesktopPropertyPalette.patch
+ + UBGraphicsAristo.patch
+ * Source code has been relicensed by upstream to GPL-3+ with an special
+ exception that allows it to be linked against OpenSSL and its derivatives.
+ * Changed my email address to miriam at debian.org
+
+ -- Miriam Ruiz <miriam at debian.org> Wed, 06 Mar 2013 13:05:21 +0100
+
sankore (3.1~git20120517-1) UNRELEASED; urgency=low
[ Miriam Ruiz ]
diff --git a/debian/control b/debian/control
index 6cc4353..b224474 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: education
Priority: optional
Maintainer: Debian Edu Packaging Team <debian-edu-pkg-team at lists.alioth.debian.org>
Uploaders:
- Miriam Ruiz <little_miry at yahoo.es>,
+ Miriam Ruiz <miriam at debian.org>,
Mike Gabriel <mike.gabriel at das-netzwerkteam.de>,
José Luis Redrejo Rodríguez <jredrejo at debian.org>
Build-Depends: debhelper (>= 7), dh-buildinfo,
diff --git a/debian/copyright b/debian/copyright
index b444999..5d26004 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
Upstream-Name: sankore
Upstream-Contact: Open-Sankoré Developers team <dev at open-sankore.org>
Source: http://dev.open-sankore.org/
-Debianized-By: Miriam Ruiz <little_miry at yahoo.es>
+Debianized-By: Miriam Ruiz <miriam at debian.org>
Debianized-Date: Thu, 10 May 2012 18:29:03 +0200
Files: *
@@ -10,17 +10,25 @@ Copyright: Copyright (C) 2010 Open-Sankoré
License: GPL-3+
Files: debian/*
-Copyright: Copyright (C) 2012, Miriam Ruiz <little_miry at yahoo.es>
+Copyright: Copyright (C) 2012, Miriam Ruiz <miriam at debian.org>
License: GPL-3+
License: GPL-3+
- This program is free software; you can redistribute it and/or modify
+ Open-Sankoré is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
+ the Free Software Foundation, either version 3 of the License,
+ with a specific linking exception for the OpenSSL project's
+ "OpenSSL" library (or with modified versions of it that use the
+ same license as the "OpenSSL" library).
+ .
+ Open-Sankoré 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 General Public License for more details.
.
On Debian systems, the complete text of the latest version of the GNU
- General Public License can be found in `/usr/share/common-licenses/GPL-3'.
+ General Public License can be found in `/usr/share/common-licenses/GPL'.
.
The complete text of version 3 of the GNU General Public License can be
found in `/usr/share/common-licenses/GPL-3'.
+
diff --git a/debian/patches/UBDesktopPropertyPalette.patch b/debian/patches/UBDesktopPropertyPalette.patch
new file mode 100644
index 0000000..c13a429
--- /dev/null
+++ b/debian/patches/UBDesktopPropertyPalette.patch
@@ -0,0 +1,18 @@
+Index: sankore/Sankore-3.1/src/desktop/UBDesktopPropertyPalette.cpp
+===================================================================
+--- sankore.orig/Sankore-3.1/src/desktop/UBDesktopPropertyPalette.cpp 2013-03-07 20:08:11.863607253 +0100
++++ sankore/Sankore-3.1/src/desktop/UBDesktopPropertyPalette.cpp 2013-03-07 20:08:11.855607255 +0100
+@@ -18,7 +18,13 @@
+ * You should have received a copy of the GNU General Public License
+ * along with Open-Sankoré. If not, see <http://www.gnu.org/licenses/>.
+ */
++
++#include "UBDesktopPropertyPalette.h"
++#include "core/UBApplication.h"
+ #include "gui/UBRightPalette.h"
++#include "gui/UBToolbarButtonGroup.h"
++#include "gui/UBMainWindow.h"
++#include "board/UBDrawingController.h"
+
+ #include "core/memcheck.h"
+
diff --git a/debian/patches/UBGraphicsAristo.patch b/debian/patches/UBGraphicsAristo.patch
new file mode 100644
index 0000000..a3d8565
--- /dev/null
+++ b/debian/patches/UBGraphicsAristo.patch
@@ -0,0 +1,260 @@
+Index: sankore/Sankore-3.1/src/tools/UBGraphicsAristo.h
+===================================================================
+--- sankore.orig/Sankore-3.1/src/tools/UBGraphicsAristo.h 2013-03-07 20:08:11.819607252 +0100
++++ sankore/Sankore-3.1/src/tools/UBGraphicsAristo.h 2013-03-07 20:08:11.803607254 +0100
+@@ -18,6 +18,13 @@
+ * You should have received a copy of the GNU General Public License
+ * along with Open-Sankoré. If not, see <http://www.gnu.org/licenses/>.
+ */
++
++#ifndef UBGRAPHICSARISTO_H_
++#define UBGRAPHICSARISTO_H_
++
++#include "core/UB.h"
++#include "domain/UBItem.h"
++#include "domain/UBGraphicsScene.h"
+ #include "tools/UBAbstractDrawRuler.h"
+
+ #include <QtGlobal>
+@@ -45,7 +52,7 @@
+ virtual ~UBGraphicsAristo();
+
+ enum {
+- Type = UBGraphicsItemType::AristoItemType
++ Type = UBGraphicsItemType::AristoItemType
+ };
+
+ enum Tool {
+@@ -65,7 +72,7 @@
+ Undefined
+ };
+
+- void setOrientation(Orientation orientation);
++ void setOrientation(Orientation orientation);
+
+ virtual UBItem* deepCopy() const;
+ virtual void copyItemParameters(UBItem *copy) const;
+@@ -91,10 +98,10 @@
+ virtual QRectF closeButtonRect() const;
+ QRectF hFlipRect() const;
+ QRectF markerButtonRect() const;
+- QRectF resizeButtonRect () const;
++ QRectF resizeButtonRect () const;
+ QRectF rotateRect() const;
+
+- QCursor flipCursor() const;
++ QCursor flipCursor() const;
+ QCursor markerCursor() const;
+ QCursor resizeCursor() const;
+
+@@ -124,7 +131,7 @@
+ inline qreal radius () const
+ {
+ return sqrt(((B.x() - A.x())*(B.x() - A.x()))+((B.y() - A.y())*(B.y() - A.y()))) * 9 / 16 - 20;
+- }
++ }
+
+ bool mMarking;
+ bool mResizing;
+@@ -141,13 +148,14 @@
+ QGraphicsSvgItem* mHFlipSvgItem;
+ QGraphicsSvgItem* mMarkerSvgItem;
+ QGraphicsSvgItem* mResizeSvgItem;
+- QGraphicsSvgItem* mRotateSvgItem;
++ QGraphicsSvgItem* mRotateSvgItem;
+
+ QPointF A, B, C;
+
+ static const int sArcAngleMargin = 5;
+- static const Orientation sDefaultOrientation;
++ static const Orientation sDefaultOrientation;
+ static const QRectF sDefaultRect;
+ };
+
+ #endif /* UBGRAPHICSARISTO_H_ */
++
+Index: sankore/Sankore-3.1/src/tools/UBGraphicsAristo.cpp
+===================================================================
+--- sankore.orig/Sankore-3.1/src/tools/UBGraphicsAristo.cpp 2013-03-07 20:08:11.819607252 +0100
++++ sankore/Sankore-3.1/src/tools/UBGraphicsAristo.cpp 2013-03-07 20:08:11.811607255 +0100
+@@ -18,6 +18,13 @@
+ * You should have received a copy of the GNU General Public License
+ * along with Open-Sankoré. If not, see <http://www.gnu.org/licenses/>.
+ */
++
++#include "UBGraphicsAristo.h"
++#include "board/UBBoardController.h"
++#include "board/UBDrawingController.h"
++#include "core/UBApplication.h"
++#include "domain/UBGraphicsScene.h"
++
+ #include <QColor>
+ #include <QFont>
+ #include <QFontMetricsF>
+@@ -29,7 +36,7 @@
+
+ #include "core/memcheck.h"
+
+-const QRectF UBGraphicsAristo::sDefaultRect = QRectF(0, 0, 800, 500);
++const QRectF UBGraphicsAristo::sDefaultRect = QRectF(0, 0, 800, 500);
+ const UBGraphicsAristo::Orientation UBGraphicsAristo::sDefaultOrientation = UBGraphicsAristo::Top;
+
+ UBGraphicsAristo::UBGraphicsAristo()
+@@ -78,9 +85,9 @@
+ }
+
+ /*
+- * setOrientation() modify the tool orientation.
+- * Apexes coordinates are alors recomputed.
+- */
++* setOrientation() modify the tool orientation.
++* Apexes coordinates are alors recomputed.
++*/
+ void UBGraphicsAristo::setOrientation(Orientation orientation)
+ {
+ /* substracting difference to zero [2pi] twice, to obtain the desired angle */
+@@ -96,9 +103,9 @@
+ }
+
+ /* calculatePoints() is used to calculate polygon's apexes coordinates.
+- * This function handles orientation changes too.
+- * Items are repositionated and path is redeterminates.
+- */
++* This function handles orientation changes too.
++* Items are repositionated and path is redeterminates.
++*/
+ void UBGraphicsAristo::calculatePoints(QRectF bounds)
+ {
+ switch (mOrientation) {
+@@ -131,24 +138,24 @@
+ }
+
+ /*
+- * setItemsPos() places control items according to A, B and C positions.
+- * Call this function after A, B or C position modification, mostly after calling calculatePoints().
+- * These positions has to be set when calling setPath() to allow hover events on items which are not into the main polygon.
+- */
++* setItemsPos() places control items according to A, B and C positions.
++* Call this function after A, B or C position modification, mostly after calling calculatePoints().
++* These positions has to be set when calling setPath() to allow hover events on items which are not into the main polygon.
++*/
+ void UBGraphicsAristo::setItemsPos()
+ {
+ mCloseSvgItem->setPos(closeButtonRect().topLeft() + rotationCenter());
+ mHFlipSvgItem->setPos(hFlipRect().topLeft() + rotationCenter());
+ mRotateSvgItem->setPos(rotateRect().topLeft() + rotationCenter());
+- mResizeSvgItem->setPos(resizeButtonRect().topLeft() + rotationCenter());
++ mResizeSvgItem->setPos(resizeButtonRect().topLeft() + rotationCenter());
+ mMarkerSvgItem->setPos(markerButtonRect().topLeft() + rotationCenter());
+ }
+
+ /*
+- * determinePath() modify the shape according to apexes coordinates and control item positions.
+- * This is useful when orientation is modified.
+- * Returns the painter path corresponding to object parameters.
+- */
++* determinePath() modify the shape according to apexes coordinates and control item positions.
++* This is useful when orientation is modified.
++* Returns the painter path corresponding to object parameters.
++*/
+ QPainterPath UBGraphicsAristo::determinePath()
+ {
+ QPainterPath path;
+@@ -210,7 +217,7 @@
+ {
+ UBGraphicsAristo* cp = dynamic_cast<UBGraphicsAristo*>(copy);
+ if (cp)
+- {
++ {
+ /* TODO: copy all members */
+ cp->setPos(this->pos());
+ cp->setTransform(this->transform());
+@@ -233,7 +240,7 @@
+ polygon.clear();
+
+ paintGraduations(painter);
+- paintMarker(painter);
++ paintMarker(painter);
+ }
+
+ QBrush UBGraphicsAristo::fillBrush() const
+@@ -330,9 +337,9 @@
+ void UBGraphicsAristo::paintProtractorGraduations(QPainter* painter)
+ {
+ /* defining useful constants */
+- const int tenDegreeGraduationLength = 15;
++ const int tenDegreeGraduationLength = 15;
+ const int fiveDegreeGraduationLength = 10;
+- const int oneDegreeGraduationLength = 5;
++ const int oneDegreeGraduationLength = 5;
+
+ painter->save();
+
+@@ -449,7 +456,7 @@
+ }
+
+ /* getting intersection point to draw the wanted line */
+- QLineF intersectedLine(rotationCenter(), QPointF(rotationCenter().x()+co, rotationCenter().y()+si));
++ QLineF intersectedLine(rotationCenter(), QPointF(rotationCenter().x()+co, rotationCenter().y()+si));
+ QPointF intersectionPoint;
+ if (intersectedLine.intersect(QLineF(referencePoint, C), &intersectionPoint))
+ painter->drawLine(QLineF(intersectionPoint, rotationCenter()));
+@@ -527,9 +534,9 @@
+ return QRectF (radius()/2 - mMarkerSvgItem->boundingRect().width(), y, mMarkerSvgItem->boundingRect().width(), mMarkerSvgItem->boundingRect().height());
+ }
+
+-QRectF UBGraphicsAristo::resizeButtonRect() const
++QRectF UBGraphicsAristo::resizeButtonRect() const
+ {
+- return QRectF((B - rotationCenter()).x() - 100 - mResizeSvgItem->boundingRect().width()/2, - mResizeSvgItem->boundingRect().height()/2, mResizeSvgItem->boundingRect().width(), mResizeSvgItem->boundingRect().height());
++ return QRectF((B - rotationCenter()).x() - 100 - mResizeSvgItem->boundingRect().width()/2, - mResizeSvgItem->boundingRect().height()/2, mResizeSvgItem->boundingRect().width(), mResizeSvgItem->boundingRect().height());
+ }
+
+ QRectF UBGraphicsAristo::rotateRect() const
+@@ -648,7 +655,7 @@
+ hide();
+ emit hidden();
+ break;
+- case HorizontalFlip:
++ case HorizontalFlip:
+ /* setting new orientation */
+ switch(mOrientation) {
+ case Bottom:
+@@ -676,7 +683,7 @@
+ {
+ UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController ()->stylusTool ();
+
+- if (currentTool == UBStylusTool::Selector) {
++ if (currentTool == UBStylusTool::Selector) {
+ mShowButtons = true;
+ mHFlipSvgItem->setVisible(true);
+ mRotateSvgItem->setVisible(true);
+@@ -707,7 +714,7 @@
+ event->accept();
+ update();
+
+- } else if (UBDrawingController::drawingController()->isDrawingTool()) {
++ } else if (UBDrawingController::drawingController()->isDrawingTool()) {
+ setCursor(drawRulerLineCursor());
+ UBDrawingController::drawingController()->mActiveRuler = this;
+ event->accept();
+@@ -767,10 +774,10 @@
+ }
+
+ /*
+- * toolfromPos() returns the item type corresponding to the given position.
+- * This method is used to reduce the amount of code in each event function and improve class' maintainability.
+- * pos: event's position ; a rotation is done to counter elements rotation, like the marker button.
+- */
++* toolfromPos() returns the item type corresponding to the given position.
++* This method is used to reduce the amount of code in each event function and improve class' maintainability.
++* pos: event's position ; a rotation is done to counter elements rotation, like the marker button.
++*/
+ UBGraphicsAristo::Tool UBGraphicsAristo::toolFromPos(QPointF pos)
+ {
+ pos = pos - rotationCenter();
+@@ -849,3 +856,4 @@
+ {
+ return static_cast<UBGraphicsScene*>(QGraphicsPathItem::scene());
+ }
++
diff --git a/debian/patches/absolute_dirs.patch b/debian/patches/absolute_dirs.patch
index 87f3df2..efbb8b3 100644
--- a/debian/patches/absolute_dirs.patch
+++ b/debian/patches/absolute_dirs.patch
@@ -1,10 +1,8 @@
-Description: Use absolute FHS-compliant directories.
-Author: Miriam Ruiz <miriam at debian.org>
-Index: new/Sankore-3.1/src/frameworks/UBPlatformUtils_linux.cpp
+Index: sankore/Sankore-3.1/src/frameworks/UBPlatformUtils_linux.cpp
===================================================================
---- new.orig/Sankore-3.1/src/frameworks/UBPlatformUtils_linux.cpp 2012-05-10 18:26:51.000000000 +0200
-+++ new/Sankore-3.1/src/frameworks/UBPlatformUtils_linux.cpp 2012-05-16 12:46:42.143559477 +0200
-@@ -28,7 +28,7 @@
+--- sankore.orig/Sankore-3.1/src/frameworks/UBPlatformUtils_linux.cpp 2013-03-07 20:08:11.603607252 +0100
++++ sankore/Sankore-3.1/src/frameworks/UBPlatformUtils_linux.cpp 2013-03-07 20:08:31.000000000 +0100
+@@ -38,7 +38,7 @@
QString UBPlatformUtils::applicationResourcesDirectory()
{
@@ -13,20 +11,18 @@ Index: new/Sankore-3.1/src/frameworks/UBPlatformUtils_linux.cpp
}
void UBPlatformUtils::hideFile(const QString &filePath)
-Index: new/Sankore-3.1/src/web/UBWebController.cpp
+Index: sankore/Sankore-3.1/src/web/UBWebController.cpp
===================================================================
---- new.orig/Sankore-3.1/src/web/UBWebController.cpp 2012-05-10 18:26:51.000000000 +0200
-+++ new/Sankore-3.1/src/web/UBWebController.cpp 2012-05-16 12:46:42.143559477 +0200
-@@ -176,13 +176,8 @@
+--- sankore.orig/Sankore-3.1/src/web/UBWebController.cpp 2013-03-07 20:08:11.603607252 +0100
++++ sankore/Sankore-3.1/src/web/UBWebController.cpp 2013-03-07 20:08:11.595607255 +0100
+@@ -192,11 +192,8 @@
QString tutorialHtmlIndexFile = 0;
QString tutorialPath = "/etc/Tutorial/tutorial" + language + "/index.html";
-#if defined(Q_WS_MAC)
- tutorialHtmlIndexFile = QApplication::applicationDirPath()+ "/../Resources" + tutorialPath;
--#elif defined(Q_WS_WIN)
-- tutorialHtmlIndexFile = QApplication::applicationDirPath()+ tutorialPath;
-#else
-- tutorialHtmlIndexFile = QApplication::applicationDirPath()+ tutorialPath;
+- tutorialHtmlIndexFile = QApplication::applicationDirPath() + tutorialPath;
-#endif
+
+ tutorialHtmlIndexFile = "/usr/share/open-sankore/" + tutorialPath;
diff --git a/debian/patches/build_opts.patch b/debian/patches/build_opts.patch
index 65634e2..e14833b 100644
--- a/debian/patches/build_opts.patch
+++ b/debian/patches/build_opts.patch
@@ -1,22 +1,9 @@
-Description: Fix buildopts on Linux
-Author: Miriam Ruiz <miriam at debian.org>
-Index: new/Sankore-3.1/Sankore_3.1.pro
+Index: sankore/Sankore-3.1/Sankore_3.1.pro
===================================================================
---- new.orig/Sankore-3.1/Sankore_3.1.pro 2012-05-16 12:44:30.607565467 +0200
-+++ new/Sankore-3.1/Sankore_3.1.pro 2012-05-16 12:46:42.127559479 +0200
-@@ -351,8 +351,8 @@
-
- linux-g++-32 {
- LIBS += -lcrypto
-- QMAKE_CFLAGS += -fopenmp
-- QMAKE_CXXFLAGS += -fopenmp
-+ QMAKE_CFLAGS += -fopenmp -g -Wall
-+ QMAKE_CXXFLAGS += -fopenmp -g -Wall
- QMAKE_LFLAGS += -fopenmp
- UB_LIBRARY.path = $$DESTDIR
- UB_I18N.path = $$DESTDIR/i18n
-@@ -367,8 +367,8 @@
- linux-g++-64 {
+--- sankore.orig/Sankore-3.1/Sankore_3.1.pro 2013-03-07 20:08:11.515607254 +0100
++++ sankore/Sankore-3.1/Sankore_3.1.pro 2013-03-07 20:08:29.000000000 +0100
+@@ -376,8 +376,8 @@
+ CONFIG += link_prl
LIBS += -lcrypto
LIBS += -lX11
- QMAKE_CFLAGS += -fopenmp
diff --git a/debian/patches/includes.patch b/debian/patches/includes.patch
new file mode 100644
index 0000000..690c952
--- /dev/null
+++ b/debian/patches/includes.patch
@@ -0,0 +1,26 @@
+Index: sankore/Sankore-3.1/src/frameworks/UBPlatformUtils_linux.cpp
+===================================================================
+--- sankore.orig/Sankore-3.1/src/frameworks/UBPlatformUtils_linux.cpp 2013-03-07 20:08:11.711607255 +0100
++++ sankore/Sankore-3.1/src/frameworks/UBPlatformUtils_linux.cpp 2013-03-07 20:08:11.699607252 +0100
+@@ -28,6 +28,8 @@
+ #include <X11/Xlib.h>
+ #include <X11/keysym.h>
+
++#include <unistd.h>
++
+ #include "frameworks/UBFileSystemUtils.h"
+
+
+Index: sankore/Sankore-ThirdParty/trolltech/singleapplication/qtlocalpeer.cpp
+===================================================================
+--- sankore.orig/Sankore-ThirdParty/trolltech/singleapplication/qtlocalpeer.cpp 2013-03-07 20:08:11.711607255 +0100
++++ sankore/Sankore-ThirdParty/trolltech/singleapplication/qtlocalpeer.cpp 2013-03-07 20:08:11.703607252 +0100
+@@ -50,6 +50,8 @@
+ #endif
+ #if defined(Q_OS_UNIX)
+ #include <time.h>
++#include <unistd.h>
++#include <sys/types.h>
+ #endif
+
+ namespace QtLP_Private {
diff --git a/debian/patches/qt_pre_4.7.patch b/debian/patches/qt_pre_4.7.patch
index ed7f98f..6ea924c 100644
--- a/debian/patches/qt_pre_4.7.patch
+++ b/debian/patches/qt_pre_4.7.patch
@@ -1,10 +1,8 @@
-Description: Make the application build against Qt <4.7
-Author: Miriam Ruiz <miriam at debian.org>
-Index: new/Sankore-3.1/src/adaptors/UBMetadataDcSubsetAdaptor.cpp
+Index: sankore/Sankore-3.1/src/adaptors/UBMetadataDcSubsetAdaptor.cpp
===================================================================
---- new.orig/Sankore-3.1/src/adaptors/UBMetadataDcSubsetAdaptor.cpp 2012-05-16 15:56:27.000000000 +0200
-+++ new/Sankore-3.1/src/adaptors/UBMetadataDcSubsetAdaptor.cpp 2012-05-16 16:30:20.178948436 +0200
-@@ -108,7 +108,7 @@
+--- sankore.orig/Sankore-3.1/src/adaptors/UBMetadataDcSubsetAdaptor.cpp 2013-03-07 20:08:11.667607255 +0100
++++ sankore/Sankore-3.1/src/adaptors/UBMetadataDcSubsetAdaptor.cpp 2013-03-07 20:08:11.635607254 +0100
+@@ -115,7 +115,7 @@
xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri, "size", QString("%1x%2").arg(width).arg(height));
// introduced in UB 4.4
@@ -13,33 +11,34 @@ Index: new/Sankore-3.1/src/adaptors/UBMetadataDcSubsetAdaptor.cpp
// introduced in OpenSankore 1.40.00
xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionTitle,proxy->metaData(UBSettings::sessionTitle).toString());
xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionAuthors,proxy->metaData(UBSettings::sessionAuthors).toString());
-Index: new/Sankore-3.1/src/board/UBFeaturesController.cpp
+Index: sankore/Sankore-3.1/src/board/UBFeaturesController.cpp
===================================================================
---- new.orig/Sankore-3.1/src/board/UBFeaturesController.cpp 2012-05-16 15:56:27.000000000 +0200
-+++ new/Sankore-3.1/src/board/UBFeaturesController.cpp 2012-05-16 16:30:20.214948434 +0200
-@@ -18,6 +18,10 @@
- #include "domain/UBGraphicsVideoItem.h"
- #include "domain/UBGraphicsWidgetItem.h"
+--- sankore.orig/Sankore-3.1/src/board/UBFeaturesController.cpp 2013-03-07 20:08:11.667607255 +0100
++++ sankore/Sankore-3.1/src/board/UBFeaturesController.cpp 2013-03-07 20:08:11.647607253 +0100
+@@ -41,6 +41,10 @@
+
+ #include "gui/UBFeaturesWidget.h"
+#if QT_VERSION < 0x040700
+inline bool qHash(const QUrl &url) { return qHash(url.toString()); }
+#endif
+
- UBFeature::UBFeature(const QString &url, const QPixmap &icon, const QString &name, const QUrl &realPath, UBFeatureElementType type)
- : virtualPath(url), mThumbnail(icon), mName(name), mPath(realPath), elementType(type)
- {
-Index: new/Sankore-3.1/src/gui/UBTeacherGuideWidgetsTools.cpp
+ const QString UBFeaturesController::virtualRootName = "root";
+ const QString UBFeaturesController::rootPath = "/" + virtualRootName;
+
+Index: sankore/Sankore-3.1/src/gui/UBTeacherGuideWidgetsTools.cpp
===================================================================
---- new.orig/Sankore-3.1/src/gui/UBTeacherGuideWidgetsTools.cpp 2012-05-16 12:44:30.635565467 +0200
-+++ new/Sankore-3.1/src/gui/UBTeacherGuideWidgetsTools.cpp 2012-05-16 16:32:04.474943686 +0200
-@@ -528,10 +528,14 @@
- mpLayout = new QVBoxLayout(this);
+--- sankore.orig/Sankore-3.1/src/gui/UBTeacherGuideWidgetsTools.cpp 2013-03-07 20:08:11.667607255 +0100
++++ sankore/Sankore-3.1/src/gui/UBTeacherGuideWidgetsTools.cpp 2013-03-07 20:08:11.651607252 +0100
+@@ -625,11 +625,15 @@
+ setLayout(mpLayout);
mpTitle = new QLineEdit(this);
mpTitle->setObjectName("UBTGLineEdit");
+#if QT_VERSION >= 0x040700
mpTitle->setPlaceholderText(tr("Insert link title here..."));
+#endif
mpUrl = new QLineEdit(this);
+ connect(mpUrl,SIGNAL(editingFinished()),this,SLOT(onUrlEditionFinished()));
mpUrl->setObjectName("UBTGLineEdit");
+#if QT_VERSION >= 0x040700
mpUrl->setPlaceholderText("http://");
@@ -47,3 +46,17 @@ Index: new/Sankore-3.1/src/gui/UBTeacherGuideWidgetsTools.cpp
mpLayout->addWidget(mpTitle);
mpLayout->addWidget(mpUrl);
}
+Index: sankore/Sankore-3.1/src/domain/UBGraphicsWidgetItem.cpp
+===================================================================
+--- sankore.orig/Sankore-3.1/src/domain/UBGraphicsWidgetItem.cpp 2013-03-07 20:08:11.667607255 +0100
++++ sankore/Sankore-3.1/src/domain/UBGraphicsWidgetItem.cpp 2013-03-07 20:08:11.663607255 +0100
+@@ -79,7 +79,9 @@
+ page()->setNetworkAccessManager(UBNetworkAccessManager::defaultAccessManager());
+
+ setAcceptDrops(true);
++ #if QT_VERSION >= 0x040700
+ setAutoFillBackground(false);
++ #endif
+
+ QPalette pagePalette = page()->palette();
+ pagePalette.setBrush(QPalette::Base, QBrush(Qt::transparent));
diff --git a/debian/patches/series b/debian/patches/series
index 796c944..9a7bbe5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,7 @@
build_opts.patch
absolute_dirs.patch
qt_pre_4.7.patch
+includes.patch
enable_i18n.patch
+UBGraphicsAristo.patch
+UBDesktopPropertyPalette.patch
hooks/post-receive
--
sankore.git (Debian package sankore)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sankore.git" (Debian package sankore).
More information about the debian-edu-commits
mailing list