[SCM] VLC media player packaging branch, experimental, updated. debian/1.0.6-1-54-g45d7106

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

The following commit has been merged in the experimental branch:
commit 653bf48c68b58e66049d609cc6debf8ae635623a
Merge: e0ff09f9c4fdea7cb3e238824890810abaf44587 8c8c94f5163e539f473588b7471aa1921f355265
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Jun 24 00:46:06 2010 +0200

    Merge branch 'experimental' of git+ssh://git.debian.org/git/pkg-multimedia/vlc into experimental

diff --combined debian/rules
index ee4f728,2cbf929..288aba3
--- a/debian/rules
+++ b/debian/rules
@@@ -42,6 -42,7 +42,7 @@@ confflags += 
  	--enable-fast-install \
  	--enable-release \
  	--prefix=/usr \
+ 	--sysconfdir=/etc \
  	--with-binary-version=$(DEBIAN_VERSION) \
  	$(NULL)
  # configure features
@@@ -186,8 -187,10 +187,8 @@@ install: buil
  	# Clean up libtool crap
  	find debian/tmp -name '*.la' -exec rm '{}' ';'
  	# Remove useless stuff
 -	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
 +	ln -sf /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSans.ttf
 +	ln -sf /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
  	rm -f debian/tmp/usr/share/man/man1/vlc-config.1
  	# Install stuff
  	dh_install -si --fail-missing --sourcedir=debian/tmp
@@@ -244,8 -247,8 +245,8 @@@ binary-arch: build instal
  	dh_strip -s --dbg-package=vlc-dbg
  	dh_compress -s
  	dh_fixperms -s
- 	dh_makeshlibs -plibvlc5 -V # -V is nasty, but I mean it
- 	dh_makeshlibs -plibvlccore4 -V # -V is nasty, but I mean it
+ 	dh_makeshlibs -plibvlc5
+ 	dh_makeshlibs -plibvlccore4
  	dh_installdeb -s
  	dh_shlibdeps -s -ldebian/libvlc5/usr/lib:debian/libvlccore4/usr/lib
  	dh_gencontrol -s

-- 
VLC media player packaging