[SCM] vlc/master: Update changelog again

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

The following commit has been merged in the master branch:
commit 640a418339f603fb55d8d2c70e2650678a90ea84
Author: Edward Wang <edward.c.wang at compdigitec.com>
Date:   Mon Oct 7 20:13:07 2013 -0400

    Update changelog again

diff --git a/debian/changelog b/debian/changelog
index 75c0e2d..29f8545 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 vlc (2.1.0-1) unstable; urgency=low
 
-  * New major upstream release.
+  * New major upstream release. (Closes: #436339, #632965, #642187,
+    #698023, #593735, #724734, #665732, #700752, #704941, #708953,
+    #712935, #398167, #646200, #679654, #654955, LP: #982953, #301193,
+    #986785, #1038303, #1109026, #530797, #667584, #938621, #671031,
+    #1080847, #1157384, #1173943)
   * Drop configure-m4-undefine.patch. (code in question doesn't exist)
   * Drop dvbpsi.patch. (no longer needed)
   * Drop v4l-kfreebsd.patch. (no longer needed)
@@ -11,6 +15,11 @@ vlc (2.1.0-1) unstable; urgency=low
   * SONAME bump for libvlccore5 to libvlccore7.
   * Update symbols for libvlc5 and libvlccore7.
   * Update file lists to account for new/renamed/removed modules.
+  * Add missing Breaks and Replaces for libavcodec_plugin.so move.
+  * Disable the static library.
+  * Bump to lua5.2.
+  * Update debian/copyright to include LGPL where relevant, in response
+    to the VLC 2.1 relicensing.
 
  -- Edward Wang <edward.c.wang at compdigitec.com>  Sun, 06 Oct 2013 11:12:25 -0400
 
diff --git a/debian/control b/debian/control
index 128add4..e3f24c4 100644
--- a/debian/control
+++ b/debian/control
@@ -229,6 +229,7 @@ Package: vlc-nox
 Architecture: any
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: libdvdcss2
 Breaks: vlc (<< 2.1.0)
 Replaces: vlc (<< 2.1.0)
 Provides: mp3-decoder

-- 
VLC media player packaging