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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-05-12 23:34:52 +0000 (Thu, 12 May 2005)
New Revision: 134

Modified:
   trunk/debian/patches/004_configure.in.dpatch
   trunk/debian/patches/324_configure.in-no-debian-dir.dpatch
   trunk/debian/patches/series
Log:
Remove one chunk from 004 (it was already extracted in 324).
Also activate 324_configure.in-no-debian-dir.dpatch, and fix its offset.


Modified: trunk/debian/patches/004_configure.in.dpatch
===================================================================
--- trunk/debian/patches/004_configure.in.dpatch	2005-05-12 23:24:42 UTC (rev 133)
+++ trunk/debian/patches/004_configure.in.dpatch	2005-05-12 23:34:52 UTC (rev 134)
@@ -38,11 +38,3 @@
  		)]
  		[AC_MSG_CHECKING(use login access checking if PAM not used)
  		AC_DEFINE(LOGIN_ACCESS)
-@@ -305,7 +306,6 @@
- 	lib/Makefile
- 	src/Makefile
- 	contrib/Makefile
--	debian/Makefile
- 	etc/Makefile
- 	etc/pam.d/Makefile
- 	shadow.spec])

Modified: trunk/debian/patches/324_configure.in-no-debian-dir.dpatch
===================================================================
--- trunk/debian/patches/324_configure.in-no-debian-dir.dpatch	2005-05-12 23:24:42 UTC (rev 133)
+++ trunk/debian/patches/324_configure.in-no-debian-dir.dpatch	2005-05-12 23:34:52 UTC (rev 134)
@@ -26,7 +26,7 @@
 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 @@
+@@ -306,7 +307,6 @@
  	lib/Makefile
  	src/Makefile
  	contrib/Makefile

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-05-12 23:24:42 UTC (rev 133)
+++ trunk/debian/patches/series	2005-05-12 23:34:52 UTC (rev 134)
@@ -60,7 +60,7 @@
 320_nscd_header.dpatch
 321_remove_malloc_definition.dpatch
 323_passwd.1-typo.dpatch
-#324_configure.in-no-debian-dir.dpatch
+324_configure.in-no-debian-dir.dpatch
 401_cppw_src.dpatch
 #402_missing_debian_man_pages.dpatch
 403_sg_symlink_162339_163652.dpatch