[SCM] vlc/squeeze-backports: Revert "Initial backport of vlc-2.0.1-4 to Squeeze"

[siretart at users.alioth.debian.org]

The following commit has been merged in the squeeze-backports branch:
commit 34302065ffc3260b2b7996337599037a527f2dc1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat May 19 19:47:30 2012 +0200

    Revert "Initial backport of vlc-2.0.1-4 to Squeeze"
    
    This reverts commit 39574d02c2aabe84e869d690dc7c4b6eb819dc04.

diff --git a/debian/changelog b/debian/changelog
index 3f60515..3c25265 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,3 @@
-vlc (2.0.1-4~bpo60+1) squeeze-backports; urgency=medium
-
-  * Initial port to Debian Squeeze 6.0 using the backports system.
-  * Use some VLC contrib libraries and remove Debian build dependencies:
-    This is because either the Squeeze version of the library is too old
-    or there is no stable-bpo version out yet.
-    - libbluray-dev (>= 1:0.2.1) (bpo has 1:0.0)
-    - liblivemedia-dev (>= 2011.12.23) (stable has 2010.04.09-1)
-    - libmatroska-dev (>= 1.0.0) (stable has 0.8.1-1.1)
-    - libschroedinger-dev (>= 1.0.10) (stable has 1.0.9-2)
-
- -- Edward Wang <edward.c.wang at compdigitec.com>  Wed, 09 May 2012 16:53:52 -0400
-
 vlc (2.0.1-4) unstable; urgency=high
 
   * Add missing Breaks and Replaces for moving the documentation from vlc-data
diff --git a/debian/control b/debian/control
index 3976a1e..46fc160 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Build-Depends: autopoint,
                libavc1394-dev [linux-any],
                libavcodec-dev (>= 4:0.6),
                libavformat-dev (>= 4:0.6),
+               libbluray-dev (>= 1:0.2.1),
                libcaca-dev (>= 0.99.beta4),
                libcddb2-dev,
                libcdio-dev (>= 0.78.2),
@@ -44,8 +45,10 @@ Build-Depends: autopoint,
                libjack-dev,
                libkate-dev (>= 0.3.0),
                liblircclient-dev,
+               liblivemedia-dev (>= 2011.12.23),
                liblua5.1-0-dev,
                libmad0-dev,
+               libmatroska-dev (>= 1.0.0),
                libmodplug-dev (>= 1:0.8.8.1),
                libmpcdec-dev,
                libmpeg2-4-dev,
@@ -62,6 +65,7 @@ Build-Depends: autopoint,
                libresid-builder-dev,
                librsvg2-dev,
                libsamplerate0-dev,
+               libschroedinger-dev (>= 1.0.10),
                libsdl-image1.2-dev,
                libsdl1.2-dev (>= 1.2.10),
                libshout3-dev,
diff --git a/debian/rules b/debian/rules
index 27eeee1..5cf017c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,7 +62,7 @@ confflags += \
 	--enable-libproxy \
 	--enable-libxml2 \
 	--enable-lirc \
-	--disable-live555 \
+	--enable-live555 \
 	--enable-mad \
 	--enable-mkv \
 	--enable-mod \
@@ -150,12 +150,6 @@ override_dh_auto_clean:
 	dh_auto_clean
 
 override_dh_auto_configure:
-	# Build contribs for certain outdated libs
-	mkdir -p contrib/deb
-	cd contrib/deb; \
-		../bootstrap --enable-ebml --enable-matroska --enable-bluray --enable-orc --enable-schroedinger ; \
-		make .ebml .matroska .bluray .orc ; \
-		make .schroedinger
 	# We need to build the static library apart
 	# Else it's a mess when we build the modules
 	./configure --enable-static $(confflags)

-- 
VLC media player packaging