[Pkg-shadow-devel] [shadow] 06/07: Cut redundant information from Debian-specific README files
rbalint at debian.org
Sun Sep 17 21:43:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
rbalint pushed a commit to branch master
in repository shadow.
Author: Balint Reczey <balint.reczey at canonical.com>
Date: Sat Aug 12 18:48:09 2017 -0400
Cut redundant information from Debian-specific README files
debian/README.source | 17 ++-------------
debian/patches/README.patches | 51 -------------------------------------------
2 files changed, 2 insertions(+), 66 deletions(-)
diff --git a/debian/README.source b/debian/README.source
index 1993b9f..8a76ee2 100644
@@ -1,17 +1,4 @@
-This package uses quilt to patch the upstream source.
-You can find some info on how to generate the patched source, add a new
-modification, and remove an existing modification on:
-To package a new upstream release, you can use the Makefile:
A testsuite is also available. Instruction on how to run this testsuite
-are available on:
+are available in tests/README
+ -- Balint Reczey <rbalint at ubuntu.com>, Sat, 12 Aug 2017 18:46:44 -0400
diff --git a/debian/patches/README.patches b/debian/patches/README.patches
index 2baccc1..a804fe3 100644
@@ -8,17 +8,6 @@ Small intro to the system for numbering the patches here...
NO MORE PATCHES SHOULD BE ADDED IN THESE SERIES
--The 1xx series are l10n patches to upstream 22.214.171.124. As upstream has
- adopted Debian translations, it is very likely that these patches
- will become useless when we will have synced with upstream
--The 2xx series are patches for manual pages translations to upstream
--The 3xx series are patches which have been temporarily applied to
- Debian's shadow while we *know* they have been applied upstream as well
- These patches should NOT be kept when we will sync with upstream
-The 4xx series are patches which have been applied to Debian's shadow
and have NOT been accepted and/or applied upstream. These patches MUST be kept
even after resynced with upstream
@@ -31,43 +20,3 @@ In short, while we are working towards synchronisation with upstream,
our goal is to make 0xx patches disappear by moving them either to 3xx
series (things already implemented upstream) or to 4xx series
-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 are three common pitfalls 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
- 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.
- - If you update your working directory, patches may not revert cleanly.
- It is thus recommended to use "quilt pop -a" before updating with
- "svn up".
- If you forget (and run into trouble), you may want to remove the whole
- shadow-?.?.? directory. If you use the makefile which is in the upper
- directory (trunk/), shadow-?.?.?/debian/patches is a link to
- debian/patches, so this dirctory does not contain any valuable info.
-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.
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shadow/shadow.git
More information about the Pkg-shadow-devel