r74 - in videolan/vlc/debian: . patches
xtophe-guest at alioth.debian.org
xtophe-guest at alioth.debian.org
Wed Mar 14 14:19:49 CET 2007
Author: xtophe-guest
Date: 2006-09-02 22:24:21 +0000 (Sat, 02 Sep 2006)
New Revision: 74
Added:
videolan/vlc/debian/patches/000_ltmain.diff
Modified:
videolan/vlc/debian/changelog
videolan/vlc/debian/control
videolan/vlc/debian/patches/series
videolan/vlc/debian/rules
Log:
synchronise with Debian unstable
Modified: videolan/vlc/debian/changelog
===================================================================
--- videolan/vlc/debian/changelog 2006-08-29 08:17:00 UTC (rev 73)
+++ videolan/vlc/debian/changelog 2006-09-02 22:24:21 UTC (rev 74)
@@ -17,7 +17,6 @@
+ Build-depends on libshout3-dev
* debian/patches
- + xulrunner patch has been applied upstream
+ Look at the debian default place for TLS certificates (Closes: #365239)
+ notify.patch: adapt the path for debian system
@@ -26,6 +25,38 @@
-- Christophe Mutricy <xtophe at videolan.org> Wed, 14 Jun 2006 23:16:42 +0100
+vlc (0.8.6-svn20060823.debian-3) unstable; urgency=low
+
+ * debian/control:
+ + Added missing build-dep on libdc1394-13-dev (Closes: #384568, #384582).
+ + Build-depend on a newer libcaca for better colour ASCII rendering.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 25 Aug 2006 11:19:00 +0200
+
+vlc (0.8.6-svn20060823.debian-2) unstable; urgency=low
+
+ * debian/control:
+ + Added missing build-dep on libraw1394-dev.
+ * debian/rules:
+ + Replaced --enable-livedotcom with --enable-live555.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 25 Aug 2006 09:37:47 +0200
+
+vlc (0.8.6-svn20060823.debian-1) unstable; urgency=low
+
+ * New upstream SVN snapshot.
+ * debian/rules:
+ + Distribute a shared version of libvlc.
+ + Activated the twolame encoder.
+ * debian/control:
+ + Build-depend on a newer libavcodec so as to get WMV3 decoding support.
+ + Cleaned up package dependencies a bit.
+
+ * debian/patches/000_ltmain.diff:
+ + Work around libtool not wanting to install our plugins.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 24 Aug 2006 18:06:12 +0200
+
vlc (0.8.5.debian-2) unstable; urgency=low
* debian/rules:
Modified: videolan/vlc/debian/control
===================================================================
--- videolan/vlc/debian/control 2006-08-29 08:17:00 UTC (rev 73)
+++ videolan/vlc/debian/control 2006-09-02 22:24:21 UTC (rev 74)
@@ -2,7 +2,7 @@
Section: graphics
Priority: optional
Maintainer: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
-Build-Depends: debhelper (>= 5.0), dh-buildinfo, quilt, nasm, yasm [amd64], gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7), xulrunner, libxul-dev, xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), libasound2-dev (>= 0.9.0beta10a), libaudiofile-dev, libavahi-client-dev, libavcodec-dev (>= 0.cvs20060329-4), libavformat-dev (>= 0.cvs20060329-4), libcaca-dev (>= 0.9), libcdio-dev, libdvbpsi4-dev, libdvdnav-dev, libdvdread-dev (>=0.9.5), libdts-dev, libesd0-dev, libflac-dev (>= 1.1.2-3), libfreetype6-dev, libfribidi-dev, libggi2-dev, libglib2.0-0, libglide2-dev [i386], libgnutls-dev (>= 1.2.8), libhal-dev (>= 0.5.5.1-3), libid3tag0-dev, libidl0, libimlib2-dev, liblircclient-dev, liblivemedia-dev (>= 2006.03.17), libmad0-dev, libmatroska-dev (>= 0.8.0), libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libncurses5-dev, libogg-dev, libshout3-dev, libpostproc-dev (>= 0.cvs20060329-4), libpng12-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libsmbclient-dev, libsvga1-dev [i386], libsysfs-dev, libtar-dev, libtheora-dev, libvcdinfo-dev, libvorbis-dev, libwxgtk2.6-dev, libx11-dev, libxext-dev, libxml2-dev, libxt-dev, libxv-dev, libxosd-dev, zlib1g-dev, libavc1394-dev
+Build-Depends: debhelper (>= 5.0), dh-buildinfo, quilt, nasm, yasm [amd64], gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7), xulrunner, libxul-dev, xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), libasound2-dev (>= 0.9.0beta10a), libaudiofile-dev, libavahi-client-dev, libavcodec-dev (>= 0.cvs20060823-1), libavformat-dev (>= 0.cvs20060823-1), libcaca-dev (>= 0.99), libcdio-dev, libdvbpsi4-dev, libdvdnav-dev, libdvdread-dev (>= 0.9.5), libdts-dev, libesd0-dev, libflac-dev (>= 1.1.2-3), libfreetype6-dev, libfribidi-dev, libggi2-dev, libglib2.0-0, libglide2-dev [i386], libgnutls-dev (>= 1.2.8), libhal-dev (>= 0.5.5.1-3), libid3tag0-dev, libidl0, libimlib2-dev, liblircclient-dev, liblivemedia-dev (>= 2006.03.17), libmad0-dev, libmatroska-dev (>= 0.8.0), libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libncurses5-dev, libogg-dev, libpostproc-dev (>= 0.cvs20060823-1), libpng12-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libsmbclient-dev, libsvga1-dev [i386], libsysfs-dev, libtar-dev, libtheora-dev, libvcdinfo-dev, libvorbis-dev, libwxgtk2.6-dev, libx11-dev, libxext-dev, libxml2-dev, libxt-dev, libxv-dev, zlib1g-dev, libavc1394-dev, libraw1394-dev, libdc1394-13-dev, libxosd-dev, libtwolame-dev (>= 0.3.8-1), libshout3-dev
Standards-Version: 3.7.2
Package: vlc
@@ -57,7 +57,7 @@
Package: vlc-plugin-esd
Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: vlc-esd (<< 0.5.0)
Replaces: vlc-esd (<< 0.5.0)
Description: Esound audio output plugin for VLC
@@ -81,7 +81,7 @@
Package: vlc-plugin-sdl
Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${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
@@ -96,7 +96,7 @@
Package: vlc-plugin-ggi
Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: vlc-ggi (<< 0.5.0)
Replaces: vlc-ggi (<< 0.5.0)
Description: GGI video output plugin for VLC
@@ -110,7 +110,7 @@
Package: vlc-plugin-glide
Architecture: i386
-Depends: vlc (= ${Source-Version}), libglide2
+Depends: ${shlibs:Depends}, libglide2
Conflicts: vlc-glide (<< 0.5.0)
Replaces: vlc-glide (<< 0.5.0)
Description: Glide video output plugin for VLC
@@ -124,7 +124,7 @@
Package: vlc-plugin-arts
Architecture: any
-Depends: vlc (= ${Source-Version}), libartsc0, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: vlc-arts (<< 0.5.0)
Replaces: vlc-arts (<< 0.5.0)
Description: aRts audio output plugin for VLC
@@ -138,7 +138,7 @@
Package: mozilla-plugin-vlc
Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${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
@@ -152,7 +152,7 @@
Package: vlc-plugin-svgalib
Architecture: i386
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${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
Copied: videolan/vlc/debian/patches/000_ltmain.diff (from rev 72, unstable/vlc/debian/patches/000_ltmain.diff)
Modified: videolan/vlc/debian/patches/series
===================================================================
--- videolan/vlc/debian/patches/series 2006-08-29 08:17:00 UTC (rev 73)
+++ videolan/vlc/debian/patches/series 2006-09-02 22:24:21 UTC (rev 74)
@@ -1,3 +1,4 @@
+000_ltmain.diff
010_no-wx-updates.diff
010_osdmenu-paths.diff
020_freetype_font.diff
Modified: videolan/vlc/debian/rules
===================================================================
--- videolan/vlc/debian/rules 2006-08-29 08:17:00 UTC (rev 73)
+++ videolan/vlc/debian/rules 2006-09-02 22:24:21 UTC (rev 74)
@@ -17,6 +17,7 @@
#
vlc_confflags = --enable-release --prefix=/usr
vlc_confflags += \
+ --enable-libtool \
--disable-gnome \
--disable-gtk \
--disable-familiar \
@@ -73,6 +74,7 @@
--enable-vcdx \
--enable-xosd \
--enable-debug \
+ --enable-twolame \
$(NULL)
# --enable-ncurses \
@@ -180,6 +182,9 @@
DESTDIR=`pwd`/debian/vlc/ $(MAKE) install prefix=/usr
+ # Clean up libtool crap
+ find debian/vlc -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
@@ -192,39 +197,39 @@
# Package: libvlc0-dev
mv debian/vlc/usr/bin/vlc-config debian/libvlc0-dev/usr/bin/
- mv debian/vlc/usr/lib/*.a debian/libvlc0-dev/usr/lib/
- mv debian/vlc/usr/lib/vlc/*.a debian/libvlc0-dev/usr/lib/vlc/
+ 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
ln -s vlc debian/vlc-plugin-esd/usr/share/doc/vlc-plugin-esd
- mv debian/vlc/usr/lib/vlc/audio_output/libesd_plugin.so \
+ 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 \
+ 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 \
+ 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 \
+ mv debian/vlc/usr/lib/vlc/video_output/libggi_plugin.so* \
debian/vlc-plugin-ggi/usr/lib/vlc/video_output/
# Package: vlc-plugin-glide
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 \
+ mv debian/vlc/usr/lib/vlc/video_output/libglide_plugin.so* \
debian/vlc-plugin-glide/usr/lib/vlc/video_output/
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 \
+ mv debian/vlc/usr/lib/vlc/audio_output/libarts_plugin.so* \
debian/vlc-plugin-arts/usr/lib/vlc/audio_output/
# Package: mozilla-plugin-vlc
@@ -239,7 +244,7 @@
# 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 \
+ mv debian/vlc/usr/lib/vlc/video_output/libsvgalib_plugin.so* \
debian/vlc-plugin-svgalib/usr/lib/vlc/video_output
endif
@@ -279,10 +284,10 @@
dh_strip -s --dbg-package=vlc-dbg
dh_compress -s
dh_fixperms -s
- dh_makeshlibs -s
+ dh_makeshlibs -pvlc -V 'vlc (>= 0.8.6-svn20060823.debian-1)'
dh_installdeb -s
# dh_perl
- dh_shlibdeps -s
+ dh_shlibdeps -s -ldebian/vlc/usr/lib
dh_gencontrol -s
dh_md5sums -s
dh_builddeb -s
More information about the Pkg-multimedia-commits
mailing list