[SCM] vlc/master: Remove static dependency on libproxy

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

The following commit has been merged in the master branch:
commit 7e9b24e0234e8b18e608a772559e5f2f6c257b25
Author: Edward Wang <edward.c.wang at compdigitec.com>
Date:   Sun Oct 6 11:59:43 2013 -0400

    Remove static dependency on libproxy
    
    VLC 2.1 now uses the runtime binary from libproxy-tools.
    
    See http://git.videolan.org/?p=vlc.git;a=commitdiff;h=6c34b58e2a3d29d5bd36358e143bcffbb353625e

diff --git a/debian/control b/debian/control
index ccb57e9..57f12f9 100644
--- a/debian/control
+++ b/debian/control
@@ -60,7 +60,6 @@ Build-Depends: autopoint,
                libopus-dev,
                libpng-dev,
                libpostproc-dev (>= 4:0.6),
-               libproxy-dev,
                libpulse-dev (>= 0.9.11),
                libqt4-dev (>= 4:4.6.0),
                libraw1394-dev (>= 2.0.1) [linux-any],
@@ -153,7 +152,8 @@ Package: libvlccore5
 Section: libs
 Architecture: any
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: vlc-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: vlc-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends},
+         libproxy-tools
 Description: base library for VLC and its modules
  This package contains the shared library required by VLC modules and libvlc.
  .
diff --git a/debian/rules b/debian/rules
index 56f10fc..9090f8d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,7 +62,6 @@ confflags += \
 	--enable-kate \
 	--enable-libass \
 	--enable-libmpeg2 \
-	--enable-libproxy \
 	--enable-libxml2 \
 	--enable-lirc \
 	--enable-live555 \

-- 
VLC media player packaging