[Pkg-samba-maint] r3001 - trunk/samba/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2009-08-24 05:41:05 +0000 (Mon, 24 Aug 2009)
New Revision: 3001

Added:
   trunk/samba/debian/samba.pam
Removed:
   trunk/samba/debian/samba.pamd
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/rules
Log:
rename debian/samba.pamd to debian/samba.pam and call dh_installpam
from debian/rules install, bringing us a smidge closer to a stock
debhelper build

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2009-08-24 05:37:22 UTC (rev 3000)
+++ trunk/samba/debian/changelog	2009-08-24 05:41:05 UTC (rev 3001)
@@ -5,6 +5,9 @@
     logins such as pam_ck_connector.
   * debian/control: samba depends on libpam-runtime (>= 1.0.1-11) for the
     above.
+  * rename debian/samba.pamd to debian/samba.pam and call dh_installpam
+    from debian/rules install, bringing us a smidge closer to a stock
+    debhelper build
 
  -- Steve Langasek <vorlon at debian.org>  Sun, 23 Aug 2009 22:35:16 -0700
 

Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules	2009-08-24 05:37:22 UTC (rev 3000)
+++ trunk/samba/debian/rules	2009-08-24 05:41:05 UTC (rev 3001)
@@ -196,10 +196,10 @@
 	# Install samba-common's conffiles - they'll get moved later to their
 	# correct place by dh_movefiles.
 	cp debian/gdbcommands $(DESTDIR)/etc/samba/
-	cp debian/samba.pamd $(DESTDIR)/etc/pam.d/samba
 	install -m755 debian/samba-common.dhcp $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d/samba
 
 	dh_movefiles
+	dh_installpam
 
 # Build architecture-independent files here.
 # Pass -i to all debhelper commands in this target to reduce clutter.

Copied: trunk/samba/debian/samba.pam (from rev 3000, trunk/samba/debian/samba.pamd)
===================================================================
--- trunk/samba/debian/samba.pam	                        (rev 0)
+++ trunk/samba/debian/samba.pam	2009-08-24 05:41:05 UTC (rev 3001)
@@ -0,0 +1,3 @@
+ at include common-auth
+ at include common-account
+ at include common-session-noninteractive

Deleted: trunk/samba/debian/samba.pamd
===================================================================
--- trunk/samba/debian/samba.pamd	2009-08-24 05:37:22 UTC (rev 3000)
+++ trunk/samba/debian/samba.pamd	2009-08-24 05:41:05 UTC (rev 3001)
@@ -1,3 +0,0 @@
- at include common-auth
- at include common-account
- at include common-session-noninteractive