Am Donnerstag, den 04.10.2012, 09:33 +0200 schrieb Julien Cristau: > On Wed, Oct 3, 2012 at 22:43:44 +0200, Benjamin Drung wrote: > > > I asked Larry to ask the release team. I like to get this change into my > > next upload to unstable, which will fix the RC bug #687657. I like to > > discuss this change with the release team before doing an upload and > > getting a 'No' as answer. Is it a bug or a feature to support sftp? The > > sftp module is a separate module and therefore it should bring a very > > low regression risk. > > > Please fix the RC bug independently. Done. I uploaded 2.0.3-3 that fixes both RC bugs and do not ship the sftp support. Please unblock 2.0.3-3 (debdiff attached). -- Benjamin Drung Debian & Ubuntu Developer
diff -Nru vlc-2.0.3/debian/changelog vlc-2.0.3/debian/changelog
--- vlc-2.0.3/debian/changelog 2012-08-18 17:45:01.000000000 +0200
+++ vlc-2.0.3/debian/changelog 2012-10-04 21:40:56.000000000 +0200
@@ -1,3 +1,15 @@
+vlc (2.0.3-3) unstable; urgency=low
+
+ * debian/vlc.postinst: Fix directory to symlink upgrade in postinst.
+ Thanks to David Prévot <taffit@debian.org> (Closes: #687657)
+ * debian/vlc.preinst: Remove insufficient fix to #613121 (similar issue).
+ Thanks to David Prévot for the patch.
+ * Cherry-pick fix for VLC hang caused by the notify plugin. (Closes: #662628,
+ LP: #970447)
+ * Drop alternative dependency on transitional ttf-freefont.
+
+ -- Benjamin Drung <bdrung@debian.org> Thu, 04 Oct 2012 20:59:21 +0200
+
vlc (2.0.3-2) unstable; urgency=low
* debian/rules: Use xz compression for binary packages.
diff -Nru vlc-2.0.3/debian/control vlc-2.0.3/debian/control
--- vlc-2.0.3/debian/control 2012-08-18 15:43:15.000000000 +0200
+++ vlc-2.0.3/debian/control 2012-10-04 19:36:29.000000000 +0200
@@ -170,7 +170,7 @@
Package: vlc
Architecture: any
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: fonts-freefont-ttf | ttf-freefont,
+Depends: fonts-freefont-ttf,
vlc-nox (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
diff -Nru vlc-2.0.3/debian/patches/bp-fix-hang-caused-by-notify.patch vlc-2.0.3/debian/patches/bp-fix-hang-caused-by-notify.patch
--- vlc-2.0.3/debian/patches/bp-fix-hang-caused-by-notify.patch 1970-01-01 01:00:00.000000000 +0100
+++ vlc-2.0.3/debian/patches/bp-fix-hang-caused-by-notify.patch 2012-10-04 20:57:03.000000000 +0200
@@ -0,0 +1,39 @@
+From: Rémi Denis-Courmont <remi@remlab.net>
+Subject: [PATCH] Revert "Notify: add a callback to match telepathy, msn"
+ .
+ The "item-change" callback is called with the playlist lock held in
+ at least one case: when the now playing meta is cleared while a new
+ input is created by the playlist.
+ .
+ playlist_CurrentInput() acquires the playlist lock. So the
+ "item-change" callback cannot call it. This bug is present in the
+ Growl, MSN and Telepathy modules since version 1.0.0. It got copied
+ into Notify in version 2.0.0.
+ .
+ This reverts commit fc56b92af1636c53a0545109a74476fe74c054a5.
+ This should fix #6641.
+ (cherry picked from commit 1e5f4b465a82745e8e7e5a5de491deac39554ed3)
+Origin: http://git.videolan.org/?p=vlc/vlc-2.0.git;a=commitdiff;h=e89f4296
+Applied-Upstream: 2.0.4
+Bug: http://trac.videolan.org/vlc/ticket/6641
+Bug-Debian: http://bugs.debian.org/662628
+Bug-Ubuntu: https://launchpad.net/bugs/970447
+
+--- a/modules/notify/notify.c
++++ b/modules/notify/notify.c
+@@ -122,7 +122,6 @@
+
+ /* */
+ var_AddCallback( pl_Get( p_intf ), "item-current", ItemChange, p_intf );
+- var_AddCallback( pl_Get( p_intf ), "item-change", ItemChange, p_intf );
+
+ return VLC_SUCCESS;
+ }
+@@ -136,7 +135,6 @@
+ intf_sys_t *p_sys = p_intf->p_sys;
+
+ var_DelCallback( pl_Get( p_this ), "item-current", ItemChange, p_this );
+- var_DelCallback( pl_Get( p_this ), "item-change", ItemChange, p_this );
+
+ if( p_sys->notification )
+ {
diff -Nru vlc-2.0.3/debian/patches/series vlc-2.0.3/debian/patches/series
--- vlc-2.0.3/debian/patches/series 2012-06-30 13:02:46.000000000 +0200
+++ vlc-2.0.3/debian/patches/series 2012-10-04 20:36:13.000000000 +0200
@@ -1,3 +1,4 @@
v4l-kfreebsd.patch
link-vlc-cache-gen-with-c++.patch
link-vlc-with-c++.patch
+bp-fix-hang-caused-by-notify.patch
diff -Nru vlc-2.0.3/debian/vlc.postinst vlc-2.0.3/debian/vlc.postinst
--- vlc-2.0.3/debian/vlc.postinst 1970-01-01 01:00:00.000000000 +0100
+++ vlc-2.0.3/debian/vlc.postinst 2012-10-04 19:54:16.000000000 +0200
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+# Replace documentation directory with symlink
+docdir="/usr/share/doc/vlc"
+if [ -d $docdir ] && [ ! -L $docdir ]; then
+ if rmdir $docdir 2>/dev/null; then
+ ln -sf vlc-nox $docdir
+ fi
+fi
+
+#DEBHELPER#
diff -Nru vlc-2.0.3/debian/vlc.preinst vlc-2.0.3/debian/vlc.preinst
--- vlc-2.0.3/debian/vlc.preinst 2012-06-30 13:02:46.000000000 +0200
+++ vlc-2.0.3/debian/vlc.preinst 1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-#! /bin/sh
-set -e
-
-case "$1" in
- upgrade)
- # Make sure /usr/share/doc/vlc doesn't exist or is a symlink
- # before the unpacking (which will put the link back) - #613121
- if dpkg --compare-versions "$2" le "2.0.1-2~" && test ! -L "/usr/share/doc/vlc"; then
- rm -rf /usr/share/doc/vlc/
- fi
- ;;
-esac
-
-#DEBHELPER#
Attachment:
signature.asc
Description: This is a digitally signed message part