[SCM] VLC media player packaging branch, sid, updated. debian/1.0.0.rc2-1-17-g8bfc378

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

The following commit has been merged in the sid branch:
commit 4a8c44c5f10ffe7971f4b55fbad8bce420a2b0d5
Merge: d6698b9afe689274fe5869a27f0764fd98fdfea4 a8e3e25f864caa6398ac493432d20c68f165f0bf
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Wed Jul 8 00:02:24 2009 +0200

    Merge commit 'debian/1.0.0.rc2-1' into sid
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

diff --combined debian/changelog
index 6381d1d,e815d7e..de7c2ea
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,25 +1,25 @@@
+ vlc (1.0.0~rc2-1) experimental; urgency=low
+ 
+   * New Upstream Release Candidate
+     + Closes: #527010, #491441, #508618, #522824
+   * Delete patches which were picked from upstream
+   * Refresh patches
+   * Remove vlc-plugin-esd and vlc-plugin-arts as they have been removed
+     by upstream
+   * SONAME change for libvlccore
+   * Add new symbols for libvlc2
+   * Fix static libs compile
+   * Use vlc-wrapper manpage from upstream
+   * vlc.install: add drawable and screen was renamed x11_screen
+   * vlc-nox.install: Add and remove modules added/removed upstream
+   * Point out in NEWS the modules renamed or splited
+   * Add links to upstream NEWS and co in vlc-nox
+   * Version the depedency of libvlcore2 on vlc-data
+   * Remove unnecessary "Section:" in debian/control
+ 
+  -- Christophe Mutricy <xtophe at videolan.org>  Wed, 03 Jun 2009 17:55:10 +0200
+ 
 -vlc (0.9.9a-3) unstable; urgency=low
 +vlc (0.9.9a-3) unstable; urgency=medium
  
    * Correct typo in 0.9.9a-2 changelog entry
    * Disable more optimization with DEB_BUILD_OPTIONS=noopt
@@@ -14,14 -35,8 +35,14 @@@
    * Reword the command line to get full logs in bug/presubj (Closes: #527012)
    * Remove duplicate "extended Settings" entry in context menu
     (Closes: #526603) - thanks to Matt Kraai
 -
 - -- Christophe Mutricy <xtophe at videolan.org>  Thu, 14 May 2009 19:19:27 +0200
 +  * Disable the logging facility in the javascript of moz plugin
 +    This was a privacy hole. (urgency=medium)(Closes: #529633)
 +  * Patch to support libmpc new API (Closes: #476375) - thanks to Yavor
 +    Doganov
 +  * Disable-maintener mode
 +  * Make sure unpatch is last in the clean target
 +
 + -- Christophe Mutricy <xtophe at videolan.org>  Sat, 06 Jun 2009 16:56:16 +0200
  
  vlc (0.9.9a-2) unstable; urgency=medium
  
diff --combined debian/rules
index 302276e,0a5ea98..56d46c5
--- a/debian/rules
+++ b/debian/rules
@@@ -36,7 -36,7 +36,7 @@@ include /usr/share/quilt/quilt.mak
  LDFLAGS = -Wl,--as-needed
  
  # configure flags
 -confflags += --enable-maintainer-mode --enable-release --prefix=/usr
 +confflags += --disable-maintainer-mode --enable-release --prefix=/usr
  confflags += \
  	--config-cache \
  	--enable-fast-install \
@@@ -45,9 -45,7 +45,7 @@@
  	--disable-fb \
  	--enable-ggi \
  	--enable-sdl \
- 	--enable-esd \
  	--enable-mad \
- 	--enable-arts \
  	--enable-jack \
  	--enable-pulse \
  	--enable-lirc \
@@@ -116,6 -114,7 +114,7 @@@ build-stamp: $(QUILT_STAMPFN
  	# We need to build the static library apart
  	# Else it's a mess when we build the modules
  	./configure --enable-static $(confflags)
+ 	$(MAKE) -C compat
  	$(MAKE) -C src libvlccore.la libvlc.la
  	mkdir -p tmp
  	cp src/.libs/libvlccore.a tmp/libvlccore.a
@@@ -141,7 -140,8 +140,7 @@@ endi
  endif
  	touch $@
  
 -clean: clean-real unpatch
 -clean-real:
 +clean:
  	dh_testdir
  	dh_testroot
  	rm -f build-stamp
@@@ -158,7 -158,6 +157,7 @@@
  	# Remove spurious autotools stuff
  	rm -f config.log confdefs.h
  	# Unpatch package
 +	$(MAKE) -f debian/rules unpatch
  	dh_clean
  
  install: build
@@@ -185,6 -184,7 +184,7 @@@ endi
  	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
+ 	rm -rf debian/tmp/usr/share/man/man1
  	# Move stuff around
  	mkdir -p debian/tmp/$(PIXDIR)
  	mv debian/tmp/$(VIDDIR)/vlc48x48.png debian/tmp/$(PIXDIR)/vlc.png
@@@ -218,7 -218,7 +218,7 @@@ binary-indep: build instal
  	dh_testdir
  	dh_testroot
  	dh_link -i
- 	dh_installdocs -p vlc-data 
+ 	dh_installdocs -p vlc-data
  	dh_installchangelogs ChangeLog -p vlc-data
  	dh_compress -i
  	dh_fixperms -i
@@@ -238,7 -238,7 +238,7 @@@ binary-arch: build instal
  	dh_installmenu -s
  	dh_installmime -s
  	dh_installman doc/vlc.1 -p vlc-nox
- 	dh_installman debian/vlc-wrapper.1 -p vlc-nox
+ 	dh_installman doc/vlc-wrapper.1 -p vlc-nox
  	dh_installchangelogs ChangeLog -p vlc
  	dh_installchangelogs ChangeLog -p vlc-nox
  	dh_desktop
@@@ -247,9 -247,9 +247,9 @@@
  	dh_compress -s
  	dh_fixperms -s
  	dh_makeshlibs -plibvlc2 -V # -V is nasty, but I mean it
- 	dh_makeshlibs -plibvlccore0 -V # -V is nasty, but I mean it
+ 	dh_makeshlibs -plibvlccore2 -V # -V is nasty, but I mean it
  	dh_installdeb -s
- 	dh_shlibdeps -s -ldebian/libvlc2/usr/lib:debian/libvlccore0/usr/lib 
+ 	dh_shlibdeps -s -ldebian/libvlc2/usr/lib:debian/libvlccore2/usr/lib
  	dh_gencontrol -s
  	dh_md5sums -s
  	dh_builddeb -s

-- 
VLC media player packaging