[debian-edu-commits] debian-edu/sankore.git (#63) - master (branch) updated: upstream/2.00_git20130309-61-g117c939

Mike Gabriel sunweaver at alioth.debian.org
Sun May 5 11:29:36 UTC 2013


The branch, master has been updated
       via  117c939e26508a5ec5e397d234e8ab7d85e31505 (commit)
       via  d5c85053a4997d3f1793000bda1bbeb975b6e50f (commit)
       via  c2abff717dd66b9f63938f21bfc00b5035abe80d (commit)
       via  fb6c00fa77537485f224481220f9d90219fe35b2 (commit)
       via  ab4ddb3d15958a86d3812bc38402f9fd3ece321c (commit)
       via  338d75a37c315f6b434755a53aeb09c6b7838d85 (commit)
       via  cf364184ed0fbf05b730e9cc492849a914584132 (commit)
       via  4c46da7eabdb18772a9dedecf7505c0f92ab31db (commit)
       via  f4d93ae2a1a99371e51ccd8c7403b5b99993b41c (commit)
       via  3ef07d6ebf10cb8067832c1623cb2f7231d90944 (commit)
       via  c92837cc84c84e78297646560e79a4115fa56c74 (commit)
       via  aca24f493b71ab88e2f9439592dcc3ed38133418 (commit)
       via  6909cbaf0b32c134e79170a59b1cda3fd0ae2335 (commit)
       via  34a244ff391599ad46320d6d630eb140b676af0f (commit)
       via  f626730289bd50fae5fa7742445341b5904eb9bd (commit)
       via  b6d6c3e4267a3161e30330440f47ad1d994d68a5 (commit)
       via  d9ee639a0670f7e3189fbee9e7584bcc8b15a70e (commit)
       via  e7821693a68872b794508d21df7ba3949ecb4a3b (commit)
       via  a75f1b8c0f521ef488d56ce85fe8961d914d7e71 (commit)
       via  2888939b1180756b56d8fc95e9622cb84c1cde43 (commit)
       via  24593af6b300e60bda7d429e8d46b6c1d3136ecd (commit)
       via  af9fb860af6846e5300fbd8d31a1c55277bd7f7b (commit)
       via  96f56bc9a52656b1d8b9a0a666722a3a46c2a9c4 (commit)
       via  bbc64b8438a4f8b99de4999b7fccb8c4ba82e44d (commit)
       via  c030d3db983e92f56f23a14b129c06485fa6df79 (commit)
       via  22373bdc6fe29c8b4995cafe95b2bc1d60f8cf41 (commit)
       via  a06d6e54f2e0a14b7f39edf7bf782191e5b8c330 (commit)
       via  120d57235081bf83fcbf7c552af93b5e5e47c574 (commit)
       via  978b62063533c3d5e13c937580dfccad8a0ca26f (commit)
       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  67e49c34fa999f794cea28c198c7b6c149f4391e (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 117c939e26508a5ec5e397d234e8ab7d85e31505
Merge: d5c8505 67e49c3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 5 13:23:19 2013 +0200

    Merge tag 'upstream/2.1.0+git20130505'
    
    Upstream version 2.1.0+git20130505
    
    # gpg: Unterschrift vom So 05 Mai 2013 13:23:14 CEST 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:                     alias "Mike Gabriel <sunweaver at debian.org>"

commit d5c85053a4997d3f1793000bda1bbeb975b6e50f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 5 13:21:36 2013 +0200

    prepare import for new upstream version

commit c2abff717dd66b9f63938f21bfc00b5035abe80d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 5 12:03:28 2013 +0200

    fix sankore-dbg.links

commit fb6c00fa77537485f224481220f9d90219fe35b2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 5 12:02:49 2013 +0200

    binary-arch: run dh_strip before dh_link

commit ab4ddb3d15958a86d3812bc38402f9fd3ece321c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 5 12:02:11 2013 +0200

    fix missing underscore in sankore-data.links

commit 338d75a37c315f6b434755a53aeb09c6b7838d85
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 5 11:40:33 2013 +0200

    do not use unsafe dirnames

commit cf364184ed0fbf05b730e9cc492849a914584132
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 5 10:56:27 2013 +0200

    use dh_links for symlinking javascript libraries

commit 4c46da7eabdb18772a9dedecf7505c0f92ab31db
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 5 10:23:28 2013 +0200

    run dh_install* first, then manipulate files from libjs-*

commit f4d93ae2a1a99371e51ccd8c7403b5b99993b41c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 5 10:06:18 2013 +0200

    typo fix

commit 3ef07d6ebf10cb8067832c1623cb2f7231d90944
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 5 09:56:18 2013 +0200

    escape quotes

commit c92837cc84c84e78297646560e79a4115fa56c74
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat May 4 14:51:20 2013 +0200

    move js file replacements to binary-indep

commit aca24f493b71ab88e2f9439592dcc3ed38133418
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat May 4 14:10:15 2013 +0200

    move pdf2txt for upstream changelog to install stanza

commit 6909cbaf0b32c134e79170a59b1cda3fd0ae2335
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat May 4 13:56:55 2013 +0200

    Use bin:package libjs-openlayers as OpenLayers.js library provider. Replace more libjs-query library files by symlinks.

commit 34a244ff391599ad46320d6d630eb140b676af0f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat May 4 13:35:36 2013 +0200

    more work on the copyright file

commit f626730289bd50fae5fa7742445341b5904eb9bd
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat May 4 12:42:54 2013 +0200

    also add upstream changelog to bin:packages sankore-dbg, sankore-data

commit b6d6c3e4267a3161e30330440f47ad1d994d68a5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat May 4 12:41:48 2013 +0200

    /debian/copyright: remove hint to symlink /usr/share/common-licenses/GPL

commit d9ee639a0670f7e3189fbee9e7584bcc8b15a70e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat May 4 12:38:00 2013 +0200

    remove unneeded build-dep on quilt

commit e7821693a68872b794508d21df7ba3949ecb4a3b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat May 4 12:35:49 2013 +0200

    clean up our generated upstream changelog file

commit a75f1b8c0f521ef488d56ce85fe8961d914d7e71
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat May 4 12:34:27 2013 +0200

    Use bin:package libjs-query as jquery.js/jquery.min.js provider.

commit 2888939b1180756b56d8fc95e9622cb84c1cde43
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat May 4 12:21:04 2013 +0200

    exclude mac, linux, win, windows folders in bin:package sankore-data

commit 24593af6b300e60bda7d429e8d46b6c1d3136ecd
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat May 4 10:50:14 2013 +0200

    Include upstream changelog (release notes) into package.

commit af9fb860af6846e5300fbd8d31a1c55277bd7f7b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat May 4 10:32:37 2013 +0200

    convert to multi-line fields, use my DD address in Uploaders: field

commit 96f56bc9a52656b1d8b9a0a666722a3a46c2a9c4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri May 3 16:29:48 2013 +0200

    make package Standards: 3.9.4 compliant

commit bbc64b8438a4f8b99de4999b7fccb8c4ba82e44d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri May 3 16:29:17 2013 +0200

    condense changelog to one (initial) entry

commit c030d3db983e92f56f23a14b129c06485fa6df79
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri May 3 16:28:43 2013 +0200

    add Description: and Author: fields (patch headers)

commit 22373bdc6fe29c8b4995cafe95b2bc1d60f8cf41
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri May 3 16:28:20 2013 +0200

    update copyright file for Sankore-3.1 subfolder

commit a06d6e54f2e0a14b7f39edf7bf782191e5b8c330
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri May 3 15:31:37 2013 +0200

    rename patches: use preseeding digits that hint to the order of patch application

commit 120d57235081bf83fcbf7c552af93b5e5e47c574
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri May 3 15:29:27 2013 +0200

    update patch: enable_i18n.patch

commit 978b62063533c3d5e13c937580dfccad8a0ca26f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Apr 5 21:31:04 2013 +0200

    increment upstream version (new date for Git pull)

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                                  |   23 ++
 debian/compat                                     |    1 +
 debian/control                                    |   73 ++++++
 debian/copyright                                  |  212 +++++++++++++++++
 debian/patches/001_build_opts.patch               |   17 ++
 debian/patches/002_absolute_dirs.patch            |   33 +++
 debian/patches/003_qt_pre_4.7.patch               |   64 +++++
 debian/patches/004_includes.patch                 |   28 +++
 debian/patches/005_enable_i18n.patch              |   51 ++++
 debian/patches/011_UBGraphicsAristo.patch         |  260 +++++++++++++++++++++
 debian/patches/012_UBDesktopPropertyPalette.patch |   18 ++
 debian/patches/series                             |    7 +
 debian/rules                                      |  229 ++++++++++++++++++
 debian/sankore-data.docs                          |    3 +
 debian/sankore-data.install                       |   14 ++
 debian/sankore-data.links                         |   37 +++
 debian/sankore-data.lintian-overrides             |    2 +
 debian/sankore-dbg.links                          |    1 +
 debian/sankore.desktop                            |   12 +
 debian/sankore.docs                               |    3 +
 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 +
 29 files changed, 1158 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/001_build_opts.patch
 create mode 100644 debian/patches/002_absolute_dirs.patch
 create mode 100644 debian/patches/003_qt_pre_4.7.patch
 create mode 100644 debian/patches/004_includes.patch
 create mode 100644 debian/patches/005_enable_i18n.patch
 create mode 100644 debian/patches/011_UBGraphicsAristo.patch
 create mode 100644 debian/patches/012_UBDesktopPropertyPalette.patch
 create mode 100644 debian/patches/series
 create mode 100755 debian/rules
 create mode 100644 debian/sankore-data.docs
 create mode 100644 debian/sankore-data.install
 create mode 100644 debian/sankore-data.links
 create mode 100644 debian/sankore-data.lintian-overrides
 create mode 100644 debian/sankore-dbg.links
 create mode 100644 debian/sankore.desktop
 create mode 100644 debian/sankore.docs
 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..af1596f
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,23 @@
+sankore (2.1.0+git20130505-1) UNRELEASED; urgency=low
+
+  [ Miriam Ruiz ]
+  * New upstream release, obtained from git, corresponding to commits:
+  * Initial release (closes: #673322), obtained from git,
+    corresponding to commits:
+    + Sankore-3.1:        a114c931415d8ae84d3948130d8b358a753cd1f2 
+    + Sankore-ThirdParty: 735e68f1b75c5ece90f5c1d50798e1d07eca51a9
+  * Add patches:
+    + 001_build_opts.patch
+    + 002_absolute_dirs.patch
+    + 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.
+  * Use bin:package libjs-query as jquery.js/jquery.min.js library provider.
+  * Use bin:package libjs-openlayers as OpenLayers.js library provider.
+
+ -- Miriam Ruiz <miriam at debian.org>  Wed, 06 Mar 2013 13:05:21 +0100
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..29b7f69
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,73 @@
+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 <sunweaver at debian.org>,
+ 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),
+ python-pdfminer,
+Standards-Version: 3.9.4
+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},
+ libjs-jquery,
+ libjs-openlayers,
+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..18aecce
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,212 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Sankore-3.1
+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:
+ Sankore-3.1/plugins/*
+ Sankore-3.1/src/*
+ Sankore-3.1/tools/*
+Copyright:
+ 2012,  Webdoc SA
+License: GPL-3+ with OpenSSL exception
+
+Files:
+ Sankore-3.1/resources/*
+Copyright:
+ TODO
+License: TODO
+
+Files:
+ Sankore-ThirdParty/quazip/quazip.cpp
+Copyright:
+ 1998-2005, Gilles Vollant
+License: GPL-2+
+
+Files:
+ Sankore-ThirdParty/quazip/quazip.cpp
+ Sankore-ThirdParty/quazip/quazipfile.cpp
+ Sankore-ThirdParty/quazip/quazipfile.h
+ Sankore-ThirdParty/quazip/quazipfileinfo.h
+ Sankore-ThirdParty/quazip/quazip.h
+ Sankore-ThirdParty/quazip/quazipnewinfo.cpp
+ Sankore-ThirdParty/quazip/quazipnewinfo.h
+Copyright:
+ 2005-2008, Sergey A. Tachenov
+License: GPL-2+
+
+Files:
+ Sankore-ThirdParty/quazip/zip.c
+ Sankore-ThirdParty/quazip/zip.h
+ Sankore-ThirdParty/quazip/unzip.h
+ Sankore-ThirdParty/quazip/unzip.c
+Copyright:
+ 1998-2005, Gilles Vollant
+ 1990-2000, Info-ZIP
+License: Zlib
+
+Files:
+ Sankore-ThirdParty/trolltech/*
+Copyright:
+ 2010, Nokia Cooperation <qt-info at nokia.com>
+License: BSD-3-clause
+
+Files:
+ Sankore-ThirdParty/xpdf/*
+Copyright:
+ 1996-2011, Glyph & Cog, LLC
+License: GPL-2 or GPL-3
+
+Files: debian/*
+Copyright:
+ 2012-2013, Miriam Ruiz <miriam at debian.org>
+ 2012-2013, Mike Gabriel <sunweaver at debian.org>
+License: GPL-2+ or Zlib
+
+License: GPL-2
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License version 2 as published by the Free Software Foundation.
+ .
+ This program 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.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+License: GPL-2+
+ This program 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 2 of the License, or (at your option) any later
+ version.
+ .
+ This program 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.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+License: GPL-3
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License version 3 as published by the Free Software Foundation.
+ .
+ This program 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.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+
+License: GPL-3+
+ This program 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.
+ .
+ This program 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.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+
+License: GPL-3+ with OpenSSL exception
+ This program 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 2 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).
+ .
+ This program 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 full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+     1.Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+     2.Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in
+       the documentation and/or other materials provided with the
+       distribution.
+     3.Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+       the names of its contributors may be used to endorse or promote
+       products derived from this software without specific prior written
+       permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+
+License: Zlib
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
diff --git a/debian/patches/001_build_opts.patch b/debian/patches/001_build_opts.patch
new file mode 100644
index 0000000..6b39cdf
--- /dev/null
+++ b/debian/patches/001_build_opts.patch
@@ -0,0 +1,17 @@
+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 @@
+     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/002_absolute_dirs.patch b/debian/patches/002_absolute_dirs.patch
new file mode 100644
index 0000000..42d8dfc
--- /dev/null
+++ b/debian/patches/002_absolute_dirs.patch
@@ -0,0 +1,33 @@
+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 @@
+ 
+ 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/003_qt_pre_4.7.patch b/debian/patches/003_qt_pre_4.7.patch
new file mode 100644
index 0000000..dea2360
--- /dev/null
+++ b/debian/patches/003_qt_pre_4.7.patch
@@ -0,0 +1,64 @@
+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 @@
+     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/004_includes.patch b/debian/patches/004_includes.patch
new file mode 100644
index 0000000..d0d0673
--- /dev/null
+++ b/debian/patches/004_includes.patch
@@ -0,0 +1,28 @@
+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 @@
+ #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/005_enable_i18n.patch b/debian/patches/005_enable_i18n.patch
new file mode 100644
index 0000000..8b3cf57
--- /dev/null
+++ b/debian/patches/005_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 @@
+ RCC_DIR = $$BUILD_DIR/rcc
+ UI_DIR = $$BUILD_DIR/ui
+ 
++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/011_UBGraphicsAristo.patch b/debian/patches/011_UBGraphicsAristo.patch
new file mode 100644
index 0000000..a3d8565
--- /dev/null
+++ b/debian/patches/011_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/012_UBDesktopPropertyPalette.patch b/debian/patches/012_UBDesktopPropertyPalette.patch
new file mode 100644
index 0000000..c13a429
--- /dev/null
+++ b/debian/patches/012_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/series b/debian/patches/series
new file mode 100644
index 0000000..1fce3d0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,7 @@
+001_build_opts.patch
+002_absolute_dirs.patch
+003_qt_pre_4.7.patch
+004_includes.patch
+005_enable_i18n.patch
+011_UBGraphicsAristo.patch
+012_UBDesktopPropertyPalette.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..664c225
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,229 @@
+#!/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-arch build-indep
+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
+	rm -fv Sankore-3.1/changelog
+	[ ! -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
+
+	# convert ReleaseNotes.pdf into a Changelog plain text file
+	pdf2txt Sankore-3.1/ReleaseNotes.pdf > Sankore-3.1/changelog
+
+
+# Build architecture-independent files here.
+binary-indep: install
+	dh_testdir
+	dh_testroot
+
+	dh_installchangelogs -i
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_install -i
+
+	cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && mv "library/applications/Sel video.wgt" library/applications/Sel_video.wgt
+	cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && mv "library/applications/Editeur HTML.wgt" library/applications/Editeur_HTML.wgt
+	cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && mv "library/applications/Navigateur Web.wgt" library/applications/Navigateur_Web.wgt
+	cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && mv "library/applications/Composant Web.wgt" library/applications/Composant_Web.wgt
+	cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && mv "library/interactivities/Ass images.wgt" library/interactivities/Ass_images.wgt
+	cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && mv "library/interactivities/Separe phrase.wgt" library/interactivities/Separe_phrase.wgt
+	cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && mv "library/interactivities/Ordre lettres.wgt" library/interactivities/Ordre_lettres.wgt
+	cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && mv "library/interactivities/Ordre images.wgt" library/interactivities/Ordre_images.wgt
+	cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && mv "library/interactivities/Cat text.wgt" library/interactivities/Cat_text.wgt
+	cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && mv "library/interactivities/Separe texte.wgt" library/interactivities/Separe_texte.wgt
+	cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && mv "library/interactivities/Ass sons.wgt" library/interactivities/Ass_sons.wgt
+	cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && mv "library/interactivities/Cat images.wgt" library/interactivities/Cat_images.wgt
+	cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && mv "library/interactivities/Ordre mots.wgt" library/interactivities/Ordre_mots.wgt
+	cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && mv "library/interactivities/Ordre phrase.wgt" library/interactivities/Ordre_phrase.wgt
+	cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && mv "library/search/Google images.wgs" library/search/Google_images.wgs
+	cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && mv "library/search/Image Planete.wgs" library/search/Image_Planete.wgs
+	cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && mv "library/search/Audio Planete.wgs" library/search/Audio_Planete.wgs
+	cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && mv "library/search/Video Planete.wgs" library/search/Video_Planete.wgs
+	cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && mv "library/search/Flash Planete.wgs" library/search/Flash_Planete.wgs
+
+	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_strip -a --dbg-package=sankore-dbg
+	dh_link -a
+	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.docs b/debian/sankore-data.docs
new file mode 100644
index 0000000..f2ec647
--- /dev/null
+++ b/debian/sankore-data.docs
@@ -0,0 +1,3 @@
+Sankore-3.1/changelog
+Sankore-3.1/ReleaseNotes.pdf
+Sankore-3.1/JournalDesModifications.pdf
diff --git a/debian/sankore-data.install b/debian/sankore-data.install
new file mode 100644
index 0000000..fb40a9d
--- /dev/null
+++ b/debian/sankore-data.install
@@ -0,0 +1,14 @@
+Sankore-3.1/resources/customizations /usr/share/open-sankore/
+Sankore-3.1/resources/etc /usr/share/open-sankore/
+Sankore-3.1/resources/fonts /usr/share/open-sankore/
+Sankore-3.1/resources/forms /usr/share/open-sankore/
+Sankore-3.1/resources/i18n /usr/share/open-sankore/
+Sankore-3.1/resources/images /usr/share/open-sankore/
+Sankore-3.1/resources/library /usr/share/open-sankore/
+Sankore-3.1/resources/podcast /usr/share/open-sankore/
+Sankore-3.1/resources/style /usr/share/open-sankore/
+Sankore-3.1/resources/webbrowser /usr/share/open-sankore/
+Sankore-3.1/resources/www /usr/share/open-sankore/
+Sankore-3.1/resources/sankore.qrc /usr/share/open-sankore/
+Sankore-3.1/resources/style.qss /usr/share/open-sankore/
+
diff --git a/debian/sankore-data.links b/debian/sankore-data.links
new file mode 100644
index 0000000..0580c03
--- /dev/null
+++ b/debian/sankore-data.links
@@ -0,0 +1,37 @@
+# link to /usr/share/javascript/jquery/jquery.js
+usr/share/javascript/jquery/jquery.js usr/share/open-sankore/library/applications/Editeur_HTML.wgt/jquery.pack.js
+usr/share/javascript/jquery/jquery.js usr/share/open-sankore/library/applications/Nuancier.wgt/js/jquery.js
+
+# link to /usr/share/javascript/jquery/jquery.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/applications/Wikipedia.wgt/script/jquery.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/applications/Wiktionnaire.wgt/script/jquery.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/applications/Calculatrice.wgt/js/jquery-1.3.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/applications/GeoInfo.wgt/js/jquery-1.6.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/applications/Grapheur.wgt/JavaScript/jquery-1.3.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/applications/Minuteur.wgt/js/jquery-1.3.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/applications/Navigateur_Web.wgt/scripts/jquery-1.3.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/applications/Notes.wgt/js/jquery-1.3.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/applications/Sel_video.wgt/scripts/jquery-1.3.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/applications/Wikipedia.wgt/script/jquery.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/applications/Wiktionnaire.wgt/script/jquery.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/interactivities/Ass_images.wgt/js/jquery-1.6.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/interactivities/Ass_sons.wgt/js/jquery-1.6.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/interactivities/Cat_images.wgt/js/jquery-1.6.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/interactivities/Cat_text.wgt/js/jquery-1.6.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/interactivities/Choisir.wgt/scripts/jquery-1.6.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/interactivities/Contraste.wgt/scripts/jquery-1.6.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/interactivities/Etudier.wgt/js/jquery-1.6.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/interactivities/Ordre_images.wgt/js/jquery-1.6.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/interactivities/Ordre_mots.wgt/scripts/jquery-1.6.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/interactivities/Ordre_phrase.wgt/scripts/jquery-1.6.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/interactivities/Selectionner.wgt/js/jquery-1.6.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/interactivities/Separe_phrase.wgt/scripts/jquery-1.6.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/interactivities/Separe_texte.wgt/scripts/jquery-1.6.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/interactivities/Syllabes.wgt/scripts/jquery-1.6.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/search/Audio_Planete.wgs/scripts/jquery-1.6.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/search/Flash_Planete.wgs/scripts/jquery-1.6.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/search/Google_images.wgs/scripts/jquery-1.6.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/search/Image_Planete.wgs/scripts/jquery-1.6.2.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/open-sankore/library/search/Video_Planete.wgs/scripts/jquery-1.6.2.min.js
+
+usr/share/javascript/openlayers/OpenLayers.js usr/share/open-sankore/library/applications/OpenStreetMap.wgt/api/OpenLayers.js
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-dbg.links b/debian/sankore-dbg.links
new file mode 100644
index 0000000..a76d3b8
--- /dev/null
+++ b/debian/sankore-dbg.links
@@ -0,0 +1 @@
+usr/share/doc/sankore/changelog.gz usr/share/doc/sankore-dbg/changelog.gz
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.docs b/debian/sankore.docs
new file mode 100644
index 0000000..ed81ea7
--- /dev/null
+++ b/debian/sankore.docs
@@ -0,0 +1,3 @@
+Sankore-3.1/changelog
+Sankore-3.1/ReleaseNotes.pdf
+Sankore-3.1/JournalDesModifications.pdf
\ No newline at end of file
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