[SCM] advene/master: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/advene

[oaubert-guest at users.alioth.debian.org]

Remove myself from the Uploaders field
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5b87a654cc4af3faed955fbdcc514224393bb7b1
X-Git-Newrev: 8bb4845f9436522d99643563d7aace295479d19e

The following commit has been merged in the master branch:
commit a6e458f78eb2189afb008ca6bd5c647ec3d8ef68
Merge: bc628c86503911c6a0180527899e1ccafcb50a87 5b87a654cc4af3faed955fbdcc514224393bb7b1
Author: Olivier Aubert <contact at olivieraubert.net>
Date:   Thu Oct 12 17:10:56 2017 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/advene

diff --combined debian/control
index c0a0560,1688de5..b5f6d98
--- a/debian/control
+++ b/debian/control
@@@ -3,15 -3,12 +3,14 @@@ Section: vide
  Priority: optional
  Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
  Uploaders:
-  Alessio Treglia <alessio at debian.org>,
   Olivier Aubert <contact at olivieraubert.net>
  Build-Depends:
   cdbs (>= 0.4.49),
 - debhelper (>= 8.0.0),
 - python-all (>= 2.6.6)
 -X-Python-Version: >= 2.6
 + debhelper (>= 9),
 + dh-python,
 + python3-all (>= 3.4.0),
 + python3-setuptools
 +X-Python3-Version: >= 3.4
  Standards-Version: 3.9.5
  Vcs-Git: git://anonscm.debian.org/pkg-multimedia/advene.git
  Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/advene.git
@@@ -20,29 -17,35 +19,29 @@@ Homepage: http://www.advene.org
  Package: advene
  Architecture: all
  Depends:
 - gstreamer0.10-x,
 - python-cairo,
 - python-cherrypy3 (>=3.0.0),
 - python-gobject,
 - python-gst0.10,
 - python-gtk2 (>=2.12),
 - python-pygoocanvas,
 - python-rsvg,
 - python-simpletal (>=3.0),
 + python3-gi,
 + gir1.2-gstreamer-1.0,
 + python3-gi-cairo,
 + python3-pil,
 + python3-requests,
 + python3-cherrypy3 (>=3.0.0),
 + gir1.2-gtk-3.0 (>=3.4),
 + gir1.2-webkit-3.0,
 + gir1.2-goocanvas-2.0,
 + gir1.2-gtksource-3.0,
 + gir1.2-rsvg-2.0,
   ${misc:Depends},
 - ${python:Depends}
 + ${python3:Depends}
  Recommends:
 - iceweasel | firefox | www-browser,
 + firefox | chromium | www-browser,
 + gstreamer1.0-plugins-bad,
 + gstreamer1.0-plugins-ugly,
 + gstreamer1.0-libav,
   libjs-jquery (>= 1.4.2),
   libjs-jquery-ui (>= 1.8),
 - python-imaging,
 - python-simplejson,
 - python-vlc,
 - python-webkit,
 - shotdetect,
 - vlc-plugin-svg
 -Description: Annotate DVDs, Exchange on the Net
 - The Advene (Annotate DVd, Exchange on the NEt) project is aimed
 - towards communities exchanging discourses (analysis, studies) about
 - audiovisual documents (e.g. movies) in DVD format. This requires that
 - audiovisual content and hypertext facilities be integrated, thanks to
 - annotations providing explicit structures on  audiovisual streams, upon
 - which hypervideo documents can be engineered.
 - .
 + python3-simplejson,
 + shotdetect
 +Description: Annotate Digital Videos, Exchange on the NEt
   The cross-platform Advene application allows users to easily
   create comments and analyses of video documents, through the
   definition of time-aligned annotations and their mobilisation
@@@ -53,10 -56,11 +52,10 @@@
   comments/analyses in the form of Advene packages, independently from
   the video itself.
   .
 - The Advene framework provides models and tools allowing to design and reuse
 - annotations schemas; annotate video streams according to these schemas;
 - generate and create Stream-Time Based (mainly video-centred) or User-Time
 - Based (mainly text-centred) visualisations of the annotations. Schemas
 - (annotation- and relation-types), annotations and relations, queries and
 - views can be clustered and shared in units called packages. Hypervideo
 - documents are generated when needed, both from packages (for annotation and
 - view description) and DVDs (audiovisual streams).
 + The Advene (Annotate Digital Videos, Exchange on the NEt) project is aimed
 + towards communities exchanging discourses (analysis, studies) about
 + audiovisual documents (e.g. movies) in DVD format. This requires that
 + audiovisual content and hypertext facilities be integrated, thanks to
 + annotations providing explicit structures on  audiovisual streams, upon
 + which hypervideo documents can be engineered.
 + .

-- 
advene packaging