r86 - in unstable/vlc/debian: . patches

Samuel Hocevar sho at alioth.debian.org
Wed Mar 14 14:20:17 CET 2007 

Author: sho
Date: 2006-09-14 16:43:00 +0000 (Thu, 14 Sep 2006)
New Revision: 86

Added:
   unstable/vlc/debian/libvlc0-dev.install
   unstable/vlc/debian/libvlc0.install
   unstable/vlc/debian/mozilla-plugin-vlc.install
   unstable/vlc/debian/patches/000_dup_builtins.diff
   unstable/vlc/debian/vlc-nox.dirs
   unstable/vlc/debian/vlc-nox.install
   unstable/vlc/debian/vlc-plugin-arts.install
   unstable/vlc/debian/vlc-plugin-esd.install
   unstable/vlc/debian/vlc-plugin-ggi.install
   unstable/vlc/debian/vlc-plugin-glide.install
   unstable/vlc/debian/vlc-plugin-sdl.install
   unstable/vlc/debian/vlc-plugin-svgalib.install
   unstable/vlc/debian/vlc.install
Modified:
   unstable/vlc/debian/README.Debian
   unstable/vlc/debian/changelog
   unstable/vlc/debian/control
   unstable/vlc/debian/patches/series
   unstable/vlc/debian/rules
   unstable/vlc/debian/vlc.menu
Log:
vlc (0.8.6-svn20060911.0.8.5-1-svn.debian-3) unstable; urgency=low

  * debian/control:
    + Distribute libvlc0 in a separate package.
    + Created vlc-nox package that contains VLC and all its non-X related
      plugins.
  * debian/rules:
    + Use dh_install.
    + Bail out with an error if a plugin from vlc-nox got linked to libX11.

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Thu, 14 Sep 2006 18:39:59 +0200

vlc (0.8.6-svn20060911.0.8.5-1-svn.debian-2) unstable; urgency=low

  * debian/patches/000_dup_builtins.diff:
    + Fix a powerpc FTBFS due to duplicate libraries in link lines.

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Mon, 11 Sep 2006 18:32:04 +0200

vlc (0.8.6-svn20060911.0.8.5-1-svn.debian-1) unstable; urgency=low

  * New upstream SVN snapshot, fixes an amd64 FTBFS.

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Mon, 11 Sep 2006 13:56:19 +0200


Modified: unstable/vlc/debian/README.Debian
===================================================================
--- unstable/vlc/debian/README.Debian	2006-09-11 00:13:00 UTC (rev 85)
+++ unstable/vlc/debian/README.Debian	2006-09-14 16:43:00 UTC (rev 86)
@@ -1,4 +1,4 @@
-$Id: README.Debian 8532 2004-08-27 12:10:17Z sam $
+$Id$
 
 Notes for anyone wanting to build Debian packages of VLC.
 


Property changes on: unstable/vlc/debian/README.Debian
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: unstable/vlc/debian/changelog
===================================================================
--- unstable/vlc/debian/changelog	2006-09-11 00:13:00 UTC (rev 85)
+++ unstable/vlc/debian/changelog	2006-09-14 16:43:00 UTC (rev 86)
@@ -1,3 +1,28 @@
+vlc (0.8.6-svn20060911.0.8.5-1-svn.debian-3) unstable; urgency=low
+
+  * debian/control:
+    + Distribute libvlc0 in a separate package.
+    + Created vlc-nox package that contains VLC and all its non-X related
+      plugins.
+  * debian/rules:
+    + Use dh_install.
+    + Bail out with an error if a plugin from vlc-nox got linked to libX11.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Thu, 14 Sep 2006 18:39:59 +0200
+
+vlc (0.8.6-svn20060911.0.8.5-1-svn.debian-2) unstable; urgency=low
+
+  * debian/patches/000_dup_builtins.diff:
+    + Fix a powerpc FTBFS due to duplicate libraries in link lines.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Mon, 11 Sep 2006 18:32:04 +0200
+
+vlc (0.8.6-svn20060911.0.8.5-1-svn.debian-1) unstable; urgency=low
+
+  * New upstream SVN snapshot, fixes an amd64 FTBFS.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Mon, 11 Sep 2006 13:56:19 +0200
+
 vlc (0.8.6-svn20060910.0.8.5-1-svn.debian-1) unstable; urgency=low
 
   * New upstream SVN snapshot, from the forthcoming 0.8.5-1 branch.

