[SCM] x264/master: Don't require dpkg-dev for 10bit wrapper script

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

The following commit has been merged in the master branch:
commit 8d08837859a4e165e614077956b327d5687ab1dd
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Thu Jan 15 08:08:42 2015 +0100

    Don't require dpkg-dev for 10bit wrapper script

diff --git a/debian/changelog b/debian/changelog
index 7255038..bcd267f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ x264 (2:0.142.2495+git6a301b6-1) unstable; urgency=low
   [ Rico Tzschichholz ]
   * Update to new upstream snapshot
   * Imported Upstream version 0.142.2495+git6a301b6
-  * Fix wrapper script installation
+  * Fix wrapper script installation and don't require dpkg-dev
   * Drop obsolete build-dep on libx11-dev (Closes: #752093)
   * Add properly_detect_x32.patch (Closes: #775349)
 
diff --git a/debian/rules b/debian/rules
index 8cca800..338012e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,9 @@ endif
 	$(MAKE)
 	install -d -m755 $(CURDIR)/debian/install/shared/usr/lib/$(DEB_HOST_MULTIARCH)/x264-10bit
 	install -m755 libx264.so.* $(CURDIR)/debian/install/shared/usr/lib/$(DEB_HOST_MULTIARCH)/x264-10bit
-	install -m755 debian/x264-10bit	$(CURDIR)/debian/install/shared/usr/bin
+	sed -e 's, at DEB_HOST_MULTIARCH@,$(DEB_HOST_MULTIARCH),' \
+		debian/x264-10bit.in > $(CURDIR)/debian/install/shared/usr/bin/x264-10bit
+	chmod 755 $(CURDIR)/debian/install/shared/usr/bin/x264-10bit
 ifeq ($(do_opt),yes)
 	$(MAKE) distclean
 	# Build opt lib
diff --git a/debian/x264-10bit b/debian/x264-10bit.in
similarity index 90%
rename from debian/x264-10bit
rename to debian/x264-10bit.in
index b75befd..9caed3c 100755
--- a/debian/x264-10bit
+++ b/debian/x264-10bit.in
@@ -15,8 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-eval `dpkg-architecture -s`
-export LD_LIBRARY_PATH=/usr/lib/${DEB_HOST_GNU_TYPE}/x264-10bit${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH:-}
+export LD_LIBRARY_PATH=/usr/lib/@DEB_HOST_MULTIARCH@/x264-10bit${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH:-}
 
 if [ $# -gt 0 ]; then
     exec "$@"

-- 
x264 packaging