[SCM] Debian GNU Hurd packaging branch, master, updated. debian/20120605-2-100-ga97dded

[Samuel Thibault]

The following commit has been merged in the master branch:
commit 7478b0a541baac7fd15d5d1be69664249e56efd1
Author: Samuel Thibault <address@hidden>
Date:   Tue Jul 10 03:33:42 2012 +0000

    rules: Set XKB_DATA root for installing in debian/tmp

diff --git a/debian/changelog b/debian/changelog
index 99b187a..3b9507d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ hurd (20120710-1) UNRELEASED; urgency=low
     - patches/libdde_fixes.patch: Remove, merged upstream.
     - patches/ext2fs_large_stores.patch: Refresh.
   * hurd-console.default: Get keyboard layout from console-setup.
+  * rules: Set XKB_DATA root for installing in debian/tmp.
 
  -- Samuel Thibault <address@hidden>  Tue, 10 Jul 2012 01:36:55 +0000
 
diff --git a/debian/rules b/debian/rules
index 7ab667a..a2c77a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_CONFIGURE_USER_FLAGS := --disable-profile 
--enable-static-progs='ext2fs,ufs,iso9660fs'
-DEB_MAKE_INSTALL_TARGET = install prefix=$(DEB_DESTDIR) 
sysconfdir=$(DEB_DESTDIR)/etc localstatedir=$(DEB_DESTDIR)/var
+DEB_MAKE_INSTALL_TARGET = install prefix=$(DEB_DESTDIR) 
sysconfdir=$(DEB_DESTDIR)/etc localstatedir=$(DEB_DESTDIR)/var 
XKB_BASE=$(DEB_DESTDIR)/usr/share/X11/xkb
 DEB_DH_STRIP_ARGS := --dbg-package=hurd
 DEB_DH_MAKESHLIBS_ARGS_hurd := --add-udeb="hurd-udeb"
 

-- 
Debian GNU Hurd packaging