r1230 - in /unstable/ffmpeg/debian: ./ changelog rules

[siretart at users.alioth.debian.org]

Author: siretart
Date: Tue Jun  3 19:34:35 2008
New Revision: 1230

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1230
Log:
* cleanups in debian/rules.

Modified:
    unstable/ffmpeg/debian/   (props changed)
    unstable/ffmpeg/debian/changelog
    unstable/ffmpeg/debian/rules

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. (original)
+++ bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. Tue Jun  3 19:34:35 2008
@@ -1,2 +1,3 @@
 25 siretart at tauware.de-20080603151429-63o3ag2pl1pxd47p
 26 siretart at tauware.de-20080603192817-6gi4jdk5ilh2y4w9
+27 siretart at tauware.de-20080603193428-euj1k56qi0hhrjs4

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Tue Jun  3 19:34:35 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-06-03 21:28:17.586999893 +0200
+timestamp: 2008-06-03 21:34:28.703000069 +0200
 committer: Reinhard Tartler <siretart at tauware.de>
 properties: 
 	branch-nick: trivial.fixes

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=1230&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Tue Jun  3 19:34:35 2008
@@ -26,8 +26,9 @@
     debian package. (Closes: #483960).
   * remove 011_link_plugins.diff. It is completely unnecessary now.
   * support building in paralell. make snippet taken from the qemu package.
-
- -- Reinhard Tartler <siretart at tauware.de>  Thu, 29 May 2008 16:17:54 +0200
+  * cleanups in debian/rules.
+
+ --
 
 ffmpeg-free (0.svn20080206-7) unstable; urgency=low
 

Modified: unstable/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/rules?rev=1230&op=diff
==============================================================================
--- unstable/ffmpeg/debian/rules (original)
+++ unstable/ffmpeg/debian/rules Tue Jun  3 19:34:35 2008
@@ -15,13 +15,16 @@
 endif
 
 # Comment out the following two lines for LGPL versions of the libraries
-gpl_confflags += --enable-gpl --enable-liba52 --enable-libfaad
-gpl_confflags += --enable-gpl --enable-pp --enable-swscaler --enable-x11grab
+gpl_confflags += --enable-gpl --enable-pp --enable-x11grab
+gpl_confflags += --enable-liba52 --enable-libfaad
 
 # Common configuration flags
-confflags += $(gpl_confflags) --prefix=/usr
+confflags := $(gpl_confflags)
+confflags += --enable-swscaler
+confflags += --prefix=/usr
 confflags += --enable-pthreads
-confflags += --enable-libvorbis --enable-libtheora
+confflags += --enable-libvorbis
+confflags += --enable-libtheora
 confflags += --enable-libgsm
 
 # Disable architecture-specific optimizations for shared build