r248 - in videolan/vlc/debian: . patches
Christophe Mutricy
xtophe-guest at alioth.debian.org
Sat Mar 24 19:15:15 CET 2007
Author: xtophe-guest
Date: 2007-03-24 18:15:14 +0000 (Sat, 24 Mar 2007)
New Revision: 248
Added:
videolan/vlc/debian/libvlc0-dev.links
videolan/vlc/debian/mozilla-plugin-vlc.links
videolan/vlc/debian/patches/100_no_wx_updates.diff
videolan/vlc/debian/patches/101_certificates_paths.diff
videolan/vlc/debian/patches/102_dejavu_font.diff
videolan/vlc/debian/patches/104_notify.diff
videolan/vlc/debian/patches/200_osdmenu_paths.diff
videolan/vlc/debian/patches/300_manpage_syntax.diff
videolan/vlc/debian/vlc-nox.links
videolan/vlc/debian/vlc-plugin-arts.links
videolan/vlc/debian/vlc-plugin-esd.links
videolan/vlc/debian/vlc-plugin-ggi.links
videolan/vlc/debian/vlc-plugin-glide.links
videolan/vlc/debian/vlc-plugin-sdl.links
videolan/vlc/debian/vlc-plugin-svgalib.links
videolan/vlc/debian/vlc.links
Removed:
videolan/vlc/debian/patches/010_no-wx-updates.diff
videolan/vlc/debian/patches/010_osdmenu-paths.diff
videolan/vlc/debian/patches/020_certificates_paths.diff
videolan/vlc/debian/patches/020_dejavu_font.diff
videolan/vlc/debian/patches/020_notify.diff
Modified:
videolan/vlc/debian/changelog
videolan/vlc/debian/control
videolan/vlc/debian/files
videolan/vlc/debian/libvlc1-dev.install
videolan/vlc/debian/mozilla-plugin-vlc.dirs
videolan/vlc/debian/patches/series
videolan/vlc/debian/rules
videolan/vlc/debian/vlc-nox.dirs
Log:
* merge the latest changes in Sid
* restart Changelog
Modified: videolan/vlc/debian/changelog
===================================================================
--- videolan/vlc/debian/changelog 2007-03-23 21:45:50 UTC (rev 247)
+++ videolan/vlc/debian/changelog 2007-03-24 18:15:14 UTC (rev 248)
@@ -1,59 +1,103 @@
-vlc (0.9.0-svn12) experimental; urgency=low
+vlc (0.9.0-svn1-1) unstable; urgency=low
- * debian/control:
- + Build-depend on libx264-dev.
- + Build-depend on libfaad-dev
- * debian/rules:
- + Now that they are in unstable, no longer build our custom x264 and faad.
- + Fix a kFreeBSD FTBFS, courtesy of Petr Salinger (Closes: #399713).
+ [Christophe Mutricy]
+ * debian/control
+ + SONAME change.
+ + Replaces/Conficts between vlc and vlc-nox. It should help the
+ transition between sid and nightlies.
+ * Build-depends on libshout3-dev, libqt4-dev and libqt4-dev-tools
+ * debian/rules
+ + activate QT4 interface
+ + activate shout access output
+ * vlc-nox.install
+ + teletex
+ + faad
+ + x264
+ + memcpy*
+ + sharpen
+ + puzzle
+ + colorthres
+ * Install libvlc-control.so in libvlc1
+ * bug/* + relevant symlinks
+ + Add reportbug magic to avoid bug being reported to Debian's BTS
- -- Christophe Mutricy <xtophe at videolan.org> Mon, 12 Mar 2007 20:50:04 +0000
+ [Mohammed Adnène Trojette]
+ * Add a vlc-dbg package with debugging symbols for vlc.
+ + debian/control:
+ * add a vlc-dbg entry
+ * bump dependency on debhelper to 5
+ + debian/rules:
+ * call dh_strip with --dbg-package=vlc-dbg
+ * add --enable-debug flag
+ + debian/compat: bump to compatibility 5
+
+ -- Christophe Mutricy <xtophe at videolan.org> Sat, 24 Mar 2007 00:10:00 +0000
-vlc (0.9.0-svn11) experimental; urgency=low
+vlc (0.8.6.a.debian-6) unstable; urgency=low
- * replaces/Conficts between vlc and vlc-nox. It should help the
- transition between sid and nightlies.
+ * Rebuilt package against packages that are in unstable (Closes: #415446).
- -- Christophe Mutricy <xtophe at videolan.org> Tue, 13 Feb 2007 22:52:53 +0000
+ * debian/control:
+ + Use ${binary:Version} instead of ${Source-Version}.
+ + Build-depend on dpkg-dev (>= 1.13.19).
-vlc (0.9.0-svn10) experimental; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 20 Mar 2007 14:50:43 +0100
- * Add sharpen video filter to vlc-nox
+vlc (0.8.6.a.debian-5) unstable; urgency=low
- -- Christophe Mutricy <xtophe at videolan.org> Mon, 5 Feb 2007 12:28:34 +0100
+ * Refreshed and renamed all patches.
-vlc (0.9.0-svn9) experimental; urgency=low
+ * debian/control:
+ + Set pkg-multimedia-maintainers as main maintainer.
+ + Fixed Vcs fields.
+ * debian/compat:
+ + Set compat to 5.
+ * debian/rules:
+ + Big cleanup.
+ + Distribute libvlc.a again.
+ + Switch to AM_MAINTAINER_MODE instead of touching all files.
- * Add teletex module (telx) to vlc-nox
+ * debian/patches/106_xshm_check.diff:
+ + New patch. Don't crash if XShmAttach fails, instead fall back to
+ normal X images (Closes: #404361).
- -- Christophe Mutricy <xtophe at videolan.org> Thu, 18 Jan 2007 11:37:31 +0100
+ * debian/patches/300_manpage_syntax.diff:
+ + New patch. Fix dvd:// syntax in manpage (Closes: #412372) and add
+ mention of the videolan-doc package.
-vlc (0.9.0-svn8) experimental; urgency=low
-
- * faad and x264 are now modules
- * accelerated memcpy are now modules
-
- -- Christophe Mutricy <xtophe at videolan.org> Fri, 5 Jan 2007 23:51:16 +0000
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sat, 17 Mar 2007 19:46:52 +0100
-vlc (0.9.0-svn7) experimental; urgency=low
+vlc (0.8.6.a.debian-4) unstable; urgency=low
- * The mozilla plugin no longer needs a .xpt (Closes: #403022)
+ * *sigh*, libfaad-dev build-depend was in fact missing.
- -- Christophe Mutricy <xtophe at videolan.org> Fri, 15 Dec 2006 14:27:32 +0000
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 13 Mar 2007 10:39:04 +0100
-vlc (0.9.0-svn6) experimental; urgency=low
+vlc (0.8.6.a.debian-3) unstable; urgency=low
- * Refresh gnutls patch
+ * debian/control:
+ + Add XS-Vcs-Browser field.
+ + Build-depend on libx264-dev.
+ + Build-depend on libfaad-dev.
+ * debian/rules:
+ + Now that they're in unstable, no longer build our custom x264 and faad2.
- -- Christophe Mutricy <xtophe at videolan.org> Sat, 9 Dec 2006 23:34:17 +0000
+ * debian/patches/030_audio_format_crash.diff:
+ + Patch from upstream to fix multiple crashes with audio conversions.
-vlc (0.9.0-svn5) experimental; urgency=low
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 12 Mar 2007 16:41:06 +0100
- * SONAME change.
+vlc (0.8.6.a.debian-2) unstable; urgency=high
- -- Christophe Mutricy <xtophe at videolan.org> Wed, 22 Nov 2006 22:45:02 +0000
+ * debian/patches/021_x264_powerpc.diff:
+ + Patch from upstream to fix FTBFS on PowerPC (Closes: #411438).
+ * debian/rules:
+ + Fix a kFreeBSD FTBFS, courtesy of Petr Salinger (Closes: #399713).
-vlc (0.8.6a.debian-1) unstable; urgency=high
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 21 Feb 2007 12:12:02 +0100
+
+vlc (0.8.6.a.debian-1) unstable; urgency=high
+
* New upstream bugfix release.
* Most of our patches are now in sync with upstream. Removed:
+ 000_bootstrap.diff
@@ -87,11 +131,13 @@
* Maintainer upload.
* Acknowledge previous NMUs by Andreas Barth. Thanks.
(Closes: #405425, #400720, #403022).
-
+
* debian/control:
+ Put back mozilla-plugin-vlc package.
+
* debian/rules:
+ Build with mediacontrol bindings, needed for the Mozilla plugin.
+
* 020_kfreebsd.diff:
+ New patch courtesy of Petr Salinger. Fix a GNU/kFreeBSD FTBFS
(Closes: #399713).
@@ -160,52 +206,69 @@
* patch-utf8-0.8.6debian-0.8.6a.diff:
+ Fix Unicode support in GUIs and file access.
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 8 Jan 2007 09:43:07+0100
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 8 Jan 2007 09:43:07 +0100
-vlc (0.9.0-svn4) experimental; urgency=low
+vlc (0.8.6-svn20061012.debian-1.2) unstable; urgency=high
- * Install puzzle and colorthres plugins in vlc-nox
- * Install libvlc-control.so in libvlc0
+ * Non-maintainer upload.
+ * Fix format string vulnerability with patch
+ MOAB-02-01-2007-CVE-2007-0017.patch, CVE-2007-0017. Closes: #405425
- -- Christophe Mutricy <xtophe at videolan.org> Sun, 19 Nov 2006 23:21:33 +0000
+ -- Andreas Barth <aba at not.so.argh.org> Sat, 6 Jan 2007 23:07:51 +0000
-vlc (0.9.0-svn3) experimental; urgency=low
+vlc (0.8.6-svn20061012.debian-1.1) unstable; urgency=high
- * debian/patches/020_notify.diff: sync patch with HEAD.
+ * Non-maintainer upload.
+ * remove broken package mozilla-plugin-vlc. Closes: #400720, #403022
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 18 Oct 2006 21:08:46 +0200
+ -- Andreas Barth <aba at not.so.argh.org> Sat, 23 Dec 2006 19:17:40 +0000
-vlc (0.9.0-svn2) experimental; urgency=low
+vlc (0.8.6-svn20061101.debian-1) UNRELEASED; urgency=high
- * Disable XOSD and enable libnotify
- * Integrate the reportbug patch so it will be less a pain to maintain
- * Enable the QT4 GUI
+ * New upstream SVN snapshot.
- -- Christophe Mutricy <xtophe at videolan.org> Wed, 20 Sep 2006 15:59:28 +0200
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 1 Nov 2006 10:50:17 +0100
-vlc (0.9.0-svn1) experimental; urgency=low
+vlc (0.8.6-svn20061012.debian-1) unstable; urgency=low
- * Add a vlc-dbg package with debugging symbols for vlc.
- + debian/control:
- * add a vlc-dbg entry
- * bump dependency on debhelper to 5
- + debian/rules:
- * call dh_strip with --dbg-package=vlc-dbg
- * add --enable-debug flag
- + debian/compat: bump to compatibility 5
+ * New upstream SVN snapshot.
+ * Upstream fixed the BadWindow request issue (Closes: #392207).
- -- Mohammed Adnène Trojette <adn+deb at diwi.org> Fri, 16 Jun 2006 22:44:24 +0200
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 12 Oct 2006 20:43:45 +0200
-vlc (0.9.0-svn) experimental; urgency=low
+vlc (0.8.6-svn20061008.debian-1) unstable; urgency=high
- * debian/control
- + Build-depends on libshout3-dev
+ * New upstream SVN snapshot. Fixes a heap smashing bug.
+ * debian/control:
+ + Build-depend on libgtk2.0-dev to work around #388521 (Closes: #391739).
+ + Replace XS-X-Vcs-Svn with -XS-Vcs-Svn.
- * debian/patches
- + notify.patch: adapt the path for debian system
+ * debian/patches/020_notify.diff:
+ + Fix notify support. Thanks to Christophe Mutricy.
- -- Christophe Mutricy <xtophe at videolan.org> Wed, 14 Jun 2006 23:16:42 +0100
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 8 Oct 2006 18:54:30 +0200
+vlc (0.8.6-svn20061001.debian-4) unstable; urgency=low
+
+ * Build-depend on libnotify and explicitly activate the libnotify plugin
+ (Closes: #391308).
+ * Re-enable DV support. libraw1394 is not waiting for us anyway.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 6 Oct 2006 10:24:26 +0200
+
+vlc (0.8.6-svn20061001.debian-2) unstable; urgency=high
+
+ * Temporarily disable DV support because the libraw1394 transition does
+ not look like it will happen soon.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 4 Oct 2006 14:00:16 +0200
+
+vlc (0.8.6-svn20061001.debian-1) unstable; urgency=low
+
+ * New upstream SVN snapshot.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 1 Oct 2006 17:57:57 +0200
+
vlc (0.8.6-svn20060925.debian-1) unstable; urgency=low
[ Sam Hocevar ]
@@ -375,6 +438,7 @@
vlc (0.8.5-test3.debian-2) unstable; urgency=low
* debian/control:
+ + Added missing libavc1394-dev build-dependency.
* debian/patches/030_x264_altivec.diff:
+ Fixed illegal implicit casts of vector types.
Modified: videolan/vlc/debian/control
===================================================================
--- videolan/vlc/debian/control 2007-03-23 21:45:50 UTC (rev 247)
+++ videolan/vlc/debian/control 2007-03-24 18:15:14 UTC (rev 248)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: VideoLAN <vlc-devel at videolan.org>
Uploaders: Christophe Mutricy <xtophe at videolan.org>
-Build-Depends: debhelper (>= 5.0), dh-buildinfo, quilt, nasm, yasm [amd64 kfreebsd-amd64], gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], xulrunner, libxul-dev, xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudiofile-dev, libavahi-client-dev, libavcodec-dev (>= 0.cvs20060823-1), libavformat-dev (>= 0.cvs20060823-1), libcaca-dev (>= 0.99.beta4-1), 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) [!kfreebsd-i38+6 !kfreebsd-amd64 !hurd-i386], 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 [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libnotify-dev, libtwolame-dev (>= 0.3.8-1), libspeex-dev, libsdl-image1.2-dev, libshout3-dev, libqt4-dev, qt4-dev-tools, libx264-dev, libfaad-dev
+Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 5.0), dh-buildinfo, quilt, nasm, yasm [amd64 kfreebsd-amd64], gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], xulrunner, libxul-dev, xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudiofile-dev, libavahi-client-dev, libavcodec-dev (>= 0.cvs20060823-1), libavformat-dev (>= 0.cvs20060823-1), libcaca-dev (>= 0.99.beta4-1), 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) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], 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 [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libnotify-dev, libtwolame-dev (>= 0.3.8-1), libspeex-dev, libsdl-image1.2-dev, libshout3-dev, libqt4-dev, qt4-dev-tools, libx264-dev, libfaad-dev
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/videolan/vlc/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/
@@ -11,7 +11,7 @@
Package: vlc
Section: graphics
Architecture: any
-Depends: vlc-nox (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}, ttf-dejavu
+Depends: vlc-nox (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ttf-dejavu
Recommends: videolan-doc
Suggests: mozilla-plugin-vlc
Replaces: vlc-nox (<<${Source-Version}), 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)
@@ -90,7 +90,7 @@
Package: libvlc1-dev
Section: libdevel
Architecture: any
-Depends: libvlc1 (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libvlc1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: libvlc0-dev
Conflicts: libvlc0-dev
Description: development files for VLC
@@ -184,7 +184,7 @@
Package: mozilla-plugin-vlc
Architecture: any
-Depends: vlc-nox (= ${Source-Version}), vlc, ${shlibs:Depends}, ${misc:Depends}
+Depends: vlc-nox (= ${binary: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
@@ -198,7 +198,7 @@
Package: vlc-plugin-svgalib
Architecture: i386
-Depends: vlc-nox (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: vlc-nox (= ${binary: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
Modified: videolan/vlc/debian/files
===================================================================
--- videolan/vlc/debian/files 2007-03-23 21:45:50 UTC (rev 247)
+++ videolan/vlc/debian/files 2007-03-24 18:15:14 UTC (rev 248)
@@ -1,15 +1,14 @@
-vlc_0.8.4-test2-2_i386.deb graphics optional
-libvlc0-dev_0.8.4-test2-2_i386.deb libdevel optional
-gnome-vlc_0.8.4-test2-2_i386.deb oldlibs optional
-gvlc_0.8.4-test2-2_i386.deb oldlibs optional
-vlc-plugin-esd_0.8.4-test2-2_i386.deb graphics optional
-vlc-plugin-alsa_0.8.4-test2-2_i386.deb graphics optional
-vlc-plugin-sdl_0.8.4-test2-2_i386.deb graphics optional
-vlc-plugin-ggi_0.8.4-test2-2_i386.deb graphics optional
-vlc-plugin-glide_0.8.4-test2-2_i386.deb graphics optional
-qvlc_0.8.4-test2-2_i386.deb oldlibs optional
-vlc-plugin-arts_0.8.4-test2-2_i386.deb graphics optional
-mozilla-plugin-vlc_0.8.4-test2-2_i386.deb graphics optional
-kvlc_0.8.4-test2-2_i386.deb oldlibs optional
-vlc-plugin-svgalib_0.8.4-test2-2_i386.deb graphics optional
-wxvlc_0.8.4-test2-2_i386.deb graphics optional
+vlc-plugin-alsa_0.9.0-svn1-1_all.deb graphics optional
+wxvlc_0.9.0-svn1-1_all.deb graphics optional
+vlc_0.9.0-svn1-1_i386.deb graphics optional
+vlc-dbg_0.9.0-svn1-1_i386.deb graphics optional
+vlc-nox_0.9.0-svn1-1_i386.deb net optional
+libvlc1_0.9.0-svn1-1_i386.deb libs optional
+libvlc1-dev_0.9.0-svn1-1_i386.deb libdevel optional
+vlc-plugin-esd_0.9.0-svn1-1_i386.deb graphics optional
+vlc-plugin-sdl_0.9.0-svn1-1_i386.deb graphics optional
+vlc-plugin-ggi_0.9.0-svn1-1_i386.deb graphics optional
+vlc-plugin-glide_0.9.0-svn1-1_i386.deb graphics optional
+vlc-plugin-arts_0.9.0-svn1-1_i386.deb graphics optional
+mozilla-plugin-vlc_0.9.0-svn1-1_i386.deb graphics optional
+vlc-plugin-svgalib_0.9.0-svn1-1_i386.deb graphics optional
Copied: videolan/vlc/debian/libvlc0-dev.links (from rev 219, unstable/vlc/debian/libvlc0-dev.links)
===================================================================
--- unstable/vlc/debian/libvlc0-dev.links 2007-03-17 10:25:10 UTC (rev 219)
+++ videolan/vlc/debian/libvlc0-dev.links 2007-03-24 18:15:14 UTC (rev 248)
@@ -0,0 +1,2 @@
+/usr/share/doc/libvlc1 /usr/share/doc/libvlc1-dev
+/usr/share/bug/libvlc1 /usr/share/bug/libvlc1-dev
Modified: videolan/vlc/debian/libvlc1-dev.install
===================================================================
--- videolan/vlc/debian/libvlc1-dev.install 2007-03-23 21:45:50 UTC (rev 247)
+++ videolan/vlc/debian/libvlc1-dev.install 2007-03-24 18:15:14 UTC (rev 248)
@@ -1,3 +1,4 @@
usr/bin/vlc-config
usr/lib/*.so
+usr/lib/*.a
usr/include/vlc/*.h
Modified: videolan/vlc/debian/mozilla-plugin-vlc.dirs
===================================================================
--- videolan/vlc/debian/mozilla-plugin-vlc.dirs 2007-03-23 21:45:50 UTC (rev 247)
+++ videolan/vlc/debian/mozilla-plugin-vlc.dirs 2007-03-24 18:15:14 UTC (rev 248)
@@ -1,3 +1,3 @@
-usr/lib
+usr/lib/mozilla-firefox/plugins
usr/share/doc
usr/share/bug
Copied: videolan/vlc/debian/mozilla-plugin-vlc.links (from rev 219, unstable/vlc/debian/mozilla-plugin-vlc.links)
===================================================================
--- unstable/vlc/debian/mozilla-plugin-vlc.links 2007-03-17 10:25:10 UTC (rev 219)
+++ videolan/vlc/debian/mozilla-plugin-vlc.links 2007-03-24 18:15:14 UTC (rev 248)
@@ -0,0 +1,3 @@
+/usr/share/doc/vlc /usr/share/doc/mozilla-plugin-vlc
+/usr/share/bug/vlc /usr/share/bug/mozilla-plugin-vlc
+/usr/lib/mozilla/plugins/libvlcplugin.so /usr/lib/mozilla-firefox/plugins/libvlcplugin.so
Deleted: videolan/vlc/debian/patches/010_no-wx-updates.diff
===================================================================
--- videolan/vlc/debian/patches/010_no-wx-updates.diff 2007-03-23 21:45:50 UTC (rev 247)
+++ videolan/vlc/debian/patches/010_no-wx-updates.diff 2007-03-24 18:15:14 UTC (rev 248)
@@ -1,15 +0,0 @@
-Index: vlc-0.8.5-test3.debian/modules/gui/wxwidgets/interface.cpp
-===================================================================
---- vlc-0.8.5-test3.debian.orig/modules/gui/wxwidgets/interface.cpp 2006-04-19 09:25:08.000000000 +0200
-+++ vlc-0.8.5-test3.debian/modules/gui/wxwidgets/interface.cpp 2006-04-24 16:21:44.000000000 +0200
-@@ -603,8 +603,8 @@
- /* Create the "Help" menu */
- wxMenu *help_menu = new wxMenu;
- help_menu->Append( About_Event, wxU(_("About...")) );
-- help_menu->AppendSeparator();
-- help_menu->Append( UpdateVLC_Event, wxU(_("Check for Updates...")) );
-+// help_menu->AppendSeparator();
-+// help_menu->Append( UpdateVLC_Event, wxU(_("Check for Updates...")) );
-
- /* Append the freshly created menus to the menu bar... */
- wxMenuBar *menubar = new wxMenuBar();
Deleted: videolan/vlc/debian/patches/010_osdmenu-paths.diff
===================================================================
--- videolan/vlc/debian/patches/010_osdmenu-paths.diff 2007-03-23 21:45:50 UTC (rev 247)
+++ videolan/vlc/debian/patches/010_osdmenu-paths.diff 2007-03-24 18:15:14 UTC (rev 248)
@@ -1,33 +0,0 @@
-Index: vlc-0.8.5-test3.debian/share/osdmenu/default.cfg
-===================================================================
---- vlc-0.8.5-test3.debian.orig/share/osdmenu/default.cfg 2006-04-19 09:25:02.000000000 +0200
-+++ vlc-0.8.5-test3.debian/share/osdmenu/default.cfg 2006-04-24 16:21:46.000000000 +0200
-@@ -1,4 +1,4 @@
--dir share/osdmenu/default
-+dir /usr/share/vlc/osdmenu/default
- action key-play-pause (0,0)
- unselect unselected.png
- select selection/play_pause.png
-Index: vlc-0.8.5-test3.debian/share/osdmenu/dvd.cfg
-===================================================================
---- vlc-0.8.5-test3.debian.orig/share/osdmenu/dvd.cfg 2006-04-19 09:25:02.000000000 +0200
-+++ vlc-0.8.5-test3.debian/share/osdmenu/dvd.cfg 2006-04-24 16:21:46.000000000 +0200
-@@ -1,4 +1,4 @@
--dir share/osdmenu/dvd
-+dir /usr/share/vlc/osdmenu/dvd
- action key-play (0,0)
- unselect unselect/barroff.png
- select selection/play.png
-Index: vlc-0.8.5-test3.debian/modules/video_filter/osdmenu.c
-===================================================================
---- vlc-0.8.5-test3.debian.orig/modules/video_filter/osdmenu.c 2006-04-19 09:25:11.000000000 +0200
-+++ vlc-0.8.5-test3.debian/modules/video_filter/osdmenu.c 2006-04-24 16:21:46.000000000 +0200
-@@ -92,7 +92,7 @@
- #if defined( WIN32 ) || defined( UNDER_CE )
- #define OSD_DEFAULT_CFG "osdmenu/default.cfg"
- #else
--#define OSD_DEFAULT_CFG "share/osdmenu/default.cfg"
-+#define OSD_DEFAULT_CFG "/usr/share/vlc/osdmenu/default.cfg"
- #endif
-
- #define OSD_UPDATE_MIN 0
Deleted: videolan/vlc/debian/patches/020_certificates_paths.diff
===================================================================
--- videolan/vlc/debian/patches/020_certificates_paths.diff 2007-03-23 21:45:50 UTC (rev 247)
+++ videolan/vlc/debian/patches/020_certificates_paths.diff 2007-03-24 18:15:14 UTC (rev 248)
@@ -1,15 +0,0 @@
-Index: vlc-trunk/modules/misc/gnutls.c
-===================================================================
---- vlc-trunk/modules/misc/gnutls.c (revision 18345)
-+++ vlc-trunk/modules/misc/gnutls.c (working copy)
-@@ -728,6 +728,10 @@
- sprintf (path, "%s/ca-certificates.crt", datadir);
- gnutls_Addx509File ((vlc_object_t *)p_session,
- p_sys->x509_cred, path, VLC_FALSE);
-+ gnutls_Addx509File( (vlc_object_t *)p_session,
-+ p_sys->x509_cred,
-+ "/etc/ssl/certs/ca-certificates.crt",VLC_FALSE );
-+
- p_session->pf_handshake2 = gnutls_HandshakeAndValidate;
- }
- else
Deleted: videolan/vlc/debian/patches/020_dejavu_font.diff
===================================================================
--- videolan/vlc/debian/patches/020_dejavu_font.diff 2007-03-23 21:45:50 UTC (rev 247)
+++ videolan/vlc/debian/patches/020_dejavu_font.diff 2007-03-24 18:15:14 UTC (rev 248)
@@ -1,13 +0,0 @@
-Index: vlc-0.8.5-test3.debian/modules/misc/freetype.c
-===================================================================
---- vlc-0.8.5-test3.debian.orig/modules/misc/freetype.c 2006-04-24 18:20:14.000000000 +0200
-+++ vlc-0.8.5-test3.debian/modules/misc/freetype.c 2006-04-24 18:20:21.000000000 +0200
-@@ -55,7 +55,7 @@
- #define DEFAULT_FONT "" /* Default font found at run-time */
- #define FC_DEFAULT_FONT "Arial"
- #else
--#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
-+#define DEFAULT_FONT "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf"
- #define FC_DEFAULT_FONT "Serif Bold"
- #endif
-
Deleted: videolan/vlc/debian/patches/020_notify.diff
===================================================================
--- videolan/vlc/debian/patches/020_notify.diff 2007-03-23 21:45:50 UTC (rev 247)
+++ videolan/vlc/debian/patches/020_notify.diff 2007-03-24 18:15:14 UTC (rev 248)
@@ -1,13 +0,0 @@
-Index: vlc/modules/misc/notify/notify.c
-===================================================================
---- vlc/modules/misc/notify/notify.c (revision 15844)
-+++ vlc/modules/misc/notify/notify.c (revision 15843)
-@@ -180,7 +178,7 @@
- NotifyNotification * notification;
- notification = notify_notification_new( _("Now Playing"),
- psz_temp,
-- DATA_PATH "/vlc48x48.png",NULL);
-+ "/usr/share/pixmaps/vlc.png",NULL);
- notify_notification_set_timeout( notification,
- config_GetInt(p_this, "notify-timeout") );
- notify_notification_set_urgency( notification, NOTIFY_URGENCY_LOW );
Copied: videolan/vlc/debian/patches/100_no_wx_updates.diff (from rev 219, unstable/vlc/debian/patches/100_no_wx_updates.diff)
Copied: videolan/vlc/debian/patches/101_certificates_paths.diff (from rev 219, unstable/vlc/debian/patches/101_certificates_paths.diff)
===================================================================
--- unstable/vlc/debian/patches/101_certificates_paths.diff 2007-03-17 10:25:10 UTC (rev 219)
+++ videolan/vlc/debian/patches/101_certificates_paths.diff 2007-03-24 18:15:14 UTC (rev 248)
@@ -0,0 +1,15 @@
+Index: vlc-trunk/modules/misc/gnutls.c
+===================================================================
+--- vlc-trunk/modules/misc/gnutls.c (revision 18345)
++++ vlc-trunk/modules/misc/gnutls.c (working copy)
+@@ -728,6 +728,10 @@
+ sprintf (path, "%s/ca-certificates.crt", datadir);
+ gnutls_Addx509File ((vlc_object_t *)p_session,
+ p_sys->x509_cred, path, VLC_FALSE);
++ gnutls_Addx509File( (vlc_object_t *)p_session,
++ p_sys->x509_cred,
++ "/etc/ssl/certs/ca-certificates.crt",VLC_FALSE );
++
+ p_session->pf_handshake2 = gnutls_HandshakeAndValidate;
+ }
+ else
Copied: videolan/vlc/debian/patches/102_dejavu_font.diff (from rev 219, unstable/vlc/debian/patches/102_dejavu_font.diff)
===================================================================
--- unstable/vlc/debian/patches/102_dejavu_font.diff 2007-03-17 10:25:10 UTC (rev 219)
+++ videolan/vlc/debian/patches/102_dejavu_font.diff 2007-03-24 18:15:14 UTC (rev 248)
@@ -0,0 +1,13 @@
+Index: vlc-0.8.5-test3.debian/modules/misc/freetype.c
+===================================================================
+--- vlc-0.8.5-test3.debian.orig/modules/misc/freetype.c 2006-04-24 18:20:14.000000000 +0200
++++ vlc-0.8.5-test3.debian/modules/misc/freetype.c 2006-04-24 18:20:21.000000000 +0200
+@@ -55,7 +55,7 @@
+ #define DEFAULT_FONT "" /* Default font found at run-time */
+ #define FC_DEFAULT_FONT "Arial"
+ #else
+-#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
++#define DEFAULT_FONT "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf"
+ #define FC_DEFAULT_FONT "Serif Bold"
+ #endif
+
Copied: videolan/vlc/debian/patches/104_notify.diff (from rev 219, unstable/vlc/debian/patches/104_notify.diff)
===================================================================
--- unstable/vlc/debian/patches/104_notify.diff 2007-03-17 10:25:10 UTC (rev 219)
+++ videolan/vlc/debian/patches/104_notify.diff 2007-03-24 18:15:14 UTC (rev 248)
@@ -0,0 +1,13 @@
+Index: vlc-0.8.6a.debian/modules/misc/notify/notify.c
+===================================================================
+--- vlc-0.8.6a.debian.orig/modules/misc/notify/notify.c 2007-01-03 19:27:57.000000000 +0100
++++ vlc-0.8.6a.debian/modules/misc/notify/notify.c 2007-01-11 18:30:48.000000000 +0100
+@@ -205,7 +205,7 @@
+ NotifyNotification * notification;
+ notification = notify_notification_new( _("Now Playing"),
+ psz_temp,
+- DATA_PATH "/vlc48x48.png",NULL);
++ "/usr/share/pixmaps/vlc.png",NULL);
+ notify_notification_set_timeout( notification,
+ config_GetInt(p_this, "notify-timeout") );
+ notify_notification_set_urgency( notification, NOTIFY_URGENCY_LOW );
Copied: videolan/vlc/debian/patches/200_osdmenu_paths.diff (from rev 219, unstable/vlc/debian/patches/200_osdmenu_paths.diff)
Copied: videolan/vlc/debian/patches/300_manpage_syntax.diff (from rev 232, unstable/vlc/debian/patches/300_manpage_syntax.diff)
===================================================================
--- unstable/vlc/debian/patches/300_manpage_syntax.diff 2007-03-17 20:59:53 UTC (rev 232)
+++ videolan/vlc/debian/patches/300_manpage_syntax.diff 2007-03-24 18:15:14 UTC (rev 248)
@@ -0,0 +1,17 @@
+Index: vlc-0.8.6.a.debian/doc/vlc.1
+===================================================================
+--- vlc-0.8.6.a.debian.orig/doc/vlc.1 2007-03-17 20:16:25.000000000 +0100
++++ vlc-0.8.6.a.debian/doc/vlc.1 2007-03-17 20:18:24.000000000 +0100
+@@ -69,7 +69,11 @@
+ (close VLC).
+
+ .SH SEE ALSO
+-.BR vls (1)
++The
++.B videolan-doc
++package contains comprehensive documents on how to use
++.B VLC
++both as a media player and as a streaming server.
+ .PP
+ Online documentation: http://www.videolan.org/doc/
+ .PP
Modified: videolan/vlc/debian/patches/series
===================================================================
--- videolan/vlc/debian/patches/series 2007-03-23 21:45:50 UTC (rev 247)
+++ videolan/vlc/debian/patches/series 2007-03-24 18:15:14 UTC (rev 248)
@@ -1,5 +1,5 @@
-010_no-wx-updates.diff
-010_osdmenu-paths.diff
-020_dejavu_font.diff
-020_certificates_paths.diff
-020_notify.diff
+100_no_wx_updates.diff
+101_certificates_paths.diff
+102_dejavu_font.diff
+104_notify.diff
+200_osdmenu_paths.diff
Modified: videolan/vlc/debian/rules
===================================================================
--- videolan/vlc/debian/rules 2007-03-23 21:45:50 UTC (rev 247)
+++ videolan/vlc/debian/rules 2007-03-24 18:15:14 UTC (rev 248)
@@ -10,13 +10,14 @@
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
confflags = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
#
# Compilation options
#
-vlc_confflags = --enable-release --prefix=/usr
-vlc_confflags += \
+confflags += --enable-maintaner-mode --enable-release --prefix=/usr
+confflags += \
--enable-libtool \
--disable-gnome \
--disable-gtk \
@@ -36,7 +37,6 @@
--disable-kde \
--enable-mp4 \
--enable-dvb \
- --enable-dv \
--disable-satellite \
--enable-ogg \
--enable-vorbis \
@@ -51,8 +51,6 @@
--enable-skins2 \
--enable-freetype \
--enable-mkv \
- --enable-v4l \
- --enable-pvr \
--enable-speex \
--enable-caca \
--enable-live555 \
@@ -80,51 +78,35 @@
--enable-faad \
$(NULL)
+# These ones are only for Linux
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+confflags += --enable-alsa --enable-dv --enable-v4l --enable-pvr
+endif
# Glide and svgalib are only for x86
ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),i386)
-vlc_confflags += --enable-glide
-vlc_confflags += --enable-svgalib
+confflags += --enable-glide
+confflags += --enable-svgalib
endif
# Remove --without-dvdcss in non-totalitarian countries
-vlc_confflags += --enable-dvd --without-dvdcss
+confflags += --enable-dvd --without-dvdcss
# A few shortcuts
VIDDIR = usr/share/vlc
PIXDIR = usr/share/pixmaps
-APPDIR = usr/share/applications
-
-#
-# Build rules
-#
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Patch package
- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
- # Touch stuff
- touch configure.ac
- touch aclocal.m4
- touch configure
- touch config.h.in
- touch `find . -name Makefile.in`
- # Configure VLC
- ./configure --mandir=$${prefix}/share/man \
- --infodir=$${prefix}/share/info $(confflags) $(vlc_confflags)
- touch configure-stamp
-
build: build-stamp
-build-stamp: configure-stamp
+build-stamp:
dh_testdir
-
- $(MAKE)
-
- # Minor test, to see which plugins were built and whether they load
- # properly.
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+ ./configure --enable-static --mandir=$${prefix}/share/man $(confflags)
+ $(MAKE) src/libvlc.la
+ cp src/.libs/libvlc.a src/libvlc.a
+ ./configure --mandir=$${prefix}/share/man $(confflags)
+ $(MAKE)
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ # Check which plugins were built and whether they load properly.
./vlc --reset-plugins-cache -l -I rc vlc:quit
endif
touch build-stamp
@@ -136,9 +118,10 @@
> debian/vlc-nox.install.kfreebsd-i386
cp debian/vlc-nox.install.kfreebsd-i386 \
debian/vlc-nox.install.kfreebsd-amd64
- rm -f configure-stamp build-stamp
+ rm -f build-stamp
# Clean VLC
-$(MAKE) distclean
+ rm -f src/libvlc.a
# Clean zsh completion stuff
rm -f extras/zsh
# Removed ugly cruft
@@ -155,29 +138,26 @@
dh_testroot
dh_clean -k
dh_installdirs
-
$(MAKE) install DESTDIR=`pwd`/debian/tmp/
-
+ cp src/libvlc.a debian/tmp/usr/lib
# Clean up libtool crap
find debian/tmp -name '*.la' -exec rm '{}' ';'
-
# 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
-
# 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
-
# Install stuff
dh_install -si --fail-missing --sourcedir=debian/tmp
-
- # Check that we did not install a plugin linked with libX11 in vlc-nox
+ # Clean up
+ rm -f debian/vlc/$(VIDDIR)/*.png
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ # Check that we did not install a plugin linked with libX11 in vlc-nox
BORKED=no; \
for file in $$(find debian/vlc-nox/usr/lib/vlc -name '*.so'); do \
if ldd $$file | grep -q libX11; then \
@@ -188,47 +168,6 @@
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
-
- # /usr/share/doc symlinks
- ln -s vlc debian/vlc-nox/usr/share/doc/vlc-nox
- ln -s libvlc1 debian/libvlc1-dev/usr/share/doc/libvlc1-dev
- ln -s vlc debian/vlc-plugin-esd/usr/share/doc/vlc-plugin-esd
- ln -s vlc debian/vlc-plugin-sdl/usr/share/doc/vlc-plugin-sdl
- ln -s vlc debian/vlc-plugin-ggi/usr/share/doc/vlc-plugin-ggi
- 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
- ln -s vlc debian/vlc-plugin-svgalib/usr/share/doc/vlc-plugin-svgalib
-endif
-
- # 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/
-
- cp debian/vlc/$(VIDDIR)/vlc.xpm debian/vlc/$(VIDDIR)/wxvlc.xpm
-
- # Report bug stuff
- cp debian/bug/* debian/vlc/usr/share/bug/vlc
- ln -s vlc debian/libvlc1-dev/usr/share/bug/libvlc1-dev
- ln -s vlc debian/libvlc1/usr/share/bug/libvlc1
- ln -s vlc debian/vlc-nox/usr/share/bug/vlc-nox
- ln -s vlc debian/vlc-plugin-esd/usr/share/bug/vlc-plugin-esd
- ln -s vlc debian/vlc-plugin-sdl/usr/share/bug/vlc-plugin-sdl
- ln -s vlc debian/vlc-plugin-ggi/usr/share/bug/vlc-plugin-ggi
- ln -s vlc debian/vlc-plugin-arts/usr/share/bug/vlc-plugin-arts
- ln -s vlc debian/mozilla-plugin-vlc/usr/share/bug/mozilla-plugin-vlc
-ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),i386)
- ln -s vlc debian/vlc-plugin-glide/usr/share/bug/vlc-plugin-glide
- ln -s vlc debian/vlc-plugin-svgalib/usr/share/bug/vlc-plugin-svgalib
-endif
-
- # Clean up
- rm -f debian/vlc/$(VIDDIR)/*.png
-
# Build architecture-independent files here.
binary-indep: build install
dh_testdir
@@ -245,18 +184,16 @@
binary-arch: build install
dh_testdir
dh_testroot
-# dh_installdebconf
+ dh_link -s
dh_installdocs -p vlc-nox
dh_installdocs -p libvlc1
dh_buildinfo -p vlc-nox
-# dh_installexamples
dh_installmenu -s
dh_installmime -s
dh_installman doc/vlc.1 -p vlc-nox
dh_installman doc/vlc-config.1 -p libvlc1-dev
dh_installchangelogs ChangeLog -p vlc-nox
dh_installchangelogs ChangeLog -p libvlc1
- dh_link -s
dh_strip -s --dbg-package=vlc-dbg
dh_compress -s
dh_fixperms -s
Modified: videolan/vlc/debian/vlc-nox.dirs
===================================================================
--- videolan/vlc/debian/vlc-nox.dirs 2007-03-23 21:45:50 UTC (rev 247)
+++ videolan/vlc/debian/vlc-nox.dirs 2007-03-24 18:15:14 UTC (rev 248)
@@ -12,6 +12,3 @@
usr/lib/vlc/video_filter
usr/lib/vlc/video_output
usr/lib/vlc/visualization
-usr/share/doc/vlc
-usr/share/man/man1
-usr/share/bug/vlc-nox
Copied: videolan/vlc/debian/vlc-nox.links (from rev 219, unstable/vlc/debian/vlc-nox.links)
===================================================================
--- unstable/vlc/debian/vlc-nox.links 2007-03-17 10:25:10 UTC (rev 219)
+++ videolan/vlc/debian/vlc-nox.links 2007-03-24 18:15:14 UTC (rev 248)
@@ -0,0 +1,2 @@
+/usr/share/doc/vlc /usr/share/doc/vlc-nox
+/usr/share/bug/vlc /usr/share/bug/vlc-nox
Copied: videolan/vlc/debian/vlc-plugin-arts.links (from rev 219, unstable/vlc/debian/vlc-plugin-arts.links)
===================================================================
--- unstable/vlc/debian/vlc-plugin-arts.links 2007-03-17 10:25:10 UTC (rev 219)
+++ videolan/vlc/debian/vlc-plugin-arts.links 2007-03-24 18:15:14 UTC (rev 248)
@@ -0,0 +1,2 @@
+/usr/share/doc/vlc /usr/share/doc/vlc-plugin-arts
+/usr/share/bug/vlc /usr/share/bug/vlc-plugin-arts
Copied: videolan/vlc/debian/vlc-plugin-esd.links (from rev 219, unstable/vlc/debian/vlc-plugin-esd.links)
===================================================================
--- unstable/vlc/debian/vlc-plugin-esd.links 2007-03-17 10:25:10 UTC (rev 219)
+++ videolan/vlc/debian/vlc-plugin-esd.links 2007-03-24 18:15:14 UTC (rev 248)
@@ -0,0 +1,2 @@
+/usr/share/doc/vlc /usr/share/doc/vlc-plugin-esd
+/usr/share/bug/vlc /usr/share/bug/vlc-plugin-esd
Copied: videolan/vlc/debian/vlc-plugin-ggi.links (from rev 219, unstable/vlc/debian/vlc-plugin-ggi.links)
===================================================================
--- unstable/vlc/debian/vlc-plugin-ggi.links 2007-03-17 10:25:10 UTC (rev 219)
+++ videolan/vlc/debian/vlc-plugin-ggi.links 2007-03-24 18:15:14 UTC (rev 248)
@@ -0,0 +1,2 @@
+/usr/share/doc/vlc /usr/share/doc/vlc-plugin-ggi
+/usr/share/bug/vlc /usr/share/bug/vlc-plugin-ggi
Copied: videolan/vlc/debian/vlc-plugin-glide.links (from rev 219, unstable/vlc/debian/vlc-plugin-glide.links)
===================================================================
--- unstable/vlc/debian/vlc-plugin-glide.links 2007-03-17 10:25:10 UTC (rev 219)
+++ videolan/vlc/debian/vlc-plugin-glide.links 2007-03-24 18:15:14 UTC (rev 248)
@@ -0,0 +1,2 @@
+/usr/share/doc/vlc /usr/share/doc/vlc-plugin-glide
+/usr/share/bug/vlc /usr/share/bug/vlc-plugin-glide
Copied: videolan/vlc/debian/vlc-plugin-sdl.links (from rev 219, unstable/vlc/debian/vlc-plugin-sdl.links)
===================================================================
--- unstable/vlc/debian/vlc-plugin-sdl.links 2007-03-17 10:25:10 UTC (rev 219)
+++ videolan/vlc/debian/vlc-plugin-sdl.links 2007-03-24 18:15:14 UTC (rev 248)
@@ -0,0 +1,2 @@
+/usr/share/doc/vlc /usr/share/doc/vlc-plugin-sdl
+/usr/share/bug/vlc /usr/share/bug/vlc-plugin-sdl
Copied: videolan/vlc/debian/vlc-plugin-svgalib.links (from rev 219, unstable/vlc/debian/vlc-plugin-svgalib.links)
===================================================================
--- unstable/vlc/debian/vlc-plugin-svgalib.links 2007-03-17 10:25:10 UTC (rev 219)
+++ videolan/vlc/debian/vlc-plugin-svgalib.links 2007-03-24 18:15:14 UTC (rev 248)
@@ -0,0 +1,2 @@
+/usr/share/doc/vlc /usr/share/doc/vlc-plugin-svgalib
+/usr/share/bug/vlc /usr/share/bug/vlc-plugin-svgalib
Copied: videolan/vlc/debian/vlc.links (from rev 219, unstable/vlc/debian/vlc.links)
More information about the Pkg-multimedia-commits
mailing list