[hurd] 01/01: fix console module path after upgrade to compat 9

[Samuel Thibault]

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

sthibault pushed a commit to branch master
in repository hurd.

commit 0cf2abe9f65602179a502c9c7c84e8a02bdef454
Author: Samuel Thibault <address@hidden>
Date:   Tue Aug 18 22:01:14 2015 +0000

    fix console module path after upgrade to compat 9
---
 debian/changelog            | 1 +
 debian/hurd-udeb.install.in | 6 +++---
 debian/hurd.install.in      | 2 +-
 debian/rules                | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 249035f..b3bbb3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ hurd (1:0.6.git20150704-4) UNRELEASED; urgency=medium
   * Add a noudeb build profile.
   * Add stage1 and stage2 build profiles for cross-bootstrapping hurd.
   * patches/git-revert-dc7e6a13: Revert upstream check against cross-compiling.
+  * Move console modules to multiarch path.
 
  -- Samuel Thibault <address@hidden>  Tue, 18 Aug 2015 10:50:47 +0000
 
diff --git a/debian/hurd-udeb.install.in b/debian/hurd-udeb.install.in
index c9eedcb..a2049dc 100644
--- a/debian/hurd-udeb.install.in
+++ b/debian/hurd-udeb.install.in
@@ -60,9 +60,9 @@ hurd/streamio
 hurd/symlink
 hurd/term
 hurd/tmpfs
-lib/hurd/console/pc_kbd.so.* usr/lib/hurd/console
-lib/hurd/console/pc_mouse.so.* usr/lib/hurd/console
-lib/hurd/console/vga.so.* usr/lib/hurd/console
+lib/hurd/console/pc_kbd.so.* usr/lib/@DEB_HOST_MULTIARCH@/hurd/console
+lib/hurd/console/pc_mouse.so.* usr/lib/@DEB_HOST_MULTIARCH@/hurd/console
+lib/hurd/console/vga.so.* usr/lib/@DEB_HOST_MULTIARCH@/hurd/console
 lib/hurd/console-run sbin
 sbin/MAKEDEV
 sbin/e2os
diff --git a/debian/hurd.install.in b/debian/hurd.install.in
index 740ff43..ac91892 100644
--- a/debian/hurd.install.in
+++ b/debian/hurd.install.in
@@ -46,7 +46,7 @@ etc/login/.profile
 etc/login/README
 etc/ttys
 hurd/*
-lib/@DEB_HOST_MULTIARCH@/hurd/console/*.so.* usr/lib/hurd/console
+lib/@DEB_HOST_MULTIARCH@/hurd/console/*.so.* 
usr/lib/@DEB_HOST_MULTIARCH@/hurd/console
 lib/hurd/console-run sbin
 lib/hurd/getty sbin
 lib/hurd/rc etc/hurd
diff --git a/debian/rules b/debian/rules
index b2e88bb..059c89d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,7 +88,7 @@ endif
 else
        dh_auto_install -Bbuild-deb -- prefix=$(DEB_DESTDIR) 
libdir=$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH) 
libexecdir=$(DEB_DESTDIR)/lib/hurd sysconfdir=$(DEB_DESTDIR)/etc 
localstatedir=$(DEB_DESTDIR)/var XKB_BASE=$(DEB_DESTDIR)/usr/share/X11/xkb
 ifeq (,$(filter noudeb,$(DEB_BUILD_PROFILES)))
-       dh_auto_install -Bbuild-udeb -- prefix=$(DEB_DESTDIR_UDEB) 
libdir=$(DEB_DESTDIR_UDEB)/lib libexecdir=$(DEB_DESTDIR)/lib/hurd 
sysconfdir=$(DEB_DESTDIR_UDEB)/etc localstatedir=$(DEB_DESTDIR_UDEB)/var 
XKB_BASE=$(DEB_DESTDIR_UDEB)/usr/share/X11/xkb
+       dh_auto_install -Bbuild-udeb -- prefix=$(DEB_DESTDIR_UDEB) 
libdir=$(DEB_DESTDIR_UDEB)/lib libexecdir=$(DEB_DESTDIR_UDEB)/lib/hurd 
sysconfdir=$(DEB_DESTDIR_UDEB)/etc localstatedir=$(DEB_DESTDIR_UDEB)/var 
XKB_BASE=$(DEB_DESTDIR_UDEB)/usr/share/X11/xkb
 endif
        $(MAKE) -C libdde-linux26 
INSTALLDIR=$(CURDIR)/debian/tmp/usr/share/libdde_linux26/build/include install
 

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