debian: update debian package files

debian/control

@@ -9,11 +9,14 @@ Uploaders: Sam Hocevar (Debian packages) <sam+deb@zoy.org>,
            Christophe Mutricy <xtophe@videolan.org>,
            Mohammed Adnène Trojette <adn+deb@diwi.org>
 Build-Depends: debhelper (>= 7),
+               automake,
+               libtool,
                dh-buildinfo,
                gettext,
                quilt,
                nasm,
                yasm [amd64 kfreebsd-amd64],
+               lua5.1,
                liba52-0.7.4-dev,
                libaa1-dev,
                libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
@@ -76,8 +79,12 @@ Build-Depends: debhelper (>= 7),
                libvcdinfo-dev,
                libvorbis-dev,
                libx11-dev,
-               libx264-dev,
+               libx264-dev (>= 85),
                libxcb-keysyms1-dev,
+               libxcb-shm0-dev,
+               libxcb-xv0-dev,
+               libx11-xcb-dev,
+               libxcb1-dev,
                libxext-dev,
                libxml2-dev,
                libxpm-dev,

debian/mozilla-plugin-vlc.install

-usr/lib/mozilla
+#usr/lib/mozilla

debian/rules

@@ -76,7 +76,7 @@ confflags += \
 	--enable-mad \
 	--enable-mkv \
 	--enable-mod \
-	--enable-mozilla \
+	--disable-mozilla \
 	--enable-mpc \
 	--enable-ncurses \
 	--enable-notify \
@@ -97,9 +97,9 @@ confflags += \
 	--enable-vcd \
 	--enable-vcdx \
 	--enable-vorbis \
-	--with-mozilla-pkg=libxul \
 	$(NULL)
 
+#	--with-mozilla-pkg=libxul
 
 # Linux specific flags
 ifeq ($(DEB_HOST_ARCH_OS),linux)
@@ -123,6 +123,7 @@ VIDDIR := usr/share/vlc
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
+	autoreconf
 	# We need to build the static library apart
 	# Else it's a mess when we build the modules
 	./configure --enable-static $(confflags)
@@ -160,7 +161,7 @@ clean:
 	rm -f extras/zsh
 	# Removed ugly cruft
 	rm -f src/misc/modules_builtin.h
-	rm -f mozilla/vlcintf.xpt mozilla/vlcintf.h
+	#rm -f mozilla/vlcintf.xpt mozilla/vlcintf.h
 	# Remove spurious autotools stuff
 	rm -f config.log confdefs.h
 	# Unpatch package
@@ -188,23 +189,25 @@ install: build
 	ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
 	rm -rf debian/tmp/usr/share/man/man1
 	# Move icons around
-	mkdir -p debian/tmp/usr/share/icons/hicolor/16x16/apps
-	mv debian/tmp/$(VIDDIR)/vlc16x16.png debian/tmp/usr/share/icons/hicolor/16x16/apps/vlc.png
-	mkdir -p debian/tmp/usr/share/icons/hicolor/32x32/apps
-	mv debian/tmp/$(VIDDIR)/vlc32x32.png debian/tmp/usr/share/icons/hicolor/32x32/apps/vlc.png
-	mkdir -p debian/tmp/usr/share/icons/hicolor/48x48/apps
-	mv debian/tmp/$(VIDDIR)/vlc48x48.png debian/tmp/usr/share/icons/hicolor/48x48/apps/vlc.png
-	mv debian/tmp/$(VIDDIR)/vlc48x48-christmas.png debian/tmp/usr/share/icons/hicolor/48x48/apps/vlc-christmas.png
-	mkdir -p debian/tmp/usr/share/icons/hicolor/128x128/apps
-	mv debian/tmp/$(VIDDIR)/vlc128x128.png debian/tmp/usr/share/icons/hicolor/128x128/apps/vlc.png
-	mv debian/tmp/$(VIDDIR)/vlc128x128-christmas.png debian/tmp/usr/share/icons/hicolor/128x128/apps/vlc-christmas.png
-	mv debian/tmp/$(VIDDIR)/vlc32x32.xpm debian/tmp/$(VIDDIR)/vlc.xpm
+	#mkdir -p debian/tmp/usr/share/icons/hicolor/16x16/apps
+	#mv debian/tmp/$(VIDDIR)/vlc16x16.png debian/tmp/usr/share/icons/hicolor/16x16/apps/vlc.png
+	#mkdir -p debian/tmp/usr/share/icons/hicolor/32x32/apps
+	#mv debian/tmp/$(VIDDIR)/vlc32x32.png debian/tmp/usr/share/icons/hicolor/32x32/apps/vlc.png
+	#mkdir -p debian/tmp/usr/share/icons/hicolor/48x48/apps
+	#mv debian/tmp/$(VIDDIR)/vlc48x48.png debian/tmp/usr/share/icons/hicolor/48x48/apps/vlc.png
+	#mv debian/tmp/$(VIDDIR)/vlc48x48-christmas.png debian/tmp/usr/share/icons/hicolor/48x48/apps/vlc-christmas.png
+	#mkdir -p debian/tmp/usr/share/icons/hicolor/128x128/apps
+	#mv debian/tmp/$(VIDDIR)/vlc128x128.png debian/tmp/usr/share/icons/hicolor/128x128/apps/vlc.png
+	#mv debian/tmp/$(VIDDIR)/vlc128x128-christmas.png debian/tmp/usr/share/icons/hicolor/128x128/apps/vlc-christmas.png
+	#mv debian/tmp/$(VIDDIR)/vlc32x32.xpm debian/tmp/$(VIDDIR)/vlc.xpm
+	ln -sf AUTHORS MAINTAINERS
+	ln -sf debian/changelog ChangeLog
 	# Install stuff
 	dh_install -si --fail-missing
 	# move .hosts
