[Reproducible-commits] [texlive-bin] 13/16: fixes for the build process

[Reiner Herrmann]

This is an automated email from the git hooks/post-receive script.

deki-guest pushed a commit to branch master
in repository texlive-bin.

commit f3665f0a74548c08ffcc26338339d5e2c09a54f7
Author: Norbert Preining <preining at debian.org>
Date:   Tue Sep 22 19:48:26 2015 +0900

    fixes for the build process
---
 debian/libkpathsea-dev.install  | 7 ++++---
 debian/libptexenc-dev.install   | 6 +++---
 debian/libptexenc1.install      | 4 ++--
 debian/libsynctex-dev.install   | 6 +++---
 debian/libtexlua52-dev.install  | 6 +++---
 debian/libtexluajit-dev.install | 6 +++---
 debian/rules                    | 4 ++--
 7 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/debian/libkpathsea-dev.install b/debian/libkpathsea-dev.install
index 5a0eef6..7aa1d0e 100644
--- a/debian/libkpathsea-dev.install
+++ b/debian/libkpathsea-dev.install
@@ -1,4 +1,5 @@
-usr/lib/libkpathsea.a
-usr/lib/libkpathsea.so
-usr/lib/pkgconfig/kpathsea.pc
+usr/lib/*/libkpathsea.a
+usr/lib/*/libkpathsea.so
+usr/lib/*/pkgconfig/kpathsea.pc
 usr/include/kpathsea/*
+usr/include/*/kpathsea/*
diff --git a/debian/libptexenc-dev.install b/debian/libptexenc-dev.install
index 68ed96c..954f5b3 100644
--- a/debian/libptexenc-dev.install
+++ b/debian/libptexenc-dev.install
@@ -1,4 +1,4 @@
-usr/lib/libptexenc.a
-usr/lib/libptexenc.so
-usr/lib/pkgconfig/ptexenc.pc
+usr/lib/*/libptexenc.a
+usr/lib/*/libptexenc.so
+usr/lib/*/pkgconfig/ptexenc.pc
 usr/include/ptexenc/*
diff --git a/debian/libptexenc1.install b/debian/libptexenc1.install
index 1b5b27c..c6c11c5 100644
--- a/debian/libptexenc1.install
+++ b/debian/libptexenc1.install
@@ -1,2 +1,2 @@
-usr/lib/libptexenc.so.1.*.*
-usr/lib/libptexenc.so.1
+usr/lib/*/libptexenc.so.1.*.*
+usr/lib/*/libptexenc.so.1
diff --git a/debian/libsynctex-dev.install b/debian/libsynctex-dev.install
index 81e9f2c..381c72b 100644
--- a/debian/libsynctex-dev.install
+++ b/debian/libsynctex-dev.install
@@ -1,4 +1,4 @@
-usr/lib/libsynctex.a
-usr/lib/libsynctex.so
-usr/lib/pkgconfig/synctex.pc
+usr/lib/*/libsynctex.a
+usr/lib/*/libsynctex.so
+usr/lib/*/pkgconfig/synctex.pc
 usr/include/synctex/*
diff --git a/debian/libtexlua52-dev.install b/debian/libtexlua52-dev.install
index a533618..198036c 100644
--- a/debian/libtexlua52-dev.install
+++ b/debian/libtexlua52-dev.install
@@ -1,4 +1,4 @@
-usr/lib/libtexlua52.a
-usr/lib/libtexlua52.so
-usr/lib/pkgconfig/texlua52.pc
+usr/lib/*/libtexlua52.a
+usr/lib/*/libtexlua52.so
+usr/lib/*/pkgconfig/texlua52.pc
 usr/include/texlua52/*
diff --git a/debian/libtexluajit-dev.install b/debian/libtexluajit-dev.install
index 010baeb..9eb96c0 100644
--- a/debian/libtexluajit-dev.install
+++ b/debian/libtexluajit-dev.install
@@ -1,4 +1,4 @@
-usr/lib/libtexluajit.a
-usr/lib/libtexluajit.so
-usr/lib/pkgconfig/texluajit.pc
+usr/lib/*/libtexluajit.a
+usr/lib/*/libtexluajit.so
+usr/lib/*/pkgconfig/texluajit.pc
 usr/include/texluajit/*
diff --git a/debian/rules b/debian/rules
index 95819e6..cb466c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -170,9 +170,9 @@ override_dh_install:
 	rm -f debian/tmp/usr/lib/*.la debian/tmp/usr/lib/*/*.la
 	# mv c-auto.h into arch-dependent include path
 	mkdir -p debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/kpathsea
-	mv debian/tmp/usr/lib/kpathsea/c-auto.h \
+	mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/kpathsea/c-auto.h \
 		debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/kpathsea/
-	rmdir debian/tmp/usr/lib/kpathsea
+	rmdir debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/kpathsea
 	dh_install --fail-missing --sourcedir=$(CURDIR)/debian/tmp
 	# replace xdvi wrapper shell script with perl variant to
 	# allow for opening of gz etc files

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/texlive-bin.git