r211 - feisty/ffmpeg/debian

[siretart at alioth.debian.org]

Author: siretart
Date: 2007-03-16 17:28:38 +0000 (Fri, 16 Mar 2007)
New Revision: 211

Modified:
   feisty/ffmpeg/debian/changelog
   feisty/ffmpeg/debian/control
   feisty/ffmpeg/debian/libavutil-dev.install
   feisty/ffmpeg/debian/rules
Log:
changes in the debian/directory only

Modified: feisty/ffmpeg/debian/changelog
===================================================================
--- feisty/ffmpeg/debian/changelog	2007-03-16 17:25:48 UTC (rev 210)
+++ feisty/ffmpeg/debian/changelog	2007-03-16 17:28:38 UTC (rev 211)
@@ -1,3 +1,31 @@
+ffmpeg (0.cvs20070315-0ubuntu1) feisty; urgency=low
+
+  * New upstream snapshot
+
+  * 005_m68k_workaround.diff:
+  * 005_altivec_flags.diff:
+  * 005_runtime_cpudetect.diff:
+  * 006_mips_pthreads.diff:
+  * 020_mmx_optims.diff:
+  * 020_mmx_pic_code.diff:
+  * 020_disable_snow_mmx_in_pic.diff:
+  * 040_only_use_maltivec_when_needed.diff:
+  * 060_fix_avi_skip.diff:
+    + refresh
+
+  * 020_fix_libswscale_pic_code:
+    + added to fix compilation on amd64
+  
+  * 020_fix_x264_linkage:
+    + added to link against -lx264_pic rather than -lx264
+    + added to link against -ldts_pic rather than -ldts
+    + removed the corresponding sed command from debian/rules
+
+  * debian/libavutil-dev.install:
+    + Ship mem.h
+  
+ -- Reinhard Tartler <siretart at tauware.de>  Sat, 10 Mar 2007 18:21:18 +0100
+
 ffmpeg (0.cvs20070307-3) UNRELEASED; urgency=low
 
   * debian/control:

Modified: feisty/ffmpeg/debian/control
===================================================================
--- feisty/ffmpeg/debian/control	2007-03-16 17:25:48 UTC (rev 210)
+++ feisty/ffmpeg/debian/control	2007-03-16 17:28:38 UTC (rev 211)
@@ -2,11 +2,11 @@
 Section: libs
 Priority: optional
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Loic Minier <lool at dooz.org>
+Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Loic Minier <lool at dooz.org>, Reinhard Tartler <siretart at tauware.de>
 Build-Depends: debhelper (>= 4.0), quilt, libogg-dev, libvorbis-dev, liba52-dev, libdts-dev, zlib1g-dev, libsdl1.2-dev, libfreetype6-dev, libimlib2-dev, texi2html, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev, libx264-dev
 Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/experimental/ffmpeg
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/
+XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/feisty/ffmpeg
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/feisty/ffmpeg/
 
 Package: ffmpeg
 Section: graphics

Modified: feisty/ffmpeg/debian/libavutil-dev.install
===================================================================
--- feisty/ffmpeg/debian/libavutil-dev.install	2007-03-16 17:25:48 UTC (rev 210)
+++ feisty/ffmpeg/debian/libavutil-dev.install	2007-03-16 17:28:38 UTC (rev 211)
@@ -11,6 +11,7 @@
 usr/include/ffmpeg/lzo.h
 usr/include/ffmpeg/mathematics.h
 usr/include/ffmpeg/md5.h
+usr/include/ffmpeg/mem.h
 usr/include/ffmpeg/opt.h
 usr/include/ffmpeg/random.h
 usr/include/ffmpeg/rational.h

Modified: feisty/ffmpeg/debian/rules
===================================================================
--- feisty/ffmpeg/debian/rules	2007-03-16 17:25:48 UTC (rev 210)
+++ feisty/ffmpeg/debian/rules	2007-03-16 17:28:38 UTC (rev 211)
@@ -64,7 +64,7 @@
 	# Build ffmpeg and shared libraries
 	./configure $(confflags) --enable-shared --prefix=/usr
 	
-	sed 's/ldts/ldts_pic/' <config.mak >config.mak.pic
+	#sed 's/ldts/ldts_pic/' <config.mak >config.mak.pic
 	echo 'CFLAGS += -fPIC -DPIC' >> config.mak.pic
 	
 	cd libavutil && \