[debian-edu-commits] debian-edu/sankore.git (#65) - master (branch) updated: upstream/2.1.0+git20130505-62-g04bc471

Mike Gabriel sunweaver at alioth.debian.org
Sun May 5 11:51:46 UTC 2013


The branch, master has been updated
       via  04bc4715ad54d7d3bf1236678307073089dfcc1b (commit)
      from  995a3fb25de09a208cf754e304c22459e5efedbb (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 04bc4715ad54d7d3bf1236678307073089dfcc1b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 5 13:51:41 2013 +0200

    update patchset, remove patches: 011_UBGraphicsAristo.patch, 012_UBDesktopPropertyPalette.patch (included in new upstream release)

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                  |    2 -
 debian/patches/001_build_opts.patch               |    8 +-
 debian/patches/002_absolute_dirs.patch            |   16 +-
 debian/patches/003_qt_pre_4.7.patch               |   38 ++--
 debian/patches/004_includes.patch                 |   14 +-
 debian/patches/011_UBGraphicsAristo.patch         |  260 ---------------------
 debian/patches/012_UBDesktopPropertyPalette.patch |   18 --
 debian/patches/series                             |    2 -
 8 files changed, 29 insertions(+), 329 deletions(-)
 delete mode 100644 debian/patches/011_UBGraphicsAristo.patch
 delete mode 100644 debian/patches/012_UBDesktopPropertyPalette.patch

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index af1596f..63c95eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,6 @@ sankore (2.1.0+git20130505-1) UNRELEASED; urgency=low
     + 003_qt_pre_4.7.patch
     + 004_includes.patch
     + 005_enable_i18n.patch
-    + 011_UBGraphicsAristo.patch
-    + 012_UBDesktopPropertyPalette.patch
 
   [ Mike Gabriel ]
   * Include upstream changelog (release notes) into package.
diff --git a/debian/patches/001_build_opts.patch b/debian/patches/001_build_opts.patch
index 6b39cdf..19983f6 100644
--- a/debian/patches/001_build_opts.patch
+++ b/debian/patches/001_build_opts.patch
@@ -1,10 +1,8 @@
 Description: Add -g -Wall to CFLAGS/CXXFLAGS.
 Author: Miriam Ruiz <miriam at debian.org>
-Index: sankore/Sankore-3.1/Sankore_3.1.pro
-===================================================================
---- 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 @@
+--- a/Sankore-3.1/Sankore_3.1.pro
++++ b/Sankore-3.1/Sankore_3.1.pro
+@@ -394,8 +394,8 @@
      CONFIG += link_prl
      LIBS += -lcrypto
      LIBS += -lX11
diff --git a/debian/patches/002_absolute_dirs.patch b/debian/patches/002_absolute_dirs.patch
index 42d8dfc..29b75a3 100644
--- a/debian/patches/002_absolute_dirs.patch
+++ b/debian/patches/002_absolute_dirs.patch
@@ -1,10 +1,8 @@
 Description: Use hard-coded paths for Debian package.
 Author: Miriam Ruiz <miriam at debian.org>
-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.603607252 +0100
-+++ sankore/Sankore-3.1/src/frameworks/UBPlatformUtils_linux.cpp	2013-03-07 20:08:31.000000000 +0100
-@@ -38,7 +38,7 @@
+--- a/Sankore-3.1/src/frameworks/UBPlatformUtils_linux.cpp
++++ b/Sankore-3.1/src/frameworks/UBPlatformUtils_linux.cpp
+@@ -39,7 +39,7 @@
  
  QString UBPlatformUtils::applicationResourcesDirectory()
  {
@@ -13,11 +11,9 @@ Index: sankore/Sankore-3.1/src/frameworks/UBPlatformUtils_linux.cpp
  }
  
  void UBPlatformUtils::hideFile(const QString &filePath)
-Index: sankore/Sankore-3.1/src/web/UBWebController.cpp
-===================================================================
---- 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 @@
+--- a/Sankore-3.1/src/web/UBWebController.cpp
++++ b/Sankore-3.1/src/web/UBWebController.cpp
+@@ -193,11 +193,8 @@
  
      QString tutorialHtmlIndexFile = 0;
      QString tutorialPath = "/etc/Tutorial/tutorial" + language + "/index.html";
diff --git a/debian/patches/003_qt_pre_4.7.patch b/debian/patches/003_qt_pre_4.7.patch
index dea2360..9eb9811 100644
--- a/debian/patches/003_qt_pre_4.7.patch
+++ b/debian/patches/003_qt_pre_4.7.patch
@@ -1,10 +1,8 @@
 Description: Build against Qt 4.7.
 Author: Miriam Ruiz <miriam at debian.org>
-Index: sankore/Sankore-3.1/src/adaptors/UBMetadataDcSubsetAdaptor.cpp
-===================================================================
---- 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 @@
+--- a/Sankore-3.1/src/adaptors/UBMetadataDcSubsetAdaptor.cpp
++++ b/Sankore-3.1/src/adaptors/UBMetadataDcSubsetAdaptor.cpp
+@@ -117,7 +117,7 @@
      xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri, "size", QString("%1x%2").arg(width).arg(height));
  
      // introduced in UB 4.4
@@ -13,11 +11,9 @@ Index: sankore/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: sankore/Sankore-3.1/src/board/UBFeaturesController.cpp
-===================================================================
---- 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 @@
+--- a/Sankore-3.1/src/board/UBFeaturesController.cpp
++++ b/Sankore-3.1/src/board/UBFeaturesController.cpp
+@@ -42,6 +42,10 @@
  
  #include "gui/UBFeaturesWidget.h"
  
@@ -25,14 +21,12 @@ Index: sankore/Sankore-3.1/src/board/UBFeaturesController.cpp
 +inline bool qHash(const QUrl &url) { return qHash(url.toString()); }
 +#endif
 +
- const QString UBFeaturesController::virtualRootName = "root";
- const QString UBFeaturesController::rootPath  = "/" + virtualRootName;
- 
-Index: sankore/Sankore-3.1/src/gui/UBTeacherGuideWidgetsTools.cpp
-===================================================================
---- 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 @@
+ void UBFeaturesComputingThread::scanFS(const QUrl & currentPath
+                                        , const QString & currVirtualPath
+                                        , const QPair<CategoryData, QSet<QUrl> > &pfavoriteInfo
+--- a/Sankore-3.1/src/gui/UBTeacherGuideWidgetsTools.cpp
++++ b/Sankore-3.1/src/gui/UBTeacherGuideWidgetsTools.cpp
+@@ -665,11 +665,15 @@
      setLayout(mpLayout);
      mpTitle = new QLineEdit(this);
      mpTitle->setObjectName("UBTGLineEdit");
@@ -48,11 +42,9 @@ Index: sankore/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 @@
+--- a/Sankore-3.1/src/domain/UBGraphicsWidgetItem.cpp
++++ b/Sankore-3.1/src/domain/UBGraphicsWidgetItem.cpp
+@@ -80,7 +80,9 @@
      page()->setNetworkAccessManager(UBNetworkAccessManager::defaultAccessManager());
  
      setAcceptDrops(true);
diff --git a/debian/patches/004_includes.patch b/debian/patches/004_includes.patch
index d0d0673..7675c5c 100644
--- a/debian/patches/004_includes.patch
+++ b/debian/patches/004_includes.patch
@@ -1,10 +1,8 @@
 Description: Fix FTBFS when built with gcc 4.7.
 Author: Miriam Ruiz <miriam at debian.org>
-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 @@
+--- a/Sankore-3.1/src/frameworks/UBPlatformUtils_linux.cpp
++++ b/Sankore-3.1/src/frameworks/UBPlatformUtils_linux.cpp
+@@ -29,6 +29,8 @@
  #include <X11/Xlib.h>
  #include <X11/keysym.h>
  
@@ -13,10 +11,8 @@ Index: sankore/Sankore-3.1/src/frameworks/UBPlatformUtils_linux.cpp
  #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
+--- a/Sankore-ThirdParty/trolltech/singleapplication/qtlocalpeer.cpp
++++ b/Sankore-ThirdParty/trolltech/singleapplication/qtlocalpeer.cpp
 @@ -50,6 +50,8 @@
  #endif
  #if defined(Q_OS_UNIX)
diff --git a/debian/patches/011_UBGraphicsAristo.patch b/debian/patches/011_UBGraphicsAristo.patch
deleted file mode 100644
index a3d8565..0000000
--- a/debian/patches/011_UBGraphicsAristo.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-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/012_UBDesktopPropertyPalette.patch b/debian/patches/012_UBDesktopPropertyPalette.patch
deleted file mode 100644
index c13a429..0000000
--- a/debian/patches/012_UBDesktopPropertyPalette.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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/series b/debian/patches/series
index 1fce3d0..15058e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,3 @@
 003_qt_pre_4.7.patch
 004_includes.patch
 005_enable_i18n.patch
-011_UBGraphicsAristo.patch
-012_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