* ./configure.in: the DV module is now a plugin, with the proper

dependencies in debian/control.

configure.in

@@ -1267,7 +1267,7 @@ AC_ARG_ENABLE(dv,
 if test "x${enable_dv}" = "xyes"
 then
   AC_CHECK_HEADERS(libdv/dv.h, [
-    BUILTINS="${BUILTINS} codec/dv/dv"
+    PLUGINS="${PLUGINS} codec/dv/dv"
     dv_LDFLAGS="${dv_LDFLAGS} -ldv"
    ],[])
 fi  

debian/control

@@ -180,9 +180,8 @@ Description: MAD audio codec plugin for vlc
  VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
  .
  This plugin adds support for libmad, the MPEG audio decoder library,
- to the VideoLAN Client. MAD is 100% fixed-point based. To activate
- this plugin, use the `--mpeg_adec mad' flag or select the `mad' MPEG
- decoder from the preferences menu.
+ to the VideoLAN Client. MAD is 100% fixed-point based. The plugin is
+ autodetected.
 
 Package: vlc-mad
 Architecture: any
@@ -290,3 +289,11 @@ Description: SVGAlib video output plugin for vlc
  output plugin from the preferences menu. Note that you will need root
  permissions to use SVGAlib.
 
+Package: vlc-plugin-dv
+Architecture: any
+Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Description: DV codec plugin for vlc
+ VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
+ .
+ This plugin adds support for the DV video format to vlc, the VideoLAN
+ Client. The plugin is autodetected.

debian/rules

@@ -57,11 +57,11 @@ clean:
 	rm -f build-stamp
 
 	# Check that we have an ffmpeg tree in here (can be a symlink)
-	test -d ffmpeg
-	-(cd ffmpeg ; make distclean)
+	test -d extras/ffmpeg
+	-(cd extras/ffmpeg ; make distclean)
 	# Check that we have an faad tree in here (can be a symlink)
-	test -d faad
-	-(cd faad ; make distclean)
+	test -d extras/faad
+	-(cd extras/faad ; make distclean)
 	-$(MAKE) distclean
 
 	dh_clean
@@ -183,6 +183,11 @@ endif
 	mv debian/vlc/usr/lib/vlc/video_output/svgalib.so \
 		debian/vlc-plugin-svgalib/usr/lib/vlc/video_output
 
+	# Package: vlc-plugin-dv
+	ln -s vlc debian/vlc-plugin-dv/usr/share/doc/vlc-plugin-dv
+	mv debian/vlc/usr/lib/vlc/codec/dv.so \
+		debian/vlc-plugin-dv/usr/lib/vlc/codec
+
 	# Clean up
 	rm -f debian/vlc/$(VIDDIR)/*.png
 

debian/vlc-plugin-dv.dirs

@@ -0,0 +1,2 @@
+usr/lib/vlc/codec
+usr/share/doc