r953 - in /videolan/vlc/debian: changelog control rules

[xtophe-guest at users.alioth.debian.org]

Author: xtophe-guest
Date: Sat Dec 15 21:16:58 2007
New Revision: 953

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=953
Log:
Merge with 0.8.6.c-5

Modified:
    videolan/vlc/debian/changelog
    videolan/vlc/debian/control
    videolan/vlc/debian/rules

Modified: videolan/vlc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/changelog?rev=953&op=diff
==============================================================================
--- videolan/vlc/debian/changelog (original)
+++ videolan/vlc/debian/changelog Sat Dec 15 21:16:58 2007
@@ -62,6 +62,30 @@
 
  -- Christophe Mutricy <xtophe at videolan.org>  Sun, 25 Nov 2007 15:40:01 +0000
 
+vlc (0.8.6.c-4) unstable; urgency=high
+
+  [ Loic Minier ]
+  * Wrap build-deps and deps.
+  * Only suggest videolan-doc; closes: #451914.
+
+  [ Christophe Mutricy ]
+  * Use Vcs- instead of Xs-Vcs-
+  * Add Homepage field to control
+  * Use --ignore-missing-info with dpkg-shlibdeps as glide doesn't provide a
+    versionned .shlibs
+
+  [ Sam Hocevar ]
+  * debian/control:
+    + Build-depend on a newer libcdio-dev to transition to the newer binary
+      packages (Closes: #456390, #456403, #453823).
+    + Depend on ttf-dejavu-core instead of ttf-dejavu (Closes: #445580).
+    + Set policy to 3.7.3.
+  * debian/rules:
+    + Don’t ignore make distclean errors.
+    + Call dh_desktop to register desktop files.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sat, 15 Dec 2007 12:33:48 +0000
+
 vlc (0.8.6.c-3) unstable; urgency=high
 
   * debian/control:

Modified: videolan/vlc/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/control?rev=953&op=diff
==============================================================================
--- videolan/vlc/debian/control (original)
+++ videolan/vlc/debian/control Sat Dec 15 21:16:58 2007
@@ -22,7 +22,7 @@
   libavcodec-dev (>= 0.cvs20060823-1),
   libavformat-dev (>= 0.cvs20060823-1),
   libcaca-dev (>= 0.99.beta4-1),
-  libcdio-dev,
+  libcdio-dev (>= 0.78.2-1),
   libdvbpsi4-dev,
   libdvdnav-dev,
   libdvdread-dev (>= 0.9.5),
@@ -77,7 +77,7 @@
   libfaad-dev,
   libjack-dev
 #Build-Conflicts-Indep: libvlc0
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 Homepage: http://www.videolan.org/vlc
 Vcs-Svn: svn://svn.debian.org/pkg-multimedia/videolan/vlc/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/
@@ -88,9 +88,8 @@
 Depends: vlc-nox (= ${binary:Version}), 
   ${shlibs:Depends}, 
   ${misc:Depends},
-  ttf-dejavu
-Recommends: videolan-doc
-Suggests: mozilla-plugin-vlc
+  ttf-dejavu-core
+Suggests: mozilla-plugin-vlc, videolan-doc
 Replaces: vlc-nox (<<${Source-Version}),
   vlc-plugin-dvb (<< 0.5.2-2),
   vlc-plugin-xosd (<< 0.5.2-2),

Modified: videolan/vlc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/rules?rev=953&op=diff
==============================================================================
--- videolan/vlc/debian/rules (original)
+++ videolan/vlc/debian/rules Sat Dec 15 21:16:58 2007
@@ -128,7 +128,7 @@
 	  debian/vlc-nox.install.kfreebsd-amd64
 	rm -f build-stamp
 	# Clean VLC
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -rf tmp/
 	# Clean zsh completion stuff
 	rm -f extras/zsh
@@ -202,6 +202,7 @@
 	dh_installman doc/vlc-config.1 -p libvlc1-dev
 	dh_installchangelogs ChangeLog -p vlc-nox
 	dh_installchangelogs ChangeLog -p libvlc1
+	dh_desktop
 	dh_strip -s --dbg-package=vlc-dbg
 	dh_compress -s
 	dh_fixperms -s