Modified: unstable/vlc/debian/control
===================================================================
--- unstable/vlc/debian/control	2006-09-11 00:13:00 UTC (rev 85)
+++ unstable/vlc/debian/control	2006-09-14 16:43:00 UTC (rev 86)
@@ -8,13 +8,13 @@
 Package: vlc
 Section: graphics
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-dejavu
+Depends: vlc-nox (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}, ttf-dejavu
 Recommends: videolan-doc
 Suggests: mozilla-plugin-vlc
 Replaces: vlc-plugin-dvb (<< 0.5.2-2), vlc-plugin-xosd (<< 0.5.2-2), vlc-plugin-dv (<< 0.5.2-2), vlc-plugin-mad (<< 0.5.2-2), vlc-mad (<< 0.5.0), vlc-plugin-a52 (<< 0.5.2-2), vlc-plugin-ogg (<< 0.5.2-2), vlc-plugin-lirc (<< 0.5.2-2), vlc-lirc (<< 0.5.0), vlc-plugin-aa (<< 0.5.2-2), vlc-aa (<< 0.5.0), wxvlc (<< 0.8.5-test3.debian-4), vlc-plugin-alsa (<< 0.8.5-test3.debian-4)
 Conflicts: vlc-plugin-dvb (<< 0.5.2-2), vlc-plugin-xosd (<< 0.5.2-2), vlc-plugin-dv (<< 0.5.2-2), vlc-plugin-mad (<< 0.5.2-2), vlc-mad (<< 0.5.0), vlc-plugin-a52 (<< 0.5.2-2), vlc-plugin-ogg (<< 0.5.2-2), vlc-plugin-lirc (<< 0.5.2-2), vlc-lirc (<< 0.5.0), vlc-plugin-aa (<< 0.5.2-2), vlc-aa (<< 0.5.0), wxvlc (<< 0.8.5-test3.debian-4), vlc-plugin-alsa (<< 0.8.5-test3.debian-4)
 Provides: mp3-decoder
-Description: multimedia player for all audio and video formats
+Description: multimedia player and streamer for all audio and video formats
  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.
@@ -31,10 +31,49 @@
  vlc-plugin-glide, vlc-plugin-svgalib). There is also a web browser plugin
  in the mozilla-plugin-vlc package.
 
