merge with OEFUniboard

C++StandardHeaderFile.txt

 /*
- * Copyright (C) 2012 Webdoc SA
+ * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)
  *
  * This file is part of Open-Sankoré.
  *

Open-Sankore.packproj

@@ -28,7 +28,7 @@
 						<key>Mode</key>
 						<integer>1</integer>
 						<key>Path</key>
-						<string>COPYING</string>
+						<string>LICENSE.txt</string>
 						<key>Path Type</key>
 						<integer>2</integer>
 					</dict>

Sankore_3.1.pro

@@ -9,9 +9,9 @@ CONFIG += debug_and_release \
 
 
 VERSION_MAJ = 2
-VERSION_MIN = 00 
+VERSION_MIN = 00
 VERSION_TYPE = r # a = alpha, b = beta, r = release, other => error
-VERSION_PATCH = 02 
+VERSION_PATCH = 05
 
 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
 VERSION = $$replace(VERSION, "\\.r", "")
@@ -128,10 +128,10 @@ win32 {
 }
 
 macx {
-   LIBS += -framework Foundation 
+   LIBS += -framework Foundation
    LIBS += -lcrypto
    #commented because Sankore crashes on Java Script. It seems to backends dependencies.
-   #LIBS += -framework AppKit 
+   #LIBS += -framework AppKit
    #LIBS += -framework WebKit
 
    CONFIG(release, debug|release):CONFIG += x86
@@ -351,7 +351,7 @@ macx {
        TRANSLATION_mg.path = "$$RESOURCES_DIR/mg.lproj"
        QMAKE_BUNDLE_DATA += TRANSLATION_mg
    }
-   
+
    QMAKE_BUNDLE_DATA += UB_ETC \
        UB_LIBRARY \
        UB_FONTS \

buildDebianPackage.sh

@@ -19,6 +19,15 @@
 #     functions
 #**********************
 
+checkUser()
+{
+  if [ `id -u` -ne 0 ]; then
+    echo "Please run the script as root, may be using fakeroot command as follow"
+    echo "fakeroot ./buildDebianPackage.sh [options]"
+    exit 1
+  fi
+}
+
 initializeVariables()
 {
   MAKE_TAG=true
@@ -120,6 +129,7 @@ buildWithStandardQt(){
 #**********************
 #     script
 #**********************
+checkUser
 initializeVariables
 buildWithStandardQt
 
@@ -375,12 +385,13 @@ chmod 755 "$BASE_WORKING_DIR/DEBIAN/postint"
 mkdir -p "install/linux"
 DEBIAN_PACKAGE_NAME="Open-Sankore_${VERSION}_$ARCHITECTURE.deb"
 
-fakeroot  chown -R root:root $BASE_WORKING_DIR 
+chown -R root:root $BASE_WORKING_DIR 
 dpkg -b "$BASE_WORKING_DIR" "install/linux/$DEBIAN_PACKAGE_NAME"
-notifyProgress "Open-Sankore" "Package built"
 
 #clean up mess
-fakeroot rm -rf $BASE_WORKING_DIR
+rm -rf $BASE_WORKING_DIR
+
+notifyProgress "Open-Sankore" "Package built"
 
 
 if [ $CREATE_DIENA_DISTRIBUTION_ZIP == true ]; then
@@ -392,3 +403,4 @@ if [ $CREATE_DIENA_DISTRIBUTION_ZIP == true ]; then
     notifyProgress "Open-Sankore" "Build Diena zip file for distribution"
 fi
 
+exit 0

plugins/cffadaptor/src/UBCFFAdaptor.cpp

 /*
- * Copyright (C) 2012 Webdoc SA
+ * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)
  *
  * This file is part of Open-Sankoré.
  *

plugins/cffadaptor/src/UBCFFAdaptor.h

 /*
- * Copyright (C) 2012 Webdoc SA
+ * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)
  *
  * This file is part of Open-Sankoré.
  *
@@ -100,7 +100,7 @@ private:
 
         bool parseUBZPolygon(const QDomElement &element, QMultiMap<int, QDomElement> &dstSvgList);
         bool parseUBZPolyline(const QDomElement &element, QMultiMap<int, QDomElement> &dstSvgList);
-        bool parseUBZLine(const QDomElement &element, QMultiMap<int, QDomElement> &dstSvgList);       
+        bool parseUBZLine(const QDomElement &element, QMultiMap<int, QDomElement> &dstSvgList);
         void addSVGElementToResultModel(const QDomElement &element, QMultiMap<int, QDomElement> &dstList, int layer = DEFAULT_LAYER);
         void addIWBElementToResultModel(const QDomElement &element);
 

plugins/cffadaptor/src/UBCFFAdaptor_global.h

 /*
- * Copyright (C) 2012 Webdoc SA
+ * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)
  *
  * This file is part of Open-Sankoré.
  *

plugins/cffadaptor/src/UBCFFConstants.h

 /*
- * Copyright (C) 2012 Webdoc SA
+ * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)
  *
  * This file is part of Open-Sankoré.
  *

plugins/cffadaptor/src/UBGlobals.h

 /*
- * Copyright (C) 2012 Webdoc SA
+ * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)
  *
  * This file is part of Open-Sankoré.
  *