[SCM] x264/master: Remove library SONAME from debian/libx264N.install file.

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Sun Jan 8 12:42:07 UTC 2012


The following commit has been merged in the master branch:
commit ffac0f1acae34d28110b29c26633d77ce1bb6e83
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Sun Jan 8 13:22:33 2012 +0100

    Remove library SONAME from debian/libx264N.install file.

diff --git a/debian/libx264-118.install.in b/debian/libx264N.install.in
similarity index 100%
rename from debian/libx264-118.install.in
rename to debian/libx264N.install.in
diff --git a/debian/rules b/debian/rules
index f971aa0..c458a83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,10 +18,9 @@ DH_INSTALL_FILES = debian/$(libx264N).install \
 	dh $@ --parallel
 
 $(DH_INSTALL_FILES):
-	sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $@.in > $@
+	sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $(subst $(libx264N),libx264N,$@).in > $@
 
 override_dh_auto_build:
-	debian/rules $(DH_INSTALL_FILES)
 	# Build static lib
 	LDFLAGS="$(LDFLAGS)" ./configure $(static_confflags) \
 	   || ( tail -v -n +0 config.log config.log ; exit 1 )
@@ -53,7 +52,7 @@ override_dh_auto_clean:
 	$(MAKE) -o config.mak distclean
 	dh_clean config.mak2 $(DH_INSTALL_FILES)
 
-override_dh_install:
+override_dh_install: $(DH_INSTALL_FILES)
 	dh_install --list-missing --sourcedir=debian/install
 ifeq ($(do_opt),yes)
 	mkdir -p debian/$(libx264N)$(opt_libdir)

-- 
x264 packaging



More information about the pkg-multimedia-commits mailing list