[SCM] vlc/master: Patch for NMU version 1.1.12-2.1

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5aa34ba61d0a8957daaf291084bce1feadb157a6
Author: Didier Raboud <didier at odyx.homelinux.org>
Date:   Mon Nov 7 20:39:48 2011 +0100

    Patch for NMU version 1.1.12-2.1
    
    Add a preinst to vlc to drop it's doc directory before unpacking a
    symlink to vlc-nox's over it. (Closes: #613121)

diff --git a/debian/changelog b/debian/changelog
index ae20c49..c0ec36b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vlc (1.1.12-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add a preinst to vlc to drop it's doc directory before unpacking a
+    symlink to vlc-nox's over it. (Closes: #613121)
+
+ -- Didier Raboud <odyx at debian.org>  Mon, 07 Nov 2011 16:40:10 +0100
+
 vlc (1.1.12-2) unstable; urgency=low
 
   * Apply patches from upstream's 1.1 maintenance branch.

-- 
VLC media player packaging