[Pkg-shadow-commits] r820 - trunk/debian

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2006-01-22 15:37:11 +0000 (Sun, 22 Jan 2006)
New Revision: 820

Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
Do not build login on The Hurd (#349356)


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-01-22 15:30:35 UTC (rev 819)
+++ trunk/debian/changelog	2006-01-22 15:37:11 UTC (rev 820)
@@ -4,6 +4,8 @@
   * Debian specific fixes:
     - recode_manpages.sh was not called after the switch to CDBS.
       The man pages were all distributed in UTF-8
+    - do not build login on The Hurd
+      Closes: #349356
   * Upstream bugs or fixes not already fixed in upstream releases or CVS:
     - 485_shell-env-exitcodes:
       - explicitly pass environment to shell() as 3rd argument

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2006-01-22 15:30:35 UTC (rev 819)
+++ trunk/debian/rules	2006-01-22 15:37:11 UTC (rev 820)
@@ -1,11 +1,20 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+# Do not build login on The Hurd
+override DEB_ARCH_PACKAGES=passwd
+endif
+
 export DH_COMPAT = 4
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 # Specify where dh_install will find the files that it needs to move:
 DEB_DH_INSTALL_SOURCEDIR=debian/tmp
+# Specify the destination of shadow's "make install"
+# (This is only needed on The Hurd, where only one package is built. On
+# the other arch, DEB_DESTDIR already points to debian/tmp)
+DEB_DESTDIR=$(CURDIR)/debian/tmp
 
 include /usr/share/cdbs/1/class/autotools.mk
 # Automatically update autoconf, etc.