-	mkdir -p debian/vlc-data/etc/vlc/http
-	mv debian/vlc-data/usr/share/vlc/http/.hosts debian/vlc-data/etc/vlc/http
-	ln -s /etc/vlc/http/.hosts debian/vlc-data/usr/share/vlc/http/.hosts
+	#mkdir -p debian/vlc-data/etc/vlc/http
+	#mv debian/vlc-data/usr/share/vlc/http/.hosts debian/vlc-data/etc/vlc/http
+	#ln -s /etc/vlc/http/.hosts debian/vlc-data/usr/share/vlc/http/.hosts
 
 	#install BTS stuff
 	for pkg in vlc-nox vlc-data; do \

debian/vlc-nox.install

@@ -3,27 +3,35 @@ usr/bin/nvlc
 usr/bin/rvlc
 usr/bin/vlc
 usr/bin/vlc-wrapper
+usr/lib/vlc/vlc-cache-gen
+usr/lib/vlc/lua
 usr/lib/vlc/access/libaccess_alsa_plugin.so
+usr/lib/vlc/access/libaccess_attachment_plugin.so
+usr/lib/vlc/access/libaccess_avio_plugin.so
 usr/lib/vlc/access/libaccess_bd_plugin.so
-usr/lib/vlc/access/libaccess_directory_plugin.so
+#usr/lib/vlc/access/libaccess_directory_plugin.so
 usr/lib/vlc/access/libaccess_dv_plugin.so
-usr/lib/vlc/access/libaccess_fake_plugin.so
-usr/lib/vlc/access/libaccess_file_plugin.so
+#usr/lib/vlc/access/libaccess_fake_plugin.so
+#usr/lib/vlc/access/libaccess_file_plugin.so
 usr/lib/vlc/access/libaccess_ftp_plugin.so
 usr/lib/vlc/access/libaccess_http_plugin.so
 usr/lib/vlc/access/libaccess_mmap_plugin.so
 usr/lib/vlc/access/libaccess_mms_plugin.so
 usr/lib/vlc/access/libaccess_oss_plugin.so
+usr/lib/vlc/plugins/access/libaccess_rar_plugin.so
 usr/lib/vlc/access/libaccess_realrtsp_plugin.so
 usr/lib/vlc/access/libaccess_smb_plugin.so
 usr/lib/vlc/access/libaccess_tcp_plugin.so
 usr/lib/vlc/access/libaccess_udp_plugin.so
+usr/lib/vlc/access/libaccess_vdr_plugin.so
 usr/lib/vlc/access/libcdda_plugin.so
 usr/lib/vlc/access/libdvb_plugin.so
 usr/lib/vlc/access/libdvdnav_plugin.so
 usr/lib/vlc/access/libdvdread_plugin.so
+usr/lib/vlc/access/libfilesystem_plugin.so
 usr/lib/vlc/access/libpvr_plugin.so
 usr/lib/vlc/access/librtp_plugin.so
+usr/lib/vlc/plugins/libstream_filter_rar_plugin.so
 usr/lib/vlc/access/libv4l2_plugin.so
 usr/lib/vlc/access/libv4l_plugin.so
 usr/lib/vlc/access/libvcd_plugin.so
@@ -42,12 +50,12 @@ usr/lib/vlc/codec/libaraw_plugin.so
 usr/lib/vlc/codec/libavcodec_plugin.so
 usr/lib/vlc/codec/libcc_plugin.so
 usr/lib/vlc/codec/libcdg_plugin.so
-usr/lib/vlc/codec/libcmml_plugin.so
+#usr/lib/vlc/codec/libcmml_plugin.so
 usr/lib/vlc/codec/libcvdsub_plugin.so
 usr/lib/vlc/codec/libdts_plugin.so
 usr/lib/vlc/codec/libdvbsub_plugin.so
 usr/lib/vlc/codec/libfaad_plugin.so
-usr/lib/vlc/codec/libfake_plugin.so
+#usr/lib/vlc/codec/libfake_plugin.so
 usr/lib/vlc/codec/libflac_plugin.so
 usr/lib/vlc/codec/libinvmem_plugin.so
 usr/lib/vlc/codec/liblibass_plugin.so
