[SCM] x264 packaging branch, ubuntu, updated. debian/0.85.1442.1+git781d30-1-24-g4c019fc

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 4c019fc3170431c3f918eb07941d26b7ca20aed8
Merge: bdfed60dfe967a96888bb5574dfebba818a8e83d eb70bddc613b36f3e2a506ae8bc5af481576f098
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Mar 9 12:28:44 2010 +0100

    Merge branch 'ubuntu' of git://git.debian.org/pkg-multimedia/x264 into ubuntu

diff --combined debian/confflags
index 46684fb,9287e77..04fbfb1
--- a/debian/confflags
+++ b/debian/confflags
@@@ -1,5 -1,3 +1,5 @@@
 +# -*- mode: makefile -*-
 +# vi:syntax=make
  # configure flags logic
  
  common_confflags += \
@@@ -18,13 -16,9 +18,9 @@@ static_confflags += 
  # also, we try providing an optimized flavor for the arches / toolchain
  # combinations where it makes sense
  
  shared_confflags += \
  	$(common_confflags) \
  	--enable-shared \
- 	--enable-pic \
  	--enable-visualize
  
  opt_confflags += \
@@@ -125,3 -119,4 +121,3 @@@ endi
  # which is not supported in Debian and for which there's no upstream flags by
  # default
  
 -# vi:syntax=make

-- 
x264 packaging