+Package: vlc-nox
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: vlc-plugin-dvb (<< 0.5.2-2), vlc-plugin-xosd (<< 0.5.2-2), vlc-plugin-dv (<< 0.5.2-2), vlc-plugin-mad (<< 0.5.2-2), vlc-mad (<< 0.5.0), vlc-plugin-a52 (<< 0.5.2-2), vlc-plugin-ogg (<< 0.5.2-2), vlc-plugin-lirc (<< 0.5.2-2), vlc-lirc (<< 0.5.0), vlc-plugin-aa (<< 0.5.2-2), vlc-aa (<< 0.5.0), wxvlc (<< 0.8.5-test3.debian-4), vlc-plugin-alsa (<< 0.8.5-test3.debian-4), vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
+Conflicts: vlc-plugin-dvb (<< 0.5.2-2), vlc-plugin-xosd (<< 0.5.2-2), vlc-plugin-dv (<< 0.5.2-2), vlc-plugin-mad (<< 0.5.2-2), vlc-mad (<< 0.5.0), vlc-plugin-a52 (<< 0.5.2-2), vlc-plugin-ogg (<< 0.5.2-2), vlc-plugin-lirc (<< 0.5.2-2), vlc-lirc (<< 0.5.0), vlc-plugin-aa (<< 0.5.2-2), vlc-aa (<< 0.5.0), wxvlc (<< 0.8.5-test3.debian-4), vlc-plugin-alsa (<< 0.8.5-test3.debian-4), vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
+Provides: mp3-decoder
+Description: multimedia player and streamer for all audio and video formats
+ 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.
+ .
+ VLC can also be used as a streaming server that duplicates the stream it
+ reads and multicasts them through the network to other clients, or serves
+ them through HTTP.
+ .
+ VLC has support for on-the-fly transcoding of audio and video formats, either
+ 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-esd, vlc-plugin-sdl,
+ vlc-plugin-arts) or video plugins (vlc-plugin-sdl, vlc-plugin-ggi,
+ vlc-plugin-glide, 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.
+
+Package: libvlc0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: multimedia player and streamer library
+ This package contains the shared library required by applications using VLC
+ features.
+ .
+ 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: libvlc0-dev
 Section: libdevel
 Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libvlc0 (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: development files for VLC
  This package contains headers and a static library required to build plugins
  for VLC, or standalone applications that use VLC features.
@@ -45,7 +84,7 @@
 
 Package: vlc-plugin-esd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: vlc-esd (<< 0.5.0)
 Replaces: vlc-esd (<< 0.5.0)
 Description: Esound audio output plugin for VLC
@@ -69,7 +108,7 @@
 
 Package: vlc-plugin-sdl
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: vlc-sdl (<< 0.5.0)
 Replaces: vlc-sdl (<< 0.5.0)
 Description: SDL video and audio output plugin for VLC
@@ -84,7 +123,7 @@
 
 Package: vlc-plugin-ggi
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: vlc-ggi (<< 0.5.0)
 Replaces: vlc-ggi (<< 0.5.0)
 Description: GGI video output plugin for VLC
@@ -98,7 +137,7 @@
 
 Package: vlc-plugin-glide
 Architecture: i386
-Depends: ${shlibs:Depends}, libglide2
+Depends: vlc-nox, ${shlibs:Depends}, libglide2
 Conflicts: vlc-glide (<< 0.5.0)
 Replaces: vlc-glide (<< 0.5.0)
 Description: Glide video output plugin for VLC
@@ -112,7 +151,7 @@
 
 Package: vlc-plugin-arts
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: vlc-arts (<< 0.5.0)
 Replaces: vlc-arts (<< 0.5.0)
 Description: aRts audio output plugin for VLC
@@ -126,7 +165,7 @@
 
 Package: mozilla-plugin-vlc
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: vlc-nox (= ${Source-Version}), vlc, ${shlibs:Depends}, ${misc:Depends}
 Description: multimedia plugin for web browsers based on VLC
  This plugin adds support for MPEG, MPEG2, DVD, DivX, Ogg/Vorbis and many
  more formats to your Gecko-based web browser (Firefox, Galeon, etc.). The
@@ -140,7 +179,7 @@
 
 Package: vlc-plugin-svgalib
 Architecture: i386
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: vlc-nox (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: SVGAlib video output plugin for VLC
  This plugin adds support for SVGAlib to the VLC media player. To
  activate it, use the `--vout svgalib' flag or select the `svgalib' video

Added: unstable/vlc/debian/libvlc0-dev.install
===================================================================
--- unstable/vlc/debian/libvlc0-dev.install	2006-09-11 00:13:00 UTC (rev 85)
+++ unstable/vlc/debian/libvlc0-dev.install	2006-09-14 16:43:00 UTC (rev 86)
@@ -0,0 +1,4 @@
+usr/bin/vlc-config
+usr/lib/*.so
+usr/lib/*.a
+usr/include/vlc/*.h

Added: unstable/vlc/debian/libvlc0.install
===================================================================
--- unstable/vlc/debian/libvlc0.install	2006-09-11 00:13:00 UTC (rev 85)
+++ unstable/vlc/debian/libvlc0.install	2006-09-14 16:43:00 UTC (rev 86)
@@ -0,0 +1 @@
+usr/lib/libvlc.so.*

Added: unstable/vlc/debian/mozilla-plugin-vlc.install
===================================================================
--- unstable/vlc/debian/mozilla-plugin-vlc.install	2006-09-11 00:13:00 UTC (rev 85)
+++ unstable/vlc/debian/mozilla-plugin-vlc.install	2006-09-14 16:43:00 UTC (rev 86)
@@ -0,0 +1 @@
+usr/lib/mozilla

Added: unstable/vlc/debian/patches/000_dup_builtins.diff
===================================================================
--- unstable/vlc/debian/patches/000_dup_builtins.diff	2006-09-11 00:13:00 UTC (rev 85)
+++ unstable/vlc/debian/patches/000_dup_builtins.diff	2006-09-14 16:43:00 UTC (rev 86)
@@ -0,0 +1,30 @@
+Index: configure.ac
+===================================================================
+--- configure.ac.orig	2006-09-11 13:43:33.000000000 +0200
++++ configure.ac	2006-09-11 18:30:36.000000000 +0200
+@@ -1291,7 +1291,9 @@
+   VLC_ADD_CFLAGS([vlc],[${ac_cv_c_altivec}])
+   VLC_ADD_CFLAGS([idctaltivec motionaltivec],[${ac_cv_c_altivec}])
+   VLC_ADD_CFLAGS([i420_yuy2_altivec memcpyaltivec deinterlace],[${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}])
+-  ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
++  if test "${ac_cv_altivec_inline}" = "no"; then
++    ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
++  fi
+ fi
+ 
+ AC_CACHE_CHECK([if linker needs -framework vecLib],
+Index: configure
+===================================================================
+--- configure.orig	2006-09-11 18:30:40.000000000 +0200
++++ configure	2006-09-11 18:31:17.000000000 +0200
+@@ -39385,7 +39385,9 @@
+     am_modules_with_cflags="${am_modules_with_cflags} ${element}"
+   done
+ 
+-  ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
++  if test "${ac_cv_altivec_inline}" = "no"; then
++    ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
++  fi
+ fi
+ 
+ { echo "$as_me:$LINENO: checking if linker needs -framework vecLib" >&5

Modified: unstable/vlc/debian/patches/series
===================================================================
--- unstable/vlc/debian/patches/series	2006-09-11 00:13:00 UTC (rev 85)
+++ unstable/vlc/debian/patches/series	2006-09-14 16:43:00 UTC (rev 86)
@@ -1,4 +1,5 @@
 000_ltmain.diff
+000_dup_builtins.diff -p0
 010_no-wx-updates.diff 
 010_osdmenu-paths.diff 
 #020_xulrunner.diff

Modified: unstable/vlc/debian/rules
===================================================================
--- unstable/vlc/debian/rules	2006-09-11 00:13:00 UTC (rev 85)
+++ unstable/vlc/debian/rules	2006-09-14 16:43:00 UTC (rev 86)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 # debian/rules for the VLC media player - uses debhelper.
-# $Id: rules 15296 2006-04-21 21:33:39Z xtophe $
+# $Id$
 # based on Joey Hess's one.
 
 # Uncomment this to turn on verbose mode.
@@ -146,6 +146,7 @@
 	#### Build all the rest, with the PIC libs
 	###AM_MAKEFLAGS='builtin=no' $(MAKE)
 	$(MAKE)
+
 	# Minor test, to see which plugins were built and whether they load
 	# properly.
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -182,81 +183,62 @@
 	dh_clean -k
 	dh_installdirs
 
-	DESTDIR=`pwd`/debian/vlc/ $(MAKE) install prefix=/usr
+	$(MAKE) install DESTDIR=`pwd`/debian/tmp/
 
 	# Clean up libtool crap
-	find debian/vlc -name '*.la' -exec rm '{}' ';'
+	find debian/tmp -name '*.la' -exec rm '{}' ';'
 
-	# Package: vlc
-	mv debian/vlc/$(VIDDIR)/vlc48x48.png debian/vlc/$(PIXDIR)/vlc.png
-	mv debian/vlc/$(VIDDIR)/vlc32x32.xpm debian/vlc/$(VIDDIR)/vlc.xpm
+	# Remove useless stuff
+	rm -Rf debian/tmp/$(VIDDIR)/skins
+	rm -f debian/tmp/usr/share/vlc/skins2/fonts/FreeSans.ttf
+	rm -f debian/tmp/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
+	ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSans.ttf
+	ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
 
-	#cp doc/fortunes.txt debian/vlc/usr/share/games/fortunes/vlc
-	#strfile doc/fortunes.txt debian/vlc/usr/share/games/fortunes/vlc.dat
+	# Move stuff around
+	mkdir -p debian/tmp/$(PIXDIR)
+	-mv debian/tmp/$(VIDDIR)/vlc48x48.png debian/tmp/$(PIXDIR)/vlc.png
+	-mv debian/tmp/$(VIDDIR)/vlc32x32.xpm debian/tmp/$(VIDDIR)/vlc.xpm
 
-	rm -f debian/vlc/usr/share/vlc/skins2/fonts/FreeSans.ttf
-	rm -f debian/vlc/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
-	ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf debian/vlc/usr/share/vlc/skins2/fonts/FreeSans.ttf
-	ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf debian/vlc/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
+	# Install stuff
+	dh_install --fail-missing --sourcedir=debian/tmp
 
-	rm -Rf debian/vlc/$(VIDDIR)/skins
+	# Check that we did not install a plugin linked with libX11 in vlc-nox
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+	BORKED=no; \
+	for file in $$(find debian/vlc-nox/usr/lib/vlc -name '*.so'); do \
+	  if ldd $$file | grep -q libX11; then \
+	    BORKED=yes; \
+	    echo $$file depends on libX11; \
+	  fi; \
+	done; \
+	if test "$$BORKED" = yes; then exit 1; fi
+endif
+
+	# manpage symlinks
 	ln -s vlc.1.gz debian/vlc/usr/share/man/man1/svlc.1.gz
+	ln -s vlc.1.gz debian/vlc/usr/share/man/man1/wxvlc.1.gz
 
-	# Package: libvlc0-dev
-	mv debian/vlc/usr/bin/vlc-config debian/libvlc0-dev/usr/bin/
-	mv debian/vlc/usr/lib/libvlc.so debian/libvlc0-dev/usr/lib/
-	#mv debian/vlc/usr/lib/vlc/*.a debian/libvlc0-dev/usr/lib/
-	mv debian/vlc/usr/include/vlc/*.h debian/libvlc0-dev/usr/include/vlc/
-	rm -Rf debian/vlc/usr/include
-	ln -s vlc debian/libvlc0-dev/usr/share/doc/libvlc0-dev
-
-	# Package: vlc-plugin-esd
+	# /usr/share/doc symlinks
+	ln -s vlc debian/vlc-nox/usr/share/doc/vlc-nox
+	ln -s libvlc0 debian/libvlc0-dev/usr/share/doc/libvlc0-dev
 	ln -s vlc debian/vlc-plugin-esd/usr/share/doc/vlc-plugin-esd
-	mv debian/vlc/usr/lib/vlc/audio_output/libesd_plugin.so* \
-	  debian/vlc-plugin-esd/usr/lib/vlc/audio_output/
-
-	# Package: vlc-plugin-sdl
 	ln -s vlc debian/vlc-plugin-sdl/usr/share/doc/vlc-plugin-sdl
-	mv debian/vlc/usr/lib/vlc/audio_output/libaout_sdl_plugin.so* \
-	  debian/vlc-plugin-sdl/usr/lib/vlc/audio_output/
-	mv debian/vlc/usr/lib/vlc/video_output/libvout_sdl_plugin.so* \
-	  debian/vlc-plugin-sdl/usr/lib/vlc/video_output/
-
-	# Package: vlc-plugin-ggi
 	ln -s vlc debian/vlc-plugin-ggi/usr/share/doc/vlc-plugin-ggi
-	mv debian/vlc/usr/lib/vlc/video_output/libggi_plugin.so* \
-	  debian/vlc-plugin-ggi/usr/lib/vlc/video_output/
-
-	# Package: vlc-plugin-glide
+	ln -s vlc debian/vlc-plugin-arts/usr/share/doc/vlc-plugin-arts
+	ln -s vlc debian/mozilla-plugin-vlc/usr/share/doc/mozilla-plugin-vlc
 ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),i386)
 	ln -s vlc debian/vlc-plugin-glide/usr/share/doc/vlc-plugin-glide
-	mv debian/vlc/usr/lib/vlc/video_output/libglide_plugin.so* \
-	  debian/vlc-plugin-glide/usr/lib/vlc/video_output/
+	ln -s vlc debian/vlc-plugin-svgalib/usr/share/doc/vlc-plugin-svgalib
 endif
 
-	# Package: vlc-plugin-arts
-	ln -s vlc debian/vlc-plugin-arts/usr/share/doc/vlc-plugin-arts
-	mv debian/vlc/usr/lib/vlc/audio_output/libarts_plugin.so* \
-	  debian/vlc-plugin-arts/usr/lib/vlc/audio_output/
-
-	# Package: mozilla-plugin-vlc
-	ln -s vlc debian/mozilla-plugin-vlc/usr/share/doc/mozilla-plugin-vlc
-	mv debian/vlc/usr/lib/mozilla debian/mozilla-plugin-vlc/usr/lib
 	# links for firefox
 	mkdir -p debian/mozilla-plugin-vlc/usr/lib/mozilla-firefox/plugins/
 	ln -s ../../mozilla/plugins/libvlcplugin.so debian/mozilla-plugin-vlc/usr/lib/mozilla-firefox/plugins/
 	mkdir -p debian/mozilla-plugin-vlc/usr/lib/mozilla-firefox/components/
 	ln -s ../../mozilla/components/vlcintf.xpt debian/mozilla-plugin-vlc/usr/lib/mozilla-firefox/components/
 
-	# Package: vlc-plugin-svgalib
-ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),i386)
-	ln -s vlc debian/vlc-plugin-svgalib/usr/share/doc/vlc-plugin-svgalib
-	mv debian/vlc/usr/lib/vlc/video_output/libsvgalib_plugin.so* \
-	  debian/vlc-plugin-svgalib/usr/lib/vlc/video_output
-endif
-
 	cp debian/vlc/$(VIDDIR)/vlc.xpm debian/vlc/$(VIDDIR)/wxvlc.xpm
-	ln -s vlc.1.gz debian/vlc/usr/share/man/man1/wxvlc.1.gz
 
 	# Clean up
 	rm -f debian/vlc/$(VIDDIR)/*.png
@@ -278,22 +260,23 @@
 	dh_testdir
 	dh_testroot
 #	dh_installdebconf	
-	dh_installdocs -p vlc
-	dh_buildinfo -p vlc
+	dh_installdocs -p vlc-nox
+	dh_installdocs -p libvlc0
+	dh_buildinfo -p vlc-nox
 #	dh_installexamples
 	dh_installmenu -s
 	dh_installmime -s
-	dh_installman doc/vlc.1 -p vlc
+	dh_installman doc/vlc.1 -p vlc-nox
 	dh_installman doc/vlc-config.1 -p libvlc0-dev
-	dh_installchangelogs ChangeLog -p vlc
+	dh_installchangelogs ChangeLog -p vlc-nox
+	dh_installchangelogs ChangeLog -p libvlc0
 	dh_link -s
 	dh_strip -s
 	dh_compress -s
 	dh_fixperms -s
-	dh_makeshlibs -pvlc -V 'vlc (>= 0.8.6-svn20060910.0.8.5-1-svn.debian-1)'
+	dh_makeshlibs -plibvlc0 -V # -V is nasty, but I mean it
 	dh_installdeb -s
-#	dh_perl
-	dh_shlibdeps -s -ldebian/vlc/usr/lib
+	dh_shlibdeps -s -ldebian/libvlc0/usr/lib
 	dh_gencontrol -s
 	dh_md5sums -s
 	dh_builddeb -s


Property changes on: unstable/vlc/debian/rules
___________________________________________________________________
Name: svn:keywords
   + Id

Added: unstable/vlc/debian/vlc-nox.dirs
===================================================================
--- unstable/vlc/debian/vlc-nox.dirs	2006-09-11 00:13:00 UTC (rev 85)
+++ unstable/vlc/debian/vlc-nox.dirs	2006-09-14 16:43:00 UTC (rev 86)
@@ -0,0 +1,16 @@
+usr/bin
+usr/lib/vlc/access
+usr/lib/vlc/audio_filter
+usr/lib/vlc/audio_mixer
+usr/lib/vlc/audio_output
+usr/lib/vlc/codec
+usr/lib/vlc/control
+usr/lib/vlc/demux
+usr/lib/vlc/gui
+usr/lib/vlc/misc
+usr/lib/vlc/video_chroma
+usr/lib/vlc/video_filter
+usr/lib/vlc/video_output
+usr/lib/vlc/visualization
+usr/share/doc/vlc
+usr/share/man/man1

Added: unstable/vlc/debian/vlc-nox.install
===================================================================
--- unstable/vlc/debian/vlc-nox.install	2006-09-11 00:13:00 UTC (rev 85)
+++ unstable/vlc/debian/vlc-nox.install	2006-09-14 16:43:00 UTC (rev 86)
@@ -0,0 +1,55 @@
+usr/bin/vlc
+usr/share/doc
+usr/share/locale
+usr/share/vlc/http
+usr/share/vlc/osdmenu
+usr/lib/vlc/access/libdvb_plugin.so
+usr/lib/vlc/access/libpvr_plugin.so
+usr/lib/vlc/access/libv4l_plugin.so
+usr/lib/vlc/access/libvcd_plugin.so
+usr/lib/vlc/access/libvcdx_plugin.so
+usr/lib/vlc/access/libaccess_*.so
+usr/lib/vlc/access/libdvdnav_plugin.so
+usr/lib/vlc/access/libdvdread_plugin.so
+usr/lib/vlc/access/libcdda_plugin.so
+usr/lib/vlc/access_filter
+usr/lib/vlc/access_output
+usr/lib/vlc/audio_filter
+usr/lib/vlc/audio_mixer
+usr/lib/vlc/audio_output/libalsa_plugin.so
+usr/lib/vlc/audio_output/libaout_file_plugin.so
+usr/lib/vlc/audio_output/liboss_plugin.so
+usr/lib/vlc/codec/libcmml_plugin.so
+usr/lib/vlc/codec/libffmpeg_plugin.so
+usr/lib/vlc/codec/libspudec_plugin.so
+usr/lib/vlc/codec/liba52_plugin.so
+usr/lib/vlc/codec/libcinepak_plugin.so
+usr/lib/vlc/codec/libdts_plugin.so
+usr/lib/vlc/codec/libflacdec_plugin.so
+usr/lib/vlc/codec/liblpcm_plugin.so
+usr/lib/vlc/codec/libaraw_plugin.so
+usr/lib/vlc/codec/libvorbis_plugin.so
+usr/lib/vlc/codec/libspeex_plugin.so
+usr/lib/vlc/codec/libadpcm_plugin.so
+usr/lib/vlc/codec/libmpeg_audio_plugin.so
+usr/lib/vlc/codec/liblibmpeg2_plugin.so
+usr/lib/vlc/codec/librawvideo_plugin.so
+usr/lib/vlc/codec/libsubsdec_plugin.so
+usr/lib/vlc/codec/libdvbsub_plugin.so
+usr/lib/vlc/codec/libtwolame_plugin.so
+usr/lib/vlc/codec/libpng_plugin.so
+usr/lib/vlc/codec/libsvcdsub_plugin.so
+usr/lib/vlc/codec/libcvdsub_plugin.so
+usr/lib/vlc/codec/libfake_plugin.so
+usr/lib/vlc/control
+usr/lib/vlc/demux
+usr/lib/vlc/gui/libncurses_plugin.so
+usr/lib/vlc/misc
+usr/lib/vlc/mux
+usr/lib/vlc/packetizer
+usr/lib/vlc/services_discovery
+usr/lib/vlc/stream_out
+usr/lib/vlc/video_chroma
+usr/lib/vlc/video_filter
+usr/lib/vlc/video_output/libimage_plugin.so
+usr/lib/vlc/visualization/libvisual_plugin.so

Added: unstable/vlc/debian/vlc-plugin-arts.install
===================================================================
--- unstable/vlc/debian/vlc-plugin-arts.install	2006-09-11 00:13:00 UTC (rev 85)
+++ unstable/vlc/debian/vlc-plugin-arts.install	2006-09-14 16:43:00 UTC (rev 86)
@@ -0,0 +1 @@
+usr/lib/vlc/audio_output/libarts_plugin.so

Added: unstable/vlc/debian/vlc-plugin-esd.install
===================================================================
--- unstable/vlc/debian/vlc-plugin-esd.install	2006-09-11 00:13:00 UTC (rev 85)
+++ unstable/vlc/debian/vlc-plugin-esd.install	2006-09-14 16:43:00 UTC (rev 86)
@@ -0,0 +1 @@
+usr/lib/vlc/audio_output/libesd_plugin.so

Added: unstable/vlc/debian/vlc-plugin-ggi.install
===================================================================
--- unstable/vlc/debian/vlc-plugin-ggi.install	2006-09-11 00:13:00 UTC (rev 85)
+++ unstable/vlc/debian/vlc-plugin-ggi.install	2006-09-14 16:43:00 UTC (rev 86)
@@ -0,0 +1 @@
+usr/lib/vlc/video_output/libggi_plugin.so

Added: unstable/vlc/debian/vlc-plugin-glide.install
===================================================================
--- unstable/vlc/debian/vlc-plugin-glide.install	2006-09-11 00:13:00 UTC (rev 85)
+++ unstable/vlc/debian/vlc-plugin-glide.install	2006-09-14 16:43:00 UTC (rev 86)
@@ -0,0 +1 @@
+usr/lib/vlc/video_output/libglide_plugin.so

Added: unstable/vlc/debian/vlc-plugin-sdl.install
===================================================================
--- unstable/vlc/debian/vlc-plugin-sdl.install	2006-09-11 00:13:00 UTC (rev 85)
+++ unstable/vlc/debian/vlc-plugin-sdl.install	2006-09-14 16:43:00 UTC (rev 86)
@@ -0,0 +1,2 @@
+usr/lib/vlc/audio_output/libaout_sdl_plugin.so
+usr/lib/vlc/video_output/libvout_sdl_plugin.so

Added: unstable/vlc/debian/vlc-plugin-svgalib.install
===================================================================
--- unstable/vlc/debian/vlc-plugin-svgalib.install	2006-09-11 00:13:00 UTC (rev 85)
+++ unstable/vlc/debian/vlc-plugin-svgalib.install	2006-09-14 16:43:00 UTC (rev 86)
@@ -0,0 +1 @@
+usr/lib/vlc/video_output/libsvgalib_plugin.so

Added: unstable/vlc/debian/vlc.install
===================================================================
--- unstable/vlc/debian/vlc.install	2006-09-11 00:13:00 UTC (rev 85)
+++ unstable/vlc/debian/vlc.install	2006-09-14 16:43:00 UTC (rev 86)
@@ -0,0 +1,19 @@
+usr/bin/svlc
+usr/bin/wxvlc
+usr/lib/vlc/access/libscreen_plugin.so
+usr/lib/vlc/codec/libsdl_image_plugin.so
+usr/lib/vlc/gui/libskins2_plugin.so
+usr/lib/vlc/gui/libwxwidgets_plugin.so
+usr/lib/vlc/video_output/libx11_plugin.so
+usr/lib/vlc/video_output/libxvideo_plugin.so
+usr/lib/vlc/video_output/libglx_plugin.so
+usr/lib/vlc/video_output/libaa_plugin.so
+usr/lib/vlc/video_output/libcaca_plugin.so
+usr/lib/vlc/video_output/libopengl_plugin.so
+usr/lib/vlc/visualization/libxosd_plugin.so
+usr/share/vlc/skins2
+usr/share/vlc/*.png
+usr/share/vlc/*.xpm
+usr/share/vlc/*.ico
+usr/share/applications
+usr/share/pixmaps

Modified: unstable/vlc/debian/vlc.menu
===================================================================
--- unstable/vlc/debian/vlc.menu	2006-09-11 00:13:00 UTC (rev 85)
+++ unstable/vlc/debian/vlc.menu	2006-09-14 16:43:00 UTC (rev 86)
@@ -1,3 +1,3 @@
-?package(vlc):command="/usr/bin/vlc" hotkey="V" needs="X11" \
+?package(vlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
               section="Apps/Viewers" title="VLC media player" \
               icon="/usr/share/vlc/vlc.xpm" hints="Video"

More information about the Pkg-multimedia-commits mailing list