[Pkg-shadow-commits] sid/debian changelog,1.36,1.37 rules,1.9,1.10

[Christian Perrier]

Update of /cvsroot/pkg-shadow/sid/debian
In directory haydn:/tmp/cvs-serv28387

Modified Files:
	changelog rules 
Log Message:
Add --host to config_options on cross build. Patch from NIIBE Yutaka.
Closes: #283729

(re-commit Martin's change which was not in 4.0.3-34)


Index: changelog
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/changelog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- changelog	11 May 2005 06:33:06 -0000	1.36
+++ changelog	11 May 2005 07:08:25 -0000	1.37
@@ -1,3 +1,19 @@
+shadow (1:4.0.3-35) UNRELEASED; urgency=low
+
+  * Debian packaging fixes:
+    - Add --host to config_options on cross build. Patch from NIIBE Yutaka.
+      Closes: #283729
+* Debian specific programs fixes:
+    - NONE
+  * Upstream bugs not fixed in upstream releases or CVS:
+    - NONE
+  * Upstream bugs already fixed in upstream releases or CVS:
+    - NONE
+  * Translation updates:
+    - NONE
+
+ -- Christian Perrier <bubulle@debian.org>  Tue, 10 May 2005 18:24:12 +0200
+
 shadow (1:4.0.3-34) unstable; urgency=low
 
   * Debian packaging fixes:

Index: rules
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/rules,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- rules	11 May 2005 06:33:06 -0000	1.9
+++ rules	11 May 2005 07:08:25 -0000	1.10
@@ -1,9 +1,13 @@
 #!/usr/bin/make -f
 
 config_options := --disable-shared --without-libcrack --mandir=/usr/share/man
-#	--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 
 DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+  config_options += --host=$(DEB_HOST_GNU_TYPE)
+endif
 
 ifneq ($(DEB_HOST_GNU_SYSTEM),gnu)
   config_options += --with-libpam