[SCM] vlc/master: Replace symlink by directory in /usr/share/doc/vlc-nox.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f47f329e387e19fe30d760ba06db41b862c7cef9
Author: Benjamin Drung <bdrung at debian.org>
Date:   Wed Mar 28 13:29:15 2012 +0200

    Replace symlink by directory in /usr/share/doc/vlc-nox.
    
    Closes: #665743
    LP: #964449

diff --git a/debian/control b/debian/control
index 4416509..780898c 100644
--- a/debian/control
+++ b/debian/control
@@ -191,9 +191,10 @@ Description: multimedia player and streamer
 Package: vlc-data
 Depends: ${misc:Depends}
 Architecture: all
+Breaks: vlc-nox (<< 2.0.1-3)
 Replaces: mozilla-plugin-vlc (<< 0.9.2-1),
           vlc (<< 0.9.2-1),
-          vlc-nox (<< 0.9.2-1)
+          vlc-nox (<< 2.0.1-3)
 Description: Common data for VLC
  Localisations, HTTP interface files, Lua scripts for VLC media player
  .
diff --git a/debian/vlc-nox.preinst b/debian/vlc-nox.preinst
new file mode 100644
index 0000000..982eaf7
--- /dev/null
+++ b/debian/vlc-nox.preinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+	upgrade)
+		# Make sure /usr/share/doc/vlc-nox doesn't exist or is not a symlink
+		# before the unpacking (which will put the directory back) - #665743
+		if dpkg --compare-versions "$2" le "2.0.1-3" && test -L "/usr/share/doc/vlc-nox"; then
+			rm /usr/share/doc/vlc-nox
+		fi
+		;;
+esac
+
+#DEBHELPER#

-- 
VLC media player packaging