[debian-edu-commits] debian-edu/sankore.git (#33) - master (branch) updated: upstream/2.00_git20130309-31-g85d3888

Mike Gabriel sunweaver at alioth.debian.org
Fri Apr 5 19:38:32 UTC 2013


The branch, master has been updated
       via  85d38883ef70076f3539f17a3953da589baf9dc2 (commit)
       via  7bdc8b823a08a3ac238b5721444850dd356a3761 (commit)
       via  d6cd55ad493b1f77126cfa1bc7bcb569828f5213 (commit)
       via  14646f1c902dfc8a861ace8361c841a1dc028a6b (commit)
       via  a3cba18666584228b526919659f5c8dac299eee3 (commit)
       via  d7417a092462885c65b325bf09814bc1fd2d2f29 (commit)
       via  b8051916b3bc39cd023eaa8b673b0345e7dca31d (commit)
       via  7f6937c10b16dedefa2fa84f505e3a8b563bfb1d (commit)
       via  f1dbbd6f2a20846036521a48d9a633ba73847e28 (commit)
       via  d4a41da85e8cd64f7076df6f8b8e4b1c193657c0 (commit)
       via  d4995bb4a2a010e8e4cb02b012a501cbaa426626 (commit)
       via  a705a155070ecc52b61fb40a0ebdccab172fdd03 (commit)
       via  d1bfca0066179d7ae03c339b1e389f766c0915d6 (commit)
       via  c736b9788e57be26baa98ede943387aa0cd67184 (commit)
       via  8e8e7882c20994ffd3db815bd99e7fb3a4bb9308 (commit)
       via  df7281131606a36f6a246d6d9954c1337641cb98 (commit)
       via  05a9619983b55147b876e9027b56784fbdf43184 (commit)
       via  726ef0d03ca182fd4b65c65ec19ee735d12c4f35 (commit)
       via  6ce7c9acbd87f480fcab6ffcbb0a16882758c142 (commit)
       via  9e0c2bd9f4a73fbb0fe788f165ee21051ba6d1dd (commit)
       via  7f46a116602ed58a8b1b4c23d1f8112ddabd8d9b (commit)
       via  ddb5d3f9bacf60ed99c82e605367488bdc20762c (commit)
       via  444bb3761daed4692cd023887e66be876f506cb7 (commit)
       via  97c3ce619386b446f2ae348a10ca456c03afb4be (commit)
       via  f5c74cf50a649208f78a2443ce924b3f564c86ec (commit)
       via  c83ebb30f51da57a90feb5d5bd0ce5cbd022fc9c (commit)
       via  bce60355e7380d660b7ea6aab8b78463b8dad28d (commit)
       via  63beabb4e0543064fb025da72b28639bfbc58b56 (commit)
       via  5628f790d2e9cea1552295881b036397896c3c92 (commit)
       via  cb7e3977ddafcf039934ebfb178c84fc5dbf9f66 (commit)
       via  710580031f1b90c48d82b5ae410da2e692f0b1aa (commit)
      from  9f23d3b62f5eac05557c2d3e6109d7c1f7915f30 (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 85d38883ef70076f3539f17a3953da589baf9dc2
Merge: 7bdc8b8 9f23d3b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Mar 9 10:47:05 2013 +0100

    Merge tag 'upstream/2.00_git20130309'
    
    Upstream version 2.00~git20130309
    
    # gpg: Unterschrift vom Sa 09 Mär 2013 10:46:58 CET mittels RSA-Schlüssel ID 25771B31
    # gpg: Korrekte Unterschrift von "Mike Gabriel <mike.gabriel at das-netzwerkteam.de>"
    # gpg:                     alias "Mike Gabriel <mike at zaubberer.net>"
    # gpg:                     alias "Mike Gabriel <mga at informatik.uni-kiel.de>"
    # gpg:                     alias "Mike Gabriel <mike.gabriel at sunweavers.net>"
    # gpg:                     alias "Mike Gabriel <mike.gabriel at moonweavers.net>"
    # gpg:                     alias "Mike Gabriel <mike.gabriel at ubuntu.de>"
    # gpg:                     alias "Mike Gabriel <mike.gabriel at it-zukunft-schule.de>"
    # gpg:                     alias "Mike Gabriel <m.gabriel at das-netzwerkteam.de>"
    # gpg:                     alias "Mike Gabriel <mike at ubuntu.de>"
    # gpg:                     alias "Mike Gabriel <mike at moonweavers.net>"
    # gpg: WARNUNG: Dieser Schlüssel trägt keine vertrauenswürdige Signatur!
    # gpg:          Es gibt keinen Hinweis, daß die Signatur wirklich dem vorgeblichen Besitzer gehört.
    # Haupt-Fingerabdruck  = 9BFB AEE8 6C0A A5FF BF22  0782 9AF4 6B30 2577 1B31

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

commit d6cd55ad493b1f77126cfa1bc7bcb569828f5213
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jul 13 14:08:25 2012 +0200

    /debian/control: attempt to fix package for integrity check of sbuild

commit 14646f1c902dfc8a861ace8361c841a1dc028a6b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jul 13 14:02:11 2012 +0200

    Fix build flags.

commit a3cba18666584228b526919659f5c8dac299eee3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jun 29 19:14:50 2012 +0200

    reverted - P: sankore source: unneeded-build-dep-on-quilt

commit d7417a092462885c65b325bf09814bc1fd2d2f29
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jun 12 01:55:37 2012 +0200

    avoid spelling-error-in-changelog

commit b8051916b3bc39cd023eaa8b673b0345e7dca31d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jun 12 01:41:33 2012 +0200

    W: sankore: binary-without-manpage usr/bin/Open-Sankore

commit 7f6937c10b16dedefa2fa84f505e3a8b563bfb1d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jun 12 01:27:21 2012 +0200

    Lintian overrides:
    
      + sankore: spelling-error-in-binary usr/lib/open-sankore/Open-Sankore.bin
        informations information (the application's native language is French
        not English)
      + sankore: spelling-error-in-binary usr/lib/open-sankore/Open-Sankore.bin
        resSource resource (resSource is a Javascript variable).

commit f1dbbd6f2a20846036521a48d9a633ba73847e28
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jun 12 01:17:15 2012 +0200

    P: sankore source: unneeded-build-dep-on-quilt

commit d4a41da85e8cd64f7076df6f8b8e4b1c193657c0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jun 12 01:15:21 2012 +0200

    Lintian issues fixed: copyright-refers-to-symlink-license usr/share/common-licenses/GPL

commit d4995bb4a2a010e8e4cb02b012a501cbaa426626
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jun 12 01:10:14 2012 +0200

    Add patch descriptions and authors.

commit a705a155070ecc52b61fb40a0ebdccab172fdd03
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jun 12 00:40:29 2012 +0200

    Enable parallel (make -j4) build.

commit d1bfca0066179d7ae03c339b1e389f766c0915d6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jun 12 00:27:29 2012 +0200

    Patches: Add patch: enable_i18n.patch -> build .qm files on the fly during qmake-qt4 run.

commit c736b9788e57be26baa98ede943387aa0cd67184
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 23:01:10 2012 +0200

    Make sure that the hardening compiler/linker flags are handled correctly by qmake-qt4.

commit 8e8e7882c20994ffd3db815bd99e7fb3a4bb9308
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 22:38:13 2012 +0200

    whitespace fix

commit df7281131606a36f6a246d6d9954c1337641cb98
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 22:34:36 2012 +0200

    Enabled dh_lintian.

commit 05a9619983b55147b876e9027b56784fbdf43184
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 22:28:33 2012 +0200

    * Initial release (closes: #673322).
      + W: sankore: new-package-should-close-itp-bug
      + W: sankore-data: new-package-should-close-itp-bug
      + W: sankore-dbg: new-package-should-close-itp-bug

commit 726ef0d03ca182fd4b65c65ec19ee735d12c4f35
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 22:24:58 2012 +0200

    W: sankore: executable-not-elf-or-script usr/bin/Open-Sankore

commit 6ce7c9acbd87f480fcab6ffcbb0a16882758c142
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 22:02:17 2012 +0200

    move code around in /debian/rules due to a not-yet created folder

commit 9e0c2bd9f4a73fbb0fe788f165ee21051ba6d1dd
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 22:00:11 2012 +0200

    Revert "move code around in /debian/rules due to a not-yet created folder"
    
    This reverts commit 7f46a116602ed58a8b1b4c23d1f8112ddabd8d9b.

commit 7f46a116602ed58a8b1b4c23d1f8112ddabd8d9b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 21:57:18 2012 +0200

    move code around in /debian/rules due to a not-yet created folder

commit ddb5d3f9bacf60ed99c82e605367488bdc20762c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 21:35:56 2012 +0200

    hardening the package with dpkg-buildflags

commit 444bb3761daed4692cd023887e66be876f506cb7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 21:31:13 2012 +0200

    /debian/rules: Create Open-Sankore.bin in /usr/lib/open-sankore and only keep its wrapper in /usr/bin -> saves us writing/symlinking a second man page.

commit 97c3ce619386b446f2ae348a10ca456c03afb4be
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 21:28:16 2012 +0200

    Lintian overrides: W: sankore-data: script-not-executable usr/share/open-sankore/linux/run.sh.

commit f5c74cf50a649208f78a2443ce924b3f564c86ec
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 21:21:50 2012 +0200

    E: sankore source: debian-revision-should-not-be-zero 3.1~git20120517-0.

commit c83ebb30f51da57a90feb5d5bd0ce5cbd022fc9c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 21:21:07 2012 +0200

    Lintian issues fixed: W: sankore source: stronger-dependency-implies-weaker sankore-data depends -> suggests ${misc:Depends}.

commit bce60355e7380d660b7ea6aab8b78463b8dad28d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 21:15:32 2012 +0200

    /debian/control: Fix Uploaders:-field (missing commata).

commit 63beabb4e0543064fb025da72b28639bfbc58b56
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 20 15:43:47 2012 +0200

    Maintainer team: Debian Edu Packaging Team.

commit 5628f790d2e9cea1552295881b036397896c3c92
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat May 19 15:52:27 2012 +0200

    package becomes team-maintained: pkg-edu-devel at l.alioth.d.o

commit cb7e3977ddafcf039934ebfb178c84fc5dbf9f66
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat May 19 15:50:04 2012 +0200

    use -0 revision instead of -0miry1

commit 710580031f1b90c48d82b5ae410da2e692f0b1aa
Author: Miriam Ruiz <little_miry at yahoo.es>
Date:   Thu May 10 18:29:03 2012 +0200

    Imported Debian patch 3.1~git20120517-0miry1

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

Summary of changes:
 debian/Open-Sankore.1                         |   55 ++++++
 debian/README.source                          |    1 +
 debian/changelog                              |   72 +++++++
 debian/compat                                 |    1 +
 debian/control                                |   55 ++++++
 debian/copyright                              |   34 ++++
 debian/patches/UBDesktopPropertyPalette.patch |   18 ++
 debian/patches/UBGraphicsAristo.patch         |  260 +++++++++++++++++++++++++
 debian/patches/absolute_dirs.patch            |   31 +++
 debian/patches/build_opts.patch               |   15 ++
 debian/patches/enable_i18n.patch              |   51 +++++
 debian/patches/includes.patch                 |   26 +++
 debian/patches/qt_pre_4.7.patch               |   62 ++++++
 debian/patches/series                         |    7 +
 debian/rules                                  |  202 +++++++++++++++++++
 debian/sankore-data.install                   |    1 +
 debian/sankore-data.lintian-overrides         |    2 +
 debian/sankore.desktop                        |   12 ++
 debian/sankore.install                        |    2 +
 debian/sankore.lintian-overrides              |    4 +
 debian/sankore.manpages                       |    1 +
 debian/sankore.png                            |  Bin 0 -> 12399 bytes
 debian/source/format                          |    1 +
 debian/source/include-binaries                |    1 +
 debian/source/options                         |    5 +
 25 files changed, 919 insertions(+), 0 deletions(-)
 create mode 100644 debian/Open-Sankore.1
 create mode 100644 debian/README.source
 create mode 100644 debian/changelog
 create mode 100644 debian/compat
 create mode 100644 debian/control
 create mode 100644 debian/copyright
 create mode 100644 debian/patches/UBDesktopPropertyPalette.patch
 create mode 100644 debian/patches/UBGraphicsAristo.patch
 create mode 100644 debian/patches/absolute_dirs.patch
 create mode 100644 debian/patches/build_opts.patch
 create mode 100644 debian/patches/enable_i18n.patch
 create mode 100644 debian/patches/includes.patch
 create mode 100644 debian/patches/qt_pre_4.7.patch
 create mode 100644 debian/patches/series
 create mode 100755 debian/rules
 create mode 100644 debian/sankore-data.install
 create mode 100644 debian/sankore-data.lintian-overrides
 create mode 100644 debian/sankore.desktop
 create mode 100644 debian/sankore.install
 create mode 100644 debian/sankore.lintian-overrides
 create mode 100644 debian/sankore.manpages
 create mode 100644 debian/sankore.png
 create mode 100644 debian/source/format
 create mode 100644 debian/source/include-binaries
 create mode 100644 debian/source/options

The diff of changes is:
diff --git a/debian/Open-Sankore.1 b/debian/Open-Sankore.1
new file mode 100644
index 0000000..19d3c4c
--- /dev/null
+++ b/debian/Open-Sankore.1
@@ -0,0 +1,55 @@
+'\" -*- coding: utf-8 -*-
+.if \n(.g .ds T< \\FC
+.if \n(.g .ds T> \\F[\n[.fam]]
+.de URL
+\\$2 \(la\\$1\(ra\\$3
+..
+.if \n(.g .mso www.tmac
+.TH Open-Sankore 1 "Jun 2012" "Version 3.1" "Open-Sankoré"
+.SH NAME
+Open-Sankore \- The Free Interactive Whiteboard Software
+.SH SYNOPSIS
+'nh
+.fi
+.ad l
+\fBOpen-Sankore\fR
+
+.SH DESCRIPTION
+The Open-Sankoré software in 5 points
+.PP
+The Open-Sankoré program is an interactive, free, and Open-Source digital teaching program with high value added.
+.TP
+\*(T<\fB1. An ergonomic program\fR\*(T>
+.PP
+Since its inception, Open-Sankoré was designed for and with users/teachers. Thanks to a team composed of specialists and developers, this application to each on a DIT came into being. With an ergonomic interface, it combines the simplicity of traditional teaching tools with the advantages provided by teaching ICTs. Automatic document backup prevents the loss of data. The subtle integration of external components such as those derived from the web or screen captures prevents having to systematically juggle applications and tiring the audience.
+.TP
+\*(T<\fB2. A universal program\fR\*(T>
+.PP
+The Open-Sankoré program is a multiplatform, open-source program that is compatible with every type of DIT. It is also translated into many languages and remains adapted to all users: from beginners to experts.
+.TP
+\*(T<\fB3. A program dedicated to education\fR\*(T>
+.PP
+In addition to being able to comment, draw, and highlight, the Open-Sankoré program gives you the option of enriching your course content by importing flash animations, images, audio, videos, or by including existing .pdf or .ppt documents.
+You can captivate your audience by embedding dynamic content into your course: apps from widgets, Wikipedia, or Google Maps).
+The Open-Sankoré program also offers tools for the different phases of a lesson: you can display only the essential part, with appropriate tools such as dynamic screen management or infinite zoom, etc.
+Lastly, you can share your resources by publishing them in .PDF document form or as podcasts, or on the web by exporting them to the http://planete.sankore.org portal.
+.TP
+\*(T<\fB4. Much more than just software...\fR\*(T>
+.PP
+The Open-Sankoré is part of a broader ecosystem dedicated to digital teaching. The Sankoré community lets you quickly access content and rich, varied digital teaching resources. Join it by going to the http://planete.sankore.org portal.
+Here you will find full, scalable tutorials that will enable you to quickly learn the Open-Sankoré program and optimize your lessons.
+Development of the SSS program is also in line with an approach of solidarity and education, aimed at reducing the various digital divides.
+.TP
+\*(T<\fB5. A program that is open-source, scalable, and free\fR\*(T>
+.PP
+The Open-Sankoré program is free. It has an open code and file format.
+.PP
+It can continuously be studied, perfected, and adapted to new needs.
+.PP
+The possibility of creating “apps” gives it even more flexibility.
+
+.SH AUTHOR
+This manual has been composed by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the Debian distribution (and may be used by others).
+.PP
+The content of this manual page has been obtained from the Open-Sankoré homepage.
+
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..cf42723
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1 @@
+See /usr/share/doc/quilt/README.source
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..6389d5f
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,72 @@
+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 ]
+  * Initial release (closes: #673322).
+
+  [ Mike Gabriel ]
+  * Maintainer team: Debian Edu Packaging Team.
+  * /debian/control:
+    + Fix Uploaders:-field (missing commata).
+  * Lintian issues fixed:
+    + W: sankore source: stronger-dependency-implies-weaker sankore-data
+      depends -> suggests ${misc:Depends}.
+    + E: sankore source: debian-revision-should-not-be-zero 3.1~git20120517-0.
+    + W: sankore: hardening-no-fortify-functions usr/bin/Open-Sankore.bin
+    + W: sankore: hardening-no-fortify-functions
+      usr/lib/open-sankore/x86_64-linux-gnu/libCFF_Adaptor.so.1
+    + W: sankore: hardening-no-fortify-functions
+      usr/lib/open-sankore/x86_64-linux-gnu/libCFF_Adaptor.so.1.0
+    + W: sankore: hardening-no-fortify-functions
+      usr/lib/open-sankore/x86_64-linux-gnu/libCFF_Adaptor.so.1.0.0
+    + W: sankore: hardening-no-relro usr/lib/open-sankore/Open-Sankore.bin
+    + W: sankore: hardening-no-relro
+      usr/lib/open-sankore/x86_64-linux-gnu/libCFF_Adaptor.so.1
+    + W: sankore: hardening-no-relro
+      usr/lib/open-sankore/x86_64-linux-gnu/libCFF_Adaptor.so.1.0
+    + W: sankore: hardening-no-relro
+      usr/lib/open-sankore/x86_64-linux-gnu/libCFF_Adaptor.so.1.0.0
+    + W: sankore: executable-not-elf-or-script usr/bin/Open-Sankore
+    + W: sankore: new-package-should-close-itp-bug
+    + W: sankore-data: new-package-should-close-itp-bug
+    + W: sankore-dbg: new-package-should-close-itp-bug
+    + W: sankore: binary-without-manpage usr/bin/Open-Sankore
+    + P: sankore: copyright-refers-to-symlink-license
+      usr/share/common-licenses/GPL
+    + P: sankore-data: copyright-refers-to-symlink-license
+      usr/share/common-licenses/GPL
+    + P: sankore-dbg: copyright-refers-to-symlink-license
+      usr/share/common-licenses/GPL
+    + reverted - P: sankore source: unneeded-build-dep-on-quilt
+  * Lintian overrides:
+    + Enable dh_lintian.
+    + W: sankore-data: script-not-executable
+      usr/share/open-sankore/linux/run.sh.
+    + sankore: spelling-error-in-binary usr/lib/open-sankore/Open-Sankore.bin
+  * /debian/rules:
+    + Create Open-Sankore.bin in /usr/lib/open-sankore and only keep its
+      wrapper in /usr/bin -> saves us writing/symlinking a second man page.
+    + Make sure that the hardening compiler/linker flags are handled correctly
+      by qmake-qt4.
+    + Enable parallel (make -j4) build.
+    + Fix build flags.
+  * Patches:
+    + Add patch descriptions and authors.
+    + Add patch: enable_i18n.patch -> build .qm files on the fly during
+      qmake-qt4 run.
+
+ -- Miriam Ruiz <little_miry at yahoo.es>  Thu, 10 May 2012 18:29:03 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..b224474
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,55 @@
+Source: sankore
+Section: education
+Priority: optional
+Maintainer: Debian Edu Packaging Team <debian-edu-pkg-team at lists.alioth.debian.org>
+Uploaders:
+ 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,
+ qt4-qmake, qt4-dev-tools, libqt4-dev, libphonon-dev,
+ libfreetype6-dev, libpaper-dev, libt1-dev, libssl-dev,
+ libqtwebkit-dev | libqt4-dev (<< 4:4.7), quilt
+Standards-Version: 3.9.3
+Homepage: http://open-sankore.org/
+
+Package: sankore
+Architecture: any
+Depends: sankore-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Suggests: sankore-dbg (= ${binary:Version})
+Description: interactive digital whiteboard software for teaching
+ Open-Sankoré is a free and open-source interactive whiteboard (IWB)
+ software compatible with any projector and pointing device. It is
+ based on the Uniboard software originally developed at the University
+ of Lausanne, Switzerland.
+ .
+ It's file format is non binarized and is based on the W3C web standard,
+ therefore making it possible to be displayed in a modern web browser.
+ the software can be extended using Apps which are written using the
+ W3C widget standard.
+ .
+ Open-Sankoré is one of the strategies of the Public Interest Grouping
+ for Digital Education in Africa (GIP ENA) in order to try to achieve
+ the Millennium Development Goals for education in Africa (an initiative
+ of the United Nations).
+
+Package: sankore-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: sankore (= ${binary:Version}), ${misc:Depends}
+Description: interactive digital whiteboard software - debug
+ Open-Sankoré is a free and open-source interactive whiteboard (IWB)
+ software compatible with any projector and pointing device. 
+ .
+ This package contains the debugging symbols.
+
+Package: sankore-data
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: sankore (= ${binary:Version})
+Description: interactive digital whiteboard software - data
+ Open-Sankoré is a free and open-source interactive whiteboard (IWB)
+ software compatible with any projector and pointing device. 
+ .
+ This package contains data files that are needed to run the program..
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..5d26004
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,34 @@
+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 <miriam at debian.org>
+Debianized-Date: Thu, 10 May 2012 18:29:03 +0200
+
+Files: *
+Copyright: Copyright (C) 2010  Open-Sankoré
+License: GPL-3+
+
+Files: debian/*
+Copyright: Copyright (C) 2012, Miriam Ruiz <miriam at debian.org>
+License: GPL-3+
+
+License: GPL-3+
+ 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,
+ 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'.
+ .
+ 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
new file mode 100644
index 0000000..efbb8b3
--- /dev/null
+++ b/debian/patches/absolute_dirs.patch
@@ -0,0 +1,31 @@
+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 @@
+ 
+ QString UBPlatformUtils::applicationResourcesDirectory()
+ {
+-    return QApplication::applicationDirPath();
++    return QString("/usr/share/open-sankore/");
+ }
+ 
+ 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 @@
+ 
+     QString tutorialHtmlIndexFile = 0;
+     QString tutorialPath = "/etc/Tutorial/tutorial" + language + "/index.html";
+-#if defined(Q_WS_MAC)
+-    tutorialHtmlIndexFile = QApplication::applicationDirPath()+ "/../Resources" + tutorialPath;
+-#else
+-    tutorialHtmlIndexFile = QApplication::applicationDirPath() + tutorialPath;
+-#endif
++
++    tutorialHtmlIndexFile = "/usr/share/open-sankore/" + tutorialPath;
+ 
+     QUrl currentUrl = QUrl::fromLocalFile(tutorialHtmlIndexFile);
+ 
diff --git a/debian/patches/build_opts.patch b/debian/patches/build_opts.patch
new file mode 100644
index 0000000..e14833b
--- /dev/null
+++ b/debian/patches/build_opts.patch
@@ -0,0 +1,15 @@
+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 @@
+     CONFIG += link_prl
+     LIBS += -lcrypto
+     LIBS += -lX11
+-    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
diff --git a/debian/patches/enable_i18n.patch b/debian/patches/enable_i18n.patch
new file mode 100644
index 0000000..cbdb29a
--- /dev/null
+++ b/debian/patches/enable_i18n.patch
@@ -0,0 +1,51 @@
+Description: Patch for the .pro file so that .qm files are built on-the-fly.
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+--- a/Sankore-3.1/Sankore_3.1.pro
++++ b/Sankore-3.1/Sankore_3.1.pro
+@@ -110,6 +110,46 @@
+ 
+ LIBS += "-Lplugins/cffadaptor/$$BUILD_DIR/lib" "-lCFF_Adaptor"
+ 
++TRANSLATIONS += resources/i18n/sankore_es.ts \
++                resources/i18n/sankore_ko.ts \
++                resources/i18n/sankore_ro.ts \
++                resources/i18n/sankore_ar.ts \
++                resources/i18n/sankore_fr_CH.ts \
++                resources/i18n/sankore_nb.ts \
++                resources/i18n/sankore_ru.ts \
++                resources/i18n/sankore_da.ts \
++                resources/i18n/sankore_fr.ts \
++                resources/i18n/sankore_nl.ts \
++                resources/i18n/sankore_sk.ts \
++                resources/i18n/sankore_de.ts \
++                resources/i18n/sankore_it.ts \
++                resources/i18n/sankore_pl.ts \
++                resources/i18n/sankore_sv.ts \
++                resources/i18n/sankore_en.ts \
++                resources/i18n/sankore_iw.ts \
++                resources/i18n/sankore_pt.ts \
++                resources/i18n/sankore_zh.ts \
++                resources/i18n/sankore_en_UK.ts \
++                resources/i18n/sankore_ja.ts \
++                resources/i18n/sankore_rm.ts
++
++!isEmpty(TRANSLATIONS) {
++  isEmpty(QMAKE_LRELEASE) {
++    win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
++    else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
++  }
++  isEmpty(TS_DIR):TS_DIR = resources/i18n
++
++  TSQM.name = lrelease ${QMAKE_FILE_IN}
++  TSQM.input = TRANSLATIONS
++  TSQM.output = $$TS_DIR/${QMAKE_FILE_BASE}.qm
++  TSQM.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN}
++  TSQM.CONFIG = no_link
++  QMAKE_EXTRA_COMPILERS += TSQM
++  PRE_TARGETDEPS += compiler_TSQM_make_all
++}
++else:message(No translation files in project)
++
+ win32 {
+    RC_FILE = resources/win/sankore.rc
+    CONFIG += qaxcontainer
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
new file mode 100644
index 0000000..6ea924c
--- /dev/null
+++ b/debian/patches/qt_pre_4.7.patch
@@ -0,0 +1,62 @@
+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 @@
+     xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri, "size", QString("%1x%2").arg(width).arg(height));
+ 
+     // introduced in UB 4.4
+-    xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri, "updated-at", UBStringUtils::toUtcIsoDateTime(QDateTime::currentDateTimeUtc()));
++    xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri, "updated-at", UBStringUtils::toUtcIsoDateTime(QDateTime::currentDateTime().toUTC()));
+     // 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 @@
+ 
+ #include "gui/UBFeaturesWidget.h"
+ 
++#if QT_VERSION < 0x040700
++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 @@
+     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://");
++#endif
+     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
new file mode 100644
index 0000000..9a7bbe5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,7 @@
+build_opts.patch
+absolute_dirs.patch
+qt_pre_4.7.patch
+includes.patch
+enable_i18n.patch
+UBGraphicsAristo.patch
+UBDesktopPropertyPalette.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..f86f743
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,202 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+else
+CROSS= --build $(DEB_BUILD_GNU_TYPE)
+endif
+
+MAIN_VERSION = $(shell dpkg-parsechangelog|sed -n '/^Version/{s/Version: \(.*\)/\1/p}')
+BUILD_VERSION = $(shell echo $(MAIN_VERSION)|sed -n 's/\([0-9.]*\)[-+~].*/\1/p')
+
+# hardening the package with dpkg-buildflags
+export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
+ARCH_ID=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+ifeq ($(strip $(ARCH_ID)),)
+ARCH_DIR=
+else
+ARCH_DIR=$(ARCH_ID)/
+endif
+
+config: config-stamp
+config-stamp: 
+	dh_testdir
+	# 
+	# - Applying patches ------------------------------
+	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
+	# 
+	# - Configuring xpdf ------------------------------
+	chmod +x Sankore-ThirdParty/xpdf/xpdf-3.03/configure
+	cd Sankore-ThirdParty/xpdf/xpdf-3.03 && ./configure $(CROSS) \
+		--prefix=/usr \
+		--datarootdir=\$${prefix}/share \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		CFLAGS="$(CFLAGS)" \
+		LDFLAGS="$(LDFLAGS)" \
+		CXXFLAGS="$(CXXFLAGS)" \
+		CPPFLAGS="$(CPPFLAGS)"
+	cd Sankore-ThirdParty/xpdf/ && qmake-qt4 QMAKE_CFLAGS="$(CPPFLAGS) $(CFLAGS)" QMAKE_LFLAGS="$(LDFLAGS)" QMAKE_CXXFLAGS="$(CPPFLAGS) $(CXXFLAGS)"
+	# 
+	# - Configuring quazip ----------------------------
+	cd Sankore-ThirdParty/quazip/ && qmake-qt4 QMAKE_CFLAGS="$(CPPFLAGS) $(CFLAGS)" QMAKE_LFLAGS="$(LDFLAGS)" QMAKE_CXXFLAGS="$(CPPFLAGS) $(CXXFLAGS)"
+	# 
+	# - Configuring cffadaptor ------------------------
+	cd Sankore-3.1/plugins/cffadaptor/ && qmake-qt4 QMAKE_CFLAGS="$(CPPFLAGS) $(CFLAGS)" QMAKE_LFLAGS="$(LDFLAGS)" QMAKE_CXXFLAGS="$(CPPFLAGS) $(CXXFLAGS)"
+	# 
+	# - Configuring sankore ---------------------------
+	cd Sankore-3.1 && qmake-qt4 QMAKE_CFLAGS="$(CPPFLAGS) $(CFLAGS)" QMAKE_LFLAGS="$(LDFLAGS)" QMAKE_CXXFLAGS="$(CPPFLAGS) $(CXXFLAGS)"
+	# 
+	# - Finished configuring --------------------------
+	touch $@
+
+build-indep:
+
+build-arch: build-stamp
+
+build: build-stamp
+build-stamp: config
+	dh_testdir
+	# 
+	# - Building xpdf ---------------------------------
+	cd Sankore-ThirdParty/xpdf/ && $(MAKE) -j4
+	# 
+	# - Building quazip -------------------------------
+	cd Sankore-ThirdParty/quazip/ && $(MAKE) -j4
+	# 
+	# - Building cffadaptor ---------------------------
+	cd Sankore-3.1/plugins/cffadaptor/ && $(MAKE) -j4
+	# 
+	# - Building sankore ------------------------------
+	cd Sankore-3.1 && $(MAKE) -j4
+	# 
+	# - Finished building -----------------------------
+	touch $@
+
+clean: 
+	dh_testdir
+	dh_testroot
+	rm -fv build-stamp config-stamp
+	[ ! -f Sankore-3.1/Makefile ] || \
+		$(MAKE) -C Sankore-3.1 clean
+	[ ! -f Sankore-3.1/plugins/cffadaptor/Makefile ] || \
+		$(MAKE) -C Sankore-3.1/plugins/cffadaptor clean
+	[ ! -f Sankore-ThirdParty/quazip/Makefile ] || \
+		$(MAKE) -C Sankore-ThirdParty/quazip clean
+	[ ! -f Sankore-ThirdParty/xpdf/Makefile ] || \
+		$(MAKE) -C Sankore-ThirdParty/xpdf clean
+	[ ! -f Sankore-ThirdParty/xpdf/xpdf-3.03/Makefile ] || \
+		$(MAKE) -C Sankore-ThirdParty/xpdf/xpdf-3.03 distclean
+	rm -rfv \
+		Sankore-3.1/Makefile* \
+		Sankore-3.1/build/linux/debug/* \
+		Sankore-3.1/build/linux/release/* \
+		Sankore-3.1/plugins/cffadaptor/build/linux/release/* \
+		Sankore-3.1/plugins/cffadaptor/build/linux/debug/* \
+		Sankore-ThirdParty/xpdf/Makefile \
+		Sankore-ThirdParty/xpdf/lib/linux/libxpdf.prl \
+		Sankore-ThirdParty/xpdf/xpdf-3.03/fofi/Makefile \
+		Sankore-ThirdParty/xpdf/xpdf-3.03/splash/Makefile \
+		Sankore-3.1/plugins/cffadaptor/Makefile \
+		Sankore-ThirdParty/quazip/Makefile \
+		Sankore-ThirdParty/quazip/lib/linux/libquazip.prl \
+		Sankore-ThirdParty/quazip/lib/linux/libquazip.a \
+		Sankore-ThirdParty/xpdf/lib/linux/libxpdf.a
+	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+
+# Build architecture-independent files here.
+binary-indep: install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -i
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_install -i
+	dh_installman -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	[ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: install
+	dh_testdir
+	dh_testroot
+
+	mkdir -p "$(CURDIR)/debian/sankore/usr/lib/open-sankore/$(ARCH_DIR)"
+	cp Sankore-3.1/plugins/cffadaptor/build/linux/*/lib/libCFF_Adaptor.so.* \
+		"$(CURDIR)/debian/sankore/usr/lib/open-sankore/$(ARCH_DIR)"
+	cp Sankore-3.1/build/linux/*/product/Open-Sankore \
+		"$(CURDIR)/debian/sankore/usr/lib/open-sankore/Open-Sankore.bin"
+
+	mkdir -p "$(CURDIR)/debian/sankore/usr/bin/"
+	printf '#!/bin/sh\n\nLD_LIBRARY_PATH="%s" %s\n'  \
+		"/usr/lib/open-sankore/$(ARCH_DIR):$$LD_LIBRARY_PATH" \
+		"/usr/lib/open-sankore/Open-Sankore.bin" \
+		> "$(CURDIR)/debian/sankore/usr/bin/Open-Sankore"
+	chmod 755 "$(CURDIR)/debian/sankore/usr/bin/Open-Sankore"
+
+	dh_installchangelogs -a
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_install -a
+#	dh_installmenu -a
+	dh_installman -a
+	dh_lintian -a
+	dh_link -a
+	dh_strip -a --dbg-package=sankore-dbg
+	dh_compress -a
+	dh_fixperms -a
+#	dh_makeshlibs -a
+	[ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo -a
+	dh_installdeb -a
+	LD_LIBRARY_PATH="$(CURDIR)/debian/sankore/usr/lib/open-sankore/$(ARCH_DIR):$$LD_LIBRARY_PATH" \
+		dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+VER = $(BUILD_VERSION)~git$(shell date -u '+%Y%m%d')
+
+get-git-source:
+	dh_testdir
+	rm -rfv sankore ../sankore_$(VER).orig.tar.bz2
+	mkdir sankore
+	cd sankore && git clone git://github.com/Sankore/Sankore-3.1.git --depth 1
+	cd sankore && git clone git://github.com/Sankore/Sankore-ThirdParty.git --depth 1
+	cd sankore/Sankore-ThirdParty && \
+		rm -rfv freetype microsoft openssl refnum unsanity zlib README.txt
+	find sankore -type f | while read F; do chmod -x "$$F"; done
+	find . -type f -name configure | while read F; do chmod +x "$$F"; done
+	chmod +x sankore/Sankore-ThirdParty/xpdf/xpdf-3.03/configure
+	rm -rfv "`find sankore -name \"__MACOSX\"`"
+	rm -rfv `find sankore -name "._*"`
+	tar --exclude .git -jvcf ../sankore_$(VER).orig.tar.bz2 sankore
+	rm -rfv sankore
+	
+binary: binary-indep binary-arch
+
+.PHONY: config build-indep build-arch build clean binary-indep binary-arch binary install 
diff --git a/debian/sankore-data.install b/debian/sankore-data.install
new file mode 100644
index 0000000..fabce2d
--- /dev/null
+++ b/debian/sankore-data.install
@@ -0,0 +1 @@
+Sankore-3.1/resources/* /usr/share/open-sankore/
diff --git a/debian/sankore-data.lintian-overrides b/debian/sankore-data.lintian-overrides
new file mode 100644
index 0000000..a84fb7d
--- /dev/null
+++ b/debian/sankore-data.lintian-overrides
@@ -0,0 +1,2 @@
+# this script is shipped into the package via the upstream installation process and not used on a Debian system
+sankore-data: script-not-executable usr/share/open-sankore/linux/run.sh
\ No newline at end of file
diff --git a/debian/sankore.desktop b/debian/sankore.desktop
new file mode 100644
index 0000000..8f05a87
--- /dev/null
+++ b/debian/sankore.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Open Sankoré 
+GenericName=Desktop sketchpad
+Comment=Interactive Digital Whiteboard software for teaching
+Comment[es]=software educativo para pizarras digitales
+Exec=Open-Sankore
+Icon=sankore
+Terminal=false
+Categories=Qt;Utility;
+StartupNotify=true
diff --git a/debian/sankore.install b/debian/sankore.install
new file mode 100644
index 0000000..f83cb55
--- /dev/null
+++ b/debian/sankore.install
@@ -0,0 +1,2 @@
+debian/*.desktop usr/share/applications/
+debian/*.png usr/share/pixmaps/
diff --git a/debian/sankore.lintian-overrides b/debian/sankore.lintian-overrides
new file mode 100644
index 0000000..8d617a0
--- /dev/null
+++ b/debian/sankore.lintian-overrides
@@ -0,0 +1,4 @@
+# the native language of the application is French, not English
+sankore: spelling-error-in-binary usr/lib/open-sankore/Open-Sankore.bin informations information
+# resSource is a Javascript variable, not a string that can have spelling errors
+sankore: spelling-error-in-binary usr/lib/open-sankore/Open-Sankore.bin resSource resource
diff --git a/debian/sankore.manpages b/debian/sankore.manpages
new file mode 100644
index 0000000..5ee76ab
--- /dev/null
+++ b/debian/sankore.manpages
@@ -0,0 +1 @@
+debian/Open-Sankore.1
diff --git a/debian/sankore.png b/debian/sankore.png
new file mode 100644
index 0000000..271d07d
Binary files /dev/null and b/debian/sankore.png differ
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..67f7337
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1 @@
+debian/sankore.png
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..e6227d6
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,5 @@
+# Bzip2 compression for debian.tar
+compression = "bzip2"
+compression-level = 7
+# Do not generate diff for changes in config.(sub|guess)
+extend-diff-ignore = "(^|/)config.(sub|guess)$"


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