r944 - in /unstable/vlc/debian: changelog rules

[sho at users.alioth.debian.org]

Author: sho
Date: Sat Dec 15 13:14:51 2007
New Revision: 944

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=944
Log:
  * debian/rules:
    + Don’t ignore make distclean errors.
    + Call dh_desktop to register desktop files.

Modified:
    unstable/vlc/debian/changelog
    unstable/vlc/debian/rules

Modified: unstable/vlc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/changelog?rev=944&op=diff
==============================================================================
--- unstable/vlc/debian/changelog (original)
+++ unstable/vlc/debian/changelog Sat Dec 15 13:14:51 2007
@@ -11,9 +11,13 @@
     versionned .shlibs
 
   [ Sam Hocevar ]
-  * 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).
+  * 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).
+  * 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
 

Modified: unstable/vlc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/rules?rev=944&op=diff
==============================================================================
--- unstable/vlc/debian/rules (original)
+++ unstable/vlc/debian/rules Sat Dec 15 13:14:51 2007
@@ -121,7 +121,7 @@
 	  debian/vlc-nox.install.kfreebsd-amd64
 	rm -f build-stamp
 	# Clean VLC
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f src/libvlc.a
 	# Clean zsh completion stuff
 	rm -f extras/zsh
@@ -195,6 +195,7 @@
 	dh_installman doc/vlc-config.1 -p libvlc0-dev
 	dh_installchangelogs ChangeLog -p vlc-nox
 	dh_installchangelogs ChangeLog -p libvlc0
+	dh_desktop
 	dh_strip -s
 	dh_compress -s
 	dh_fixperms -s