[Pkg-shadow-commits] sid/debian/patches 100_LINGUAS.dpatch,NONE,1.1 324_configure.in-no-debian-dir.dpatch,NONE,1.1 004_configure.in.dpatch,1.2,1.3 00list,1.27,1.28

[Christian Perrier]

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

Modified Files:
	004_configure.in.dpatch 00list 
Added Files:
	100_LINGUAS.dpatch 324_configure.in-no-debian-dir.dpatch 
Log Message:
Split out the 004_configure.in patch to more significant patches


Index: 004_configure.in.dpatch
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/patches/004_configure.in.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 004_configure.in.dpatch	11 May 2005 08:03:11 -0000	1.2
+++ 004_configure.in.dpatch	11 May 2005 08:47:32 -0000	1.3
@@ -25,15 +25,6 @@
 diff -urNad shadow-4.0.3/configure.in /tmp/dpep.ZnE7gx/shadow-4.0.3/configure.in
 --- shadow-4.0.3/configure.in	2005-05-11 09:56:26.668669556 +0200
 +++ /tmp/dpep.ZnE7gx/shadow-4.0.3/configure.in	2005-05-11 09:56:47.679241252 +0200
-@@ -138,7 +138,7 @@
- fi
- 
- AC_MSG_CHECKING(location of shared mail directory)
--for maildir in /var/spool/mail /var/mail /usr/spool/mail /usr/mail NONE; do
-+for maildir in /var/mail /var/spool/mail /usr/spool/mail /usr/mail NONE; do
- 	if test "$maildir" = "NONE"; then
- 		AC_MSG_RESULT(None)
- 	elif test -d $maildir; then
 @@ -265,9 +265,10 @@
  	AC_CHECK_LIB(pam, pam_start,
  		[AC_DEFINE(USE_PAM)
@@ -47,15 +38,6 @@
  		)]
  		[AC_MSG_CHECKING(use login access checking if PAM not used)
  		AC_DEFINE(LOGIN_ACCESS)
-@@ -282,7 +283,7 @@
- 	AC_MSG_RESULT(yes)
- fi
- 
--ALL_LINGUAS="cs de el fr ja ko pl sv uk"
-+ALL_LINGUAS="bs ca cs da de el es eu fi fr he id it ja ko nb nn nl pl pt_BR pt ro ru sk sq sv tl tr uk vi zh_CN zh_TW"
- AM_GNU_GETTEXT
- 
- AC_OUTPUT([
 @@ -305,7 +306,6 @@
  	lib/Makefile
  	src/Makefile

Index: 00list
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/patches/00list,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- 00list	11 May 2005 07:35:35 -0000	1.27
+++ 00list	11 May 2005 08:47:32 -0000	1.28
@@ -7,6 +7,7 @@
 008_src
 009_etc
 010_chpasswd-md5
+100_LINGUAS
 101_cs
 102_de
 103_el
@@ -59,6 +60,7 @@
 320_nscd_header
 321_remove_malloc_definition
 323_passwd.1-typo
+324_configure.in-no-debian-dir
 401_cppw_src
 #402_missing_debian_man_pages
 403_sg_symlink_162339_163652

--- NEW FILE: 100_LINGUAS.dpatch ---
#! /bin/sh -e
## 100_LINGUAS.dpatch by <unknown>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add new languages to LINGUAS in configure.in

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 -urNad shadow-4.0.3/configure.in /tmp/dpep.ZnE7gx/shadow-4.0.3/configure.in
--- shadow-4.0.3/configure.in	2005-05-11 09:56:26.668669556 +0200
+++ /tmp/dpep.ZnE7gx/shadow-4.0.3/configure.in	2005-05-11 09:56:47.679241252 +0200
@@ -282,7 +283,7 @@
 	AC_MSG_RESULT(yes)
 fi
 
-ALL_LINGUAS="cs de el fr ja ko pl sv uk"
+ALL_LINGUAS="bs ca cs da de el es eu fi fr he id it ja ko nb nn nl pl pt_BR pt ro ru sk sq sv tl tr uk vi zh_CN zh_TW"
 AM_GNU_GETTEXT
 
 AC_OUTPUT([

--- NEW FILE: 324_configure.in-no-debian-dir.dpatch ---
#! /bin/sh -e
## 004_configure.in.dpatch by <unknown>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove "debian/Makefile" from the original configure.on file

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 -urNad shadow-4.0.3/configure.in /tmp/dpep.ZnE7gx/shadow-4.0.3/configure.in
--- shadow-4.0.3/configure.in	2005-05-11 09:56:26.668669556 +0200
+++ /tmp/dpep.ZnE7gx/shadow-4.0.3/configure.in	2005-05-11 09:56:47.679241252 +0200
@@ -305,7 +306,6 @@
 	lib/Makefile
 	src/Makefile
 	contrib/Makefile
-	debian/Makefile
 	etc/Makefile
 	etc/pam.d/Makefile
 	shadow.spec])