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

[Martin Quinson]

Author: mquinson
Date: 2005-05-13 09:08:01 +0000 (Fri, 13 May 2005)
New Revision: 137

Removed:
   trunk/debian/patches/00list
Modified:
   trunk/debian/patches/README.patches
Log:
Another step on the dpatch->quilt switch

Deleted: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2005-05-13 08:55:44 UTC (rev 136)
+++ trunk/debian/patches/00list	2005-05-13 09:08:01 UTC (rev 137)
@@ -1,70 +0,0 @@
-001_Makefile.in.in
-002_more-i18n
-003_Makefile.am
-004_configure.in
-005_manpages
-006_libmisc
-008_src
-009_etc
-010_chpasswd-md5
-100_LINGUAS
-101_cs
-102_de
-103_el
-104_fr
-105_ja
-106_ko
-107_pl
-108_sv
-109_uk
-110_bs
-111_ca
-112_da
-113_es
-114_eu
-115_fi
-116_he
-117_id
-118_it
-119_nb
-120_nl
-121_nn
-122_pt
-123_pt_BR
-124_ru
-125_sk
-126_tr
-127_zh_CN
-128_sq
-129_ro
-130_zh_TW
-131_tl
-132_vi
-200_de-manpages
-200_de-manpages-2
-200_de-manpages-passwd.1
-201_fr-manpages
-202_ja_manpages
-203_pl_manpages
-204_pt_BR-manpages
-205_it-manpages
-311_high-uids
-312_usermod-302388
-313_pam_access_with_preauth
-314_passwd.1_formatting
-315_chage.1_document_expiration_removal
-316_vipw-race-242407
-317_lastlog_usage_249611
-318_passwd_src_warning
-319_time_structures
-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
-404_undef_USE_PAM
-405_subsystem_remove_*_in_shell
-406_good_name
-407_32char_grnames

Modified: trunk/debian/patches/README.patches
===================================================================
--- trunk/debian/patches/README.patches	2005-05-13 08:55:44 UTC (rev 136)
+++ trunk/debian/patches/README.patches	2005-05-13 09:08:01 UTC (rev 137)
@@ -1,7 +1,7 @@
 Small intro to the system for numbering the patches here...
 
 -The 0xx series of patches are patches isolated from the latest
- version of the shadow Debian package not using dpatch in order to
+ version of the shadow Debian package not using quilt in order to
  separate upstream from Debian-specific stuff.
 
  NO MORE PATCHES SHOULD BE ADDED IN THESE SERIES
@@ -29,9 +29,42 @@
 (Debian-specific patches).
 
 
-Short HOWTO for dpatch
-=======================
+Short HOWTO for quilt
+=====================
 
+The quilt system can be assimilated to a Pile Of Patches management system.
+Patches live in debian/patches, the working directory is "."
+
+The basic commands are (abbreviation accepted):
+quilt push (asks to apply the next patch in the pile)
+quilt pop  (removes the current patch and go up in the pile)
+quilt refresh (take the current changes in tree onto the patch)
+
+When a file is changed by a patch, quilt saves it somewhere under .pc on
+application. This is how it can refresh it afterward (comparing the version
+in .pc and the one you currently have in your working dir).
+
+There is two common pitfall with quilt:
+ - doing "quilt pop" without doing "quilt refresh". The version of current
+     dir is replaced with the version of the .pc dir. Your changes are lost.
+   Quilt wont let you do so, but you can force it with '-f' if you're fool.
+ - editing a file with is not in the patch yet. Quilt didn't do any previous
+     backup.
+   Use "quilt add" to add files to patches.
+   Set $EDITOR and use "quilt edit" to edit a file, and add it onto the
+     patch if needed.
+		 
+The documentation is quite well done, I think. "quilt -h" will list you the
+commands. "quilt <cmd> -h" will give you some hints about it. "man quilt" is
+a reference documentation. /usr/share/doc/quilt/quilt.pdf.gz is a complete
+manual, with tutorial.
+
+
+
+
+Short HOWTO for dpatch (old cruft we should kill once everyone is convinced by the Quilt Power)
+======================
+
 Applying a patch
 ----------------
 * dpatch apply <name>