[Pkg-shadow-commits] r326 - trunk/debian/patches

Nicolas FRANCOIS pkg-shadow-devel@lists.alioth.debian.org
Wed, 29 Jun 2005 21:36:51 +0000


Author: nekral-guest
Date: 2005-06-29 21:36:51 +0000 (Wed, 29 Jun 2005)
New Revision: 326

Removed:
   trunk/debian/patches/009_etc.dpatch
Modified:
   trunk/debian/patches/series
Log:
Delete 009_etc.dpatch because we use our own login.defs


Deleted: trunk/debian/patches/009_etc.dpatch
===================================================================
--- trunk/debian/patches/009_etc.dpatch	2005-06-29 21:26:28 UTC (rev 325)
+++ trunk/debian/patches/009_etc.dpatch	2005-06-29 21:36:51 UTC (rev 326)
@@ -1,80 +0,0 @@
-#! /bin/sh -e
-## 009_etc.dpatch by <unknown>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Various patches in etc for the Debian package (before switch to dpatch)
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-
-diff -Nru shadow-4.0.3/etc/login.defs shadow-4.0.3_30.4/etc/login.defs
---- shadow-4.0.3/etc/login.defs	1997-05-02 01:14:35.000000000 +0200
-+++ shadow-4.0.3_30.4/etc/login.defs	2004-11-02 22:17:40.000000000 +0100
-@@ -121,7 +121,7 @@
- #   MAILDIR is for Qmail
- #
- #MAILDIR	Maildir
--MAIL_DIR	/usr/spool/mail
-+MAIL_DIR	/var/mail
- #MAIL_FILE	.mail
- 
- #
-diff -Nru shadow-4.0.3/etc/login.defs.hurd shadow-4.0.3_30.4/etc/login.defs.hurd
---- shadow-4.0.3/etc/login.defs.hurd	2000-08-26 20:27:10.000000000 +0200
-+++ shadow-4.0.3_30.4/etc/login.defs.hurd	2004-11-02 22:17:40.000000000 +0100
-@@ -24,7 +24,7 @@
- #   QMAIL_DIR is for Qmail
- #
- #QMAIL_DIR	Maildir
--MAIL_DIR	/var/spool/mail
-+MAIL_DIR	/var/mail
- #MAIL_FILE	.mail
- 
- #
-@@ -85,7 +85,7 @@
- # phone, home phone).  If not defined, no changes are allowed.
- # For backward compatibility, "yes" = "rwh" and "no" = "frwh".
- #
--CHFN_RESTRICT		rwh
-+CHFN_RESTRICT		frwh
- 
- #
- # Password prompt (%s will be replaced by user name).
-diff -Nru shadow-4.0.3/etc/login.defs.linux shadow-4.0.3_30.4/etc/login.defs.linux
---- shadow-4.0.3/etc/login.defs.linux	2000-08-26 20:27:10.000000000 +0200
-+++ shadow-4.0.3_30.4/etc/login.defs.linux	2004-11-02 22:17:40.000000000 +0100
-@@ -131,7 +131,7 @@
- #   QMAIL_DIR is for Qmail
- #
- #QMAIL_DIR	Maildir
--MAIL_DIR	/var/spool/mail
-+MAIL_DIR	/var/mail
- #MAIL_FILE	.mail
- 
- #
-@@ -282,7 +282,7 @@
- # phone, home phone).  If not defined, no changes are allowed.
- # For backward compatibility, "yes" = "rwh" and "no" = "frwh".
- # 
--CHFN_RESTRICT		rwh
-+CHFN_RESTRICT		frwh
- 
- #
- # Password prompt (%s will be replaced by user name).

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-06-29 21:26:28 UTC (rev 325)
+++ trunk/debian/patches/series	2005-06-29 21:36:51 UTC (rev 326)
@@ -45,8 +45,6 @@
 358_userdel_remove_group_from_gshadow
 360_newgrp_preserve_env
 008_su_GNU_origin
-# 009 is patching login.defs file we don't use, actually..:-)
-# 009_etc.dpatch
 100_LINGUAS.dpatch
 100_shadow.pot
 101_cs.dpatch