@@ -57,6 +65,7 @@ usr/lib/vlc/codec/libmpeg_audio_plugin.so
 usr/lib/vlc/codec/libpng_plugin.so
 usr/lib/vlc/codec/librawvideo_plugin.so
 usr/lib/vlc/codec/libschroedinger_plugin.so
+usr/lib/vlc/codec/libsdl_image_plugin.so
 usr/lib/vlc/codec/libspeex_plugin.so
 usr/lib/vlc/codec/libspudec_plugin.so
 usr/lib/vlc/codec/libsubsdec_plugin.so
@@ -71,13 +80,14 @@ usr/lib/vlc/codec/libx264_plugin.so
 usr/lib/vlc/control/libdbus_plugin.so
 usr/lib/vlc/control/libgestures_plugin.so
 usr/lib/vlc/control/libhotkeys_plugin.so
-usr/lib/vlc/control/libhttp_plugin.so
+usr/lib/vlc/control/liboldhttp_plugin.so
 usr/lib/vlc/control/liblirc_plugin.so
+usr/lib/vlc/control/libnetsync_plugin.so
 usr/lib/vlc/control/libmotion_plugin.so
-usr/lib/vlc/control/librc_plugin.so
-usr/lib/vlc/control/libshowintf_plugin.so
-usr/lib/vlc/control/libsignals_plugin.so
-usr/lib/vlc/control/libtelnet_plugin.so
+usr/lib/vlc/control/liboldrc_plugin.so
+#usr/lib/vlc/control/libshowintf_plugin.so
+#usr/lib/vlc/control/libsignals_plugin.so
+#usr/lib/vlc/control/libtelnet_plugin.so
 usr/lib/vlc/demux
 usr/lib/vlc/gui/libncurses_plugin.so
 usr/lib/vlc/meta_engine
@@ -89,15 +99,19 @@ usr/lib/vlc/misc/libgnutls_plugin.so
 usr/lib/vlc/misc/libinhibit_plugin.so
 usr/lib/vlc/misc/liblogger_plugin.so
 usr/lib/vlc/misc/liblua_plugin.so
-usr/lib/vlc/misc/libmemcpy*_plugin.so
+#usr/lib/vlc/misc/libmemcpy*_plugin.so
+usr/lib/vlc/misc/libnotify_plugin.so
 usr/lib/vlc/misc/libosd_parser_plugin.so
-usr/lib/vlc/misc/libprobe_hal_plugin.so
+#usr/lib/vlc/misc/libprobe_hal_plugin.so
 usr/lib/vlc/misc/libstats_plugin.so
 usr/lib/vlc/misc/libtelepathy_plugin.so
 usr/lib/vlc/misc/libvod_rtsp_plugin.so
 usr/lib/vlc/misc/libxml_plugin.so
 usr/lib/vlc/misc/libxtag_plugin.so
+usr/lib/vlc/mmx
+usr/lib/vlc/mmxext
 usr/lib/vlc/mux
+usr/lib/vlc/3dnow
 usr/lib/vlc/packetizer
 usr/lib/vlc/services_discovery
 usr/lib/vlc/stream_filter
@@ -112,7 +126,7 @@ usr/lib/vlc/video_filter/libcanvas_plugin.so
 usr/lib/vlc/video_filter/libchain_plugin.so
 usr/lib/vlc/video_filter/libclone_plugin.so
 usr/lib/vlc/video_filter/libcolorthres_plugin.so
-usr/lib/vlc/video_filter/libcrop_plugin.so
+#usr/lib/vlc/video_filter/libcrop_plugin.so
 usr/lib/vlc/video_filter/libcroppadd_plugin.so
 usr/lib/vlc/video_filter/libdeinterlace_plugin.so
 usr/lib/vlc/video_filter/libdynamicoverlay_plugin.so
@@ -125,6 +139,7 @@ usr/lib/vlc/video_filter/libinvert_plugin.so
 usr/lib/vlc/video_filter/liblogo_plugin.so
 usr/lib/vlc/video_filter/libmagnify_plugin.so
 usr/lib/vlc/video_filter/libmarq_plugin.so
+usr/lib/vlc/video_filter/libmirror_plugin.so
 usr/lib/vlc/video_filter/libmosaic_plugin.so
 usr/lib/vlc/video_filter/libmotionblur_plugin.so
 usr/lib/vlc/video_filter/libmotiondetect_plugin.so
@@ -142,7 +157,7 @@ usr/lib/vlc/video_filter/libscale_plugin.so
 usr/lib/vlc/video_filter/libscene_plugin.so
 usr/lib/vlc/video_filter/libsharpen_plugin.so
 usr/lib/vlc/video_filter/libswscale_plugin.so
-usr/lib/vlc/video_filter/libtransform_plugin.so
+#usr/lib/vlc/video_filter/libtransform_plugin.so
 usr/lib/vlc/video_filter/libwall_plugin.so
 usr/lib/vlc/video_filter/libwave_plugin.so
 usr/lib/vlc/video_filter/libyuvp_plugin.so