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

[lool at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit b759739dd12cfb77b87d1fc2c16800a3b9abceea
Author: Loïc Minier <lool at dooz.org>
Date:   Sun Feb 21 12:56:21 2010 +0100

    Install to debian/install/* flavor subdirs

diff --git a/debian/libx264-85.install b/debian/libx264-85.install
index 1a430dd..444ad85 100644
--- a/debian/libx264-85.install
+++ b/debian/libx264-85.install
@@ -1 +1 @@
-/usr/lib/libx264.so.*
+shared/usr/lib/libx264.so.*     usr/lib
diff --git a/debian/libx264-dev.install b/debian/libx264-dev.install
index 72281c5..3ec2dad 100644
--- a/debian/libx264-dev.install
+++ b/debian/libx264-dev.install
@@ -1,4 +1,4 @@
-/usr/lib/libx264.so
-/usr/lib/libx264.a
-/usr/lib/pkgconfig/x264.pc
-/usr/include/x264.h
+shared/usr/lib/libx264.so               usr/lib
+static/usr/lib/libx264.a                usr/lib
+shared/usr/lib/pkgconfig/x264.pc        usr/lib/pkgconfig
+shared/usr/include/x264.h               usr/include
diff --git a/debian/rules b/debian/rules
index 7518a4c..27e951f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,33 +28,31 @@ build-stamp: debian/stamp-patched
 	chmod +x version.sh
 	# Build static lib
 	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure $(static_confflags)
-	$(MAKE) libx264.a
-	# Backup static lib
-	mv libx264.a libx264.a.bak
-	# Build shared lib
+	$(MAKE)
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/install/static
 	$(MAKE) distclean
+	# Build shared lib
 	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure $(shared_confflags)
 	$(MAKE)
-	# Restore static lib
-	mv libx264.a.bak libx264.a
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/install/shared
 	mv version.sh-upstream version.sh
 	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
+	rm -rf debian/install
 	[ ! -f Makefile ] || $(MAKE) distclean
 	[ ! -f version.sh-upstream ] ||  mv version.sh-upstream version.sh
 	$(MAKE) -f debian/rules unpatch
-	dh_clean build-stamp libx264.a.bak
+	dh_clean build-stamp
 
 install:
 	dh_testdir
 	dh_testroot
 	dh_prep
 	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	dh_install --fail-missing --sourcedir=debian/tmp
+	dh_install --list-missing --sourcedir=debian/install
 
 binary-arch: build install
 	dh_testdir
diff --git a/debian/x264.install b/debian/x264.install
index 313a07b..5b601e6 100644
--- a/debian/x264.install
+++ b/debian/x264.install
@@ -1 +1 @@
-/usr/bin/x264
+shared/usr/bin/x264     usr/bin

-- 
x264 packaging