r865 - in /videolan/vlc/debian: changelog rules

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

Author: xtophe-guest
Date: Tue Aug 14 21:09:00 2007
New Revision: 865

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=865
Log:
temporary store libvlc.a not in src/ to avoid linking problem (on amd64 at least)

Modified:
    videolan/vlc/debian/changelog
    videolan/vlc/debian/rules

Modified: videolan/vlc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/changelog?rev=865&op=diff
==============================================================================
--- videolan/vlc/debian/changelog (original)
+++ videolan/vlc/debian/changelog Tue Aug 14 21:09:00 2007
@@ -6,9 +6,10 @@
 
   [ Christophe Mutricy ]
   * vlc-nox.install
-    + share/vlc/luameta 
-
- -- Christophe Mutricy <xtophe at videolan.org>  Tue, 14 Aug 2007 18:59:43 +0100
+    + share/vlc/luameta
+  * rules: store libvlc.a not in src/ to avoid the linker using it.
+
+ -- Christophe Mutricy <xtophe at videolan.org>  Tue, 14 Aug 2007 22:05:36 +0100
 
 vlc (0.9.0-svn1-3) unstable; urgency=low
 

Modified: videolan/vlc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/rules?rev=865&op=diff
==============================================================================
--- videolan/vlc/debian/rules (original)
+++ videolan/vlc/debian/rules Tue Aug 14 21:09:00 2007
@@ -105,7 +105,8 @@
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	./configure --enable-static --mandir=$${prefix}/share/man $(confflags)
 	$(MAKE) src/libvlc.la
-	cp src/.libs/libvlc.a src/libvlc.a
+	mkdir tmp
+	cp src/.libs/libvlc.a tmp/libvlc.a
 	./configure --mandir=$${prefix}/share/man $(confflags)
 	$(MAKE)
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -124,7 +125,7 @@
 	rm -f build-stamp
 	# Clean VLC
 	-$(MAKE) distclean
-	rm -f src/libvlc.a
+	rm -rf tmp/
 	# Clean zsh completion stuff
 	rm -f extras/zsh
 	# Removed ugly cruft
@@ -142,7 +143,7 @@
 	dh_clean -k
 	dh_installdirs
 	$(MAKE) install DESTDIR=`pwd`/debian/tmp/
-	cp src/libvlc.a debian/tmp/usr/lib
+	cp tmp/libvlc.a debian/tmp/usr/lib
 	# Clean up libtool crap
 	find debian/tmp -name '*.la' -exec rm '{}' ';'
 	# Remove useless stuff