From 584ce0973254050ca0945c261d8dcd064c69c0b7 Mon Sep 17 00:00:00 2001 From: Juergen Borleis Date: Thu, 4 Jun 2015 15:40:14 +0200 Subject: Developer's manual: patch and quilt are outdated. This section must be still changed to a git workflow. Just adapt it slightly to recomment git, but still document the usage of quilt. Signed-off-by: Juergen Borleis --- doc/dev_manual.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'doc/dev_manual.rst') diff --git a/doc/dev_manual.rst b/doc/dev_manual.rst index 178a8a0c3..dd00a7ca9 100644 --- a/doc/dev_manual.rst +++ b/doc/dev_manual.rst @@ -54,8 +54,8 @@ fixes per package. They are organized in *patch series* and can be found in the ``patches/`` directory within a subdirectory using the same name as the package itself. -PTXdist uses the utility ``patch`` or ``quilt`` to apply an existing -patch series after extracting the archive. So, every patch series +PTXdist uses the utility ``patch`` or ``quilt`` (or ``git`` on demand) to apply +an existing patch series after extracting the archive. So, every patch series contains a set of patches and one ``series`` file to define the order in which the patches must be applied. @@ -1095,10 +1095,10 @@ PTXdist should be used. Creating Patches for a Package ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -PTXdist uses the utilities ``git``, *patch* or *quilt* to work with -patches or patch series. We recommend *quilt*, as it can manage patch -series in a very easy way. For this manual we assume *quilt* is -installed on the build host. +PTXdist uses the utilities *git*, *patch* or *quilt* to work with +patches or patch series. We recommend *git*, as it can manage patch +series in a very easy way. +For this manual and the example we use *quilt* instead. Creating a Patch Series for a Package ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -- cgit v1.2.3