* Updated Debian packaging stuff.

diff --git a/debian/Makefile.am b/debian/Makefile.am
index 575c889b4f241fcac39feafe633d746f76724eec..29ebfaf70831d5ee3701d73158018292288ffd15 100644 (file)
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -7,6 +7,7 @@ EXTRA_DIST = \
        control \
        copyright \
        rules \
+       vlc.desktop \
        vlc.dirs \
        vlc.docs \
        vlc.menu \

diff --git a/debian/changelog b/debian/changelog
index 9b058d4b7775f1062ec7076026a1559361149c59..c8dad4a40e85f2f45e76544290d861028095f76c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,29 @@
-vlc (UNRELEASED) experimental; urgency=low
+vlc (0.8.4-svn20050810-1) unstable; urgency=low
 
-  * Experimental build.
+  * New SVN snapshot.
+  * Rebuilt against libaa1 and new wxWin and SDL packages to complete the
+    aalib transition (Closes: #320874) and make the packages installable again
+    (Closes: #319292, #319598, #321461, #322166, #317380).
+  * debian/rules:
+    + Use DEB_BUILD_ARCH_CPU instead of DEB_BUILD_GNU_CPU.
+  * debian/vlc.desktop:
+    + Added desktop file, thanks to Mantas Kriauciunas (Closes: #290612).
   * debian/control:
-    + Build-depend on libwxgtk2.6-dev instead of libwxgtk2.4-dev.
+    + Removed unused dummy packages (Closes: #321988, #322003, #322013).
+    + Build-depend on libmatroska-dev (>= 0.7.7).
+    + Build-depend on libwxgtk2.4-dev (>= 2.4.4).
     + Build-depend on libdvbpsi4-dev instead of libdvbpsi3-dev.
+    * Build-depend on libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3).
     + Build-depend on a newer version of libmatroska-dev because of the C++
       transition.
-
- -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Fri, 15 Jul 2005 03:22:46 +0300
+    + Build-depend on libsvga1-dev instead of svgalib1-dev.
+  * This snapshot no longer uses tune=opteron on amd64 (Closes: #316161).
+  * The SVN version adds support for Freebox users (Closes: #317035).
+  * Various gcc-4.x FTBFS were fixed upstream (Closes: #317055).
+  * mozilla/support/npunix.c: fixed undeclared NPP_GetJavaClass
+    (Closes: #317067).
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Wed, 13 Jul 2005 21:54:09 +0200
 
 vlc (0.8.2-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 4f558385908e1a834fe468670f2fc12d3eb7329b..32a16b488da1ecd50bc0c84961f544f3f1e5d325 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: vlc
 Section: graphics
 Priority: optional
 Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
-Build-Depends: debhelper (>= 4.0), dpatch, gettext, libx11-dev, libxext-dev, libxt-dev, libxv-dev, xlibs-static-pic, libggi2-dev, libglide2-dev [i386], libesd0-dev, libaudiofile-dev, libsdl1.2-dev (>= 1.2.7-5), libasound2-dev (>= 0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, libaa1-dev, libdvbpsi4-dev, mozilla-dev, libidl0, libglib2.0-0, libxosd-dev (>= 2.2.4-1.3), svgalibg1-dev (>= 1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev | libwxgtk2.6-dev, libdvdread3-dev, libflac-dev (>= 1.1.1-5), libimlib2-dev, libmatroska-dev (>= 0.7.7), libfreetype6-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.9), liblivemedia-dev (>= 2004.11.11a-1), libmpeg2-4-dev, zlib1g-dev, libdts-dev, libfribidi-dev, libcdio-dev, libxml2-dev, libid3tag0-dev, libtheora-dev, jam, nasm, libmodplug-dev, libhal-dev, libtar-dev, libdvdnav-dev, libgnutls11-dev, libavcodec-dev (>= 0.cvs20050626-1), libavformat-dev (>= 0.cvs20050626-1), libpostproc-dev (>= 0.cvs20050626-1), libncurses5-dev, libpng12-dev, xlibmesa-gl-dev
+Build-Depends: debhelper (>= 4.0), dpatch, gettext, libx11-dev, libxext-dev, libxt-dev, libxv-dev, xlibs-static-pic, libggi2-dev, libglide2-dev [i386], libesd0-dev, libaudiofile-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libasound2-dev (>= 0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, libaa1-dev, libdvbpsi4-dev, mozilla-dev, libidl0, libglib2.0-0, libxosd-dev (>= 2.2.4-1.3), libsvga1-dev [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev (>= 2.4.2.6) | libwxgtk2.6-dev, libdvdread3-dev, libflac-dev (>= 1.1.1-5), libimlib2-dev, libmatroska-dev (>= 0.7.7), libfreetype6-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.9), liblivemedia-dev (>= 2004.11.11a-1), libmpeg2-4-dev, zlib1g-dev, libdts-dev, libfribidi-dev, libcdio-dev, libxml2-dev, libid3tag0-dev, libtheora-dev, jam, nasm, libmodplug-dev, libhal-dev, libtar-dev, libdvdnav-dev, libgnutls11-dev, libavcodec-dev (>= 0.cvs20050626-1), libavformat-dev (>= 0.cvs20050626-1), libpostproc-dev (>= 0.cvs20050626-1), libncurses5-dev, libpng12-dev, xlibmesa-gl-dev
 Standards-Version: 3.6.2.1
 
 Package: vlc

diff --git a/debian/rules b/debian/rules
index eac5212641ecb0dba2628ddcde6ac25723f362fd..a7fc2695038172d3a3d2066d772d0244d4f23ce1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -69,7 +69,7 @@ CONFIG_FLAGS += --enable-faad --with-faad-tree=extras/faad2
 CONFIG_FLAGS += --enable-x264 --with-x264-tree=extras/x264
 
 # Glide and svgalib are only for x86
-ifeq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)
+ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),i386)
 CONFIG_FLAGS += --enable-glide
 CONFIG_FLAGS += --enable-svgalib
 endif
@@ -257,7 +257,7 @@ install: build
          debian/vlc-plugin-ggi/usr/lib/vlc/video_output/
 
        # Package: vlc-plugin-glide
-ifeq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)
+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/
@@ -297,7 +297,7 @@ endif
        #mv debian/vlc/$(VIDDIR)/kvlc48x48.png debian/kvlc/$(PIXDIR)/kvlc.png
 
        # Package: vlc-plugin-svgalib
-ifeq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)
+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
@@ -307,6 +307,7 @@ endif
        mv debian/vlc/usr/bin/wxvlc debian/wxvlc/usr/bin/
        ln -s vlc debian/wxvlc/usr/share/doc/wxvlc
        cp debian/vlc/$(VIDDIR)/vlc.xpm debian/wxvlc/$(VIDDIR)/wxvlc.xpm
+       cp debian/vlc.desktop debian/wxvlc/$(GNOMEDIR)
        mv debian/vlc/usr/lib/vlc/gui/libwxwidgets_plugin.so \
          debian/wxvlc/usr/lib/vlc/gui/
        ln -s vlc.1.gz debian/wxvlc/usr/share/man/man1/wxvlc.1.gz

diff --git a/debian/vlc.desktop b/debian/vlc.desktop
new file mode 100644 (file)
index 0000000..6bbf184
--- /dev/null
+++ b/debian/vlc.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=VLC media player
+Name[fr]=lecteur multimédia VLC
+Comment=Universal movies and music player
+Comment[fr]=Lecteur universel pour films et musique
+Exec=wxvlc
+Icon=vlc.png
+Terminal=false
+Type=Application
+Categories=GNOME;Application;AudioVideo;
+MimeType=video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;application/ogg;application/x-ogg;application/x-matroska;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;application/x-flac;audio/x-flac;application/x-shockwave-flash;misc/ultravox;application/x-matroska;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;video/vnd.rn-realvideo;audio/x-pn-realaudio-plugin;