[Pkg-shadow-commits] sid/debian changelog,1.39,1.40 control,1.2,1.3 rules,1.10,1.11

[Martin Quinson]

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

Modified Files:
	changelog control rules 
Log Message:
Enable login for GNU/Hurd (closes: #249372

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/changelog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- changelog	11 May 2005 08:47:32 -0000	1.39
+++ changelog	11 May 2005 11:22:28 -0000	1.40
@@ -3,6 +3,8 @@
   * Debian packaging fixes:
     - Add --host to config_options on cross build. Patch from NIIBE Yutaka.
       Closes: #283729
+    - Enable login for GNU/Hurd in rules. First patch from Robert Millan.
+      Closes: #249372
   * Debian specific programs fixes:
     - NONE
   * Upstream bugs not fixed in upstream releases or CVS:

Index: rules
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/rules,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- rules	11 May 2005 07:08:25 -0000	1.10
+++ rules	11 May 2005 11:22:28 -0000	1.11
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-config_options := --disable-shared --without-libcrack --mandir=/usr/share/man
+config_options := --disable-shared --without-libcrack --mandir=/usr/share/man --with-libpam
 
 DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
 DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -9,10 +9,6 @@
   config_options += --host=$(DEB_HOST_GNU_TYPE)
 endif
 
-ifneq ($(DEB_HOST_GNU_SYSTEM),gnu)
-  config_options += --with-libpam
-endif
-
 # see /usr/share/doc/autotools-dev/README.Debian.gz
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -141,19 +137,11 @@
 	dh_compress
 	dh_shlibdeps
 	dh_installdebconf
-ifneq ($(DEB_HOST_GNU_SYSTEM),gnu)
 	echo "loginpam=login (>= 970502-1), libpam-modules (>= 0.72-5)" >> debian/passwd.substvars
-endif
 	dh_installdeb
-	dh_gencontrol -ppasswd
-ifneq ($(DEB_HOST_GNU_SYSTEM),gnu)
-	dh_gencontrol -plogin
-endif
+	dh_gencontrol
 	dh_md5sums
-	dh_builddeb -ppasswd
-ifneq ($(DEB_HOST_GNU_SYSTEM),gnu)
-	dh_builddeb -plogin
-endif
+	dh_builddeb
 
 binary: binary-indep binary-arch
 

Index: control
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/control,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- control	8 May 2005 10:58:35 -0000	1.2
+++ control	11 May 2005 11:22:28 -0000	1.3
@@ -4,7 +4,7 @@
 Maintainer: Shadow package maintainers <pkg-shadow-devel@lists.alioth.debian.org>
 Standards-Version: 3.6.1.1
 Uploaders: Christian Perrier <bubulle@debian.org>, Sam Hartman <hartmans@debian.org>
-Build-Depends: autoconf, automake1.7, libtool, bzip2, gettext, libpam0g-dev [!hurd-i386], texinfo, file, debhelper (>= 4.1.16), po-debconf, libpam-runtime (>= 0.76-14),dpatch
+Build-Depends: autoconf, automake1.7, libtool, bzip2, gettext, libpam0g-dev, texinfo, file, debhelper (>= 4.1.16), po-debconf, libpam-runtime (>= 0.76-14),dpatch
 
 Package: passwd
 Architecture: any