[SCM] VLC media player packaging branch, experimental, updated. debian/1.0.6-1-32-gae1a772

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

The following commit has been merged in the experimental branch:
commit 18b048f853e63fef7cd66fe08b87cd8dd81db786
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Fri Jun 11 20:34:33 2010 +0200

    Revert "Remove vlc-plugin-ggi as the module has been removed upstream"
    
    This reverts commit f33c83b9835fe526f5bbab983a5df639460d50ea.

diff --git a/debian/control b/debian/control
index 8eb9b85..8df955e 100644
--- a/debian/control
+++ b/debian/control
@@ -32,6 +32,7 @@ Build-Depends: debhelper (>= 7),
                libflac-dev (>= 1.1.2-3),
                libfreetype6-dev,
                libfribidi-dev,
+               libggi2-dev,
                libgl1-mesa-dev,
                libglib2.0-0,
                libgnutls-dev (>= 1.2.8),
@@ -113,8 +114,8 @@ Description: multimedia player and streamer
  for broadcasting purposes or for movie format transformations. Support for
  most output methods is provided by this package, but features can be added
  by installing additional audio plugins (vlc-plugin-pulse, vlc-plugin-sdl)
- or video plugins (vlc-plugin-sdl). There is also a web browser plugin in the
- mozilla-plugin-vlc package.
+ or video plugins (vlc-plugin-sdl, vlc-plugin-ggi, vlc-plugin-svgalib). There
+ is also a web browser plugin in the mozilla-plugin-vlc package.
 
 Package: vlc-dbg
 Section: debug
@@ -149,8 +150,9 @@ Description: multimedia player and streamer (without X support)
  for broadcasting purposes or for movie format transformations. Support for
  most output methods is provided by this package, but features can be added
  by installing additional audio plugins (vlc-plugin-pulse, vlc-plugin-sdl,
- vlc-plugin-jack) or video plugins (vlc-plugin-sdl). There is also a web
- browser plugin in the mozilla-plugin-vlc package.
+ vlc-plugin-jack) or video plugins (vlc-plugin-sdl, vlc-plugin-ggi,
+ vlc-plugin-svgalib). There is also a web browser plugin in  the
+ mozilla-plugin-vlc package.
  .
  This package contains a version of VLC that does not require X and that is
  thus suitable for headless servers.
@@ -222,6 +224,18 @@ Description: SDL video and audio output plugin for VLC
  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
  streams from various network sources.
 
+Package: vlc-plugin-ggi
+Architecture: any
+Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
+Description: GGI video output plugin for VLC
+ This is a GGI plugin for the VLC media player.  To activate it, use
+ the `--vout ggi' flag or select the `ggi' video output plugin from the
+ preferences menu.
+ .
+ VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
+ DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
+ streams from various network sources.
+
 Package: mozilla-plugin-vlc
 Architecture: any
 Depends: vlc-nox (= ${binary:Version}), vlc, ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/rules b/debian/rules
index 0120eb7..de20b2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,6 +66,7 @@ confflags += \
 	--enable-flac \
 	--enable-freetype \
 	--enable-fribidi \
+	--enable-ggi \
 	--enable-gnutls \
 	--enable-jack \
 	--enable-libass \
diff --git a/debian/vlc-plugin-ggi.install b/debian/vlc-plugin-ggi.install
new file mode 100644
index 0000000..4a87ba0
--- /dev/null
+++ b/debian/vlc-plugin-ggi.install
@@ -0,0 +1 @@
+usr/lib/vlc/video_output/libggi_plugin.so
diff --git a/debian/vlc-plugin-ggi.links b/debian/vlc-plugin-ggi.links
new file mode 100644
index 0000000..08d4a99
--- /dev/null
+++ b/debian/vlc-plugin-ggi.links
@@ -0,0 +1,2 @@
+/usr/share/doc/vlc-nox /usr/share/doc/vlc-plugin-ggi
+/usr/share/bug/vlc-nox /usr/share/bug/vlc-plugin-ggi

-- 
VLC media player packaging