[SCM] transcode packaging branch, master, updated. debian/1.1.3-0.0ubuntu1-6-gdb478d0

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

The following commit has been merged in the master branch:
commit db478d021be06b436b659cd33559195688e28153
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Tue Aug 25 09:23:34 2009 +0200

    Wrapped and ordered all configure flags. Introduced a confflags varible.

diff --git a/debian/rules b/debian/rules
index 5bab450..a58c328 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,26 +23,44 @@ ifeq "$(DEBIAN_ARCH)" "powerpc"
 #	CFLAGS += -mabi=altivec -maltivec
 endif
 
+confflags += CFLAGS="$(CFLAGS)"
+confflags += $(CROSS)
+confflags += --disable-libfametest
+confflags += --disable-libmpeg3
+confflags += --enable-a52
+confflags += --enable-a52-default-decoder
+confflags += --enable-alsa
+#confflags += --enable-faac
+confflags += --enable-ffbin
+confflags += --enable-freetype2
+confflags += --enable-gtk
+confflags += --enable-imagemagick
+confflags += --enable-libdv
+#confflags += --enable-libfame
+confflags += --enable-libpostproc
+confflags += --enable-libquicktime
+confflags += --enable-libxml2
+confflags += --enable-lzo
+#confflags += --enable-mjpegtools
+confflags += --enable-netstream
+confflags += --enable-ogg
+confflags += --enable-oss
+confflags += --enable-sdl
+confflags += --enable-text
+confflags += --enable-theora
+confflags += --enable-v4l
+confflags += --enable-vorbis
+confflags += --enable-x264
+confflags += --enable-xvid
+confflags += --mandir=\$${prefix}/share/man
+confflags += --prefix=/usr
+confflags += --with-imagemagick-includes=/usr/include/ImageMagick
+
 configure: configure-stamp
 configure-stamp: debian/stamp-patched
 	dh_testdir
 
-	./configure --prefix=/usr --mandir=\$${prefix}/share/man \
-	$(CROSS) CFLAGS="$(CFLAGS)" --disable-libmpeg3 --enable-text \
-	--enable-v4l --enable-libfame --disable-libfametest --enable-lzo \
-	--enable-ogg --enable-mjpegtools --enable-gtk --enable-imagemagick \
-	--enable-theora --enable-libquicktime --enable-libdv --enable-libxml2 \
-	--enable-vorbis --enable-a52 --enable-netstream --enable-ffbin \
-	--enable-sdl --enable-libpostproc --enable-freetype2 --enable-xvid \
-	--enable-a52-default-decoder --enable-x264 --enable-faac --enable-alsa \
-	--enable-oss CC="$(CC)" CXX="$(CXX)" \
-	--with-imagemagick-includes=/usr/include/ImageMagick
-
-
-# --enable-pvm3
-
-# Does nothing
-# LDFLAGS="-Wl,--as-needed"
+	./configure $(confflags)
 
 	touch $@
 

-- 
transcode packaging