[SCM] VLC media player packaging branch, sid, updated. debian/1.0.2-1-2-g9d9f3fc

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

The following commit has been merged in the sid branch:
commit 9d9f3fc486047165e01d0ff88cb6b7406ff09dfd
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Sat Oct 3 23:36:19 2009 +0100

    No longer need to build an extra libvlccore without altivec
    
    This has been fixed upstream
    
    Revert "Really build altivec-free libvlccore"
    Revert "Build a version of libvlccore without altivec"
    
    This reverts commit 8e5aeede90b35129681c2c043d69b4429da29f79
    and commit d518d892af650f5796ce38e1ea644b074af5683f.

diff --git a/debian/libvlccore2.install b/debian/libvlccore2.install
index 4405e98..2c18f04 100644
--- a/debian/libvlccore2.install
+++ b/debian/libvlccore2.install
@@ -1 +1 @@
-usr/lib/{,*/}libvlccore.so.*
+usr/lib/libvlccore.so.*
diff --git a/debian/rules b/debian/rules
index 8ad3573..15afbd9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -122,13 +122,6 @@ build-stamp: $(QUILT_STAMPFN)
 	mkdir -p tmp
 	cp src/.libs/libvlccore.a tmp/libvlccore.a
 	cp src/.libs/libvlc.a tmp/libvlc.a
-	# build an altivec free version on powerpc for the G3
-ifneq ($(filter $(DEB_HOST_ARCH), powerpc),)
-	./configure --disable-altivec $(confflags)
-	$(MAKE) -C compat
-	$(MAKE) -C src libvlccore.la 
-	cp -vd src/.libs/libvlccore.so.* tmp/
-endif
 	./configure $(confflags)
 	$(MAKE)
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
@@ -177,11 +170,6 @@ install: build
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
 	cp tmp/libvlc.a debian/tmp/usr/lib
 	cp tmp/libvlccore.a debian/tmp/usr/lib
-ifneq ($(filter $(DEB_HOST_ARCH), powerpc),)
-	mkdir -p debian/tmp/usr/lib/altivec/
-	mv -v debian/tmp/usr/lib/libvlccore.so.* debian/tmp/usr/lib/altivec/
-	cp -vd tmp/libvlccore.so.* debian/tmp/usr/lib/
-endif
 	# Clean up libtool crap
 	find debian/tmp -name '*.la' -exec rm '{}' ';'
 	# Remove useless stuff

-- 
VLC media player packaging