[med-svn] [Git][med-team/policy][master] 4 commits: ddtp.debian.net → ddtp.debian.org

[Charles Plessy]

Charles Plessy pushed to branch master at Debian Med / policy


Commits:
0aed3271 by Charles Plessy at 2020-09-09T03:10:04+09:00
ddtp.debian.net → ddtp.debian.org

- - - - -
c35864ae by Charles Plessy at 2020-09-09T03:16:37+09:00
Correct this document's URL.

- - - - -
c1cf3298 by Charles Plessy at 2020-09-09T03:35:23+09:00
Add a subsection on how to handle patches.

Thanks Michael Crusoe for the refresher!

- - - - -
d96c02f5 by Charles Plessy at 2020-09-09T03:39:04+09:00
Link to the UsingQuilt wiki page.

- - - - -


1 changed file:

- policy.rst


Changes:

=====================================
policy.rst
=====================================
@@ -51,7 +51,7 @@ make medical and biological software available to Debian users. Read the
 
 If you speak a language other than English, you can contribute rightaway
 with translations of package descriptions at
-`ddtp.debian.net <https://ddtp.debian.net>`__.
+`ddtp.debian.org <https://ddtp.debian.org>`__.
 
 When working on these, you will find immediate targets for improvements
 of the original English versions, too. For these, though, you need
@@ -88,7 +88,7 @@ Essential readings
    two above in practice.
 
 -  The `Debian Med
-   Policy <https://med-team.pages.debian.net/policy.html>`__ (this
+   Policy <https://med-team.pages.debian.net/policy/>`__ (this
    document): explains how the work is organised in our team.
 
 .. _meta:
@@ -1068,10 +1068,33 @@ Sometimes it's useful to rename a patch. Without any hassle, do:
 
 .. _quilt-other:
 
+Updating patches
+^^^^^^^^^^^^^^^^
+
+After updating a package to a new upstream version, it can happen
+that the patches do not apply cleanly anymore.  Try ``quilt pop -a``,
+to remove all patches, and then  ``quilt push`` one patch at a time.
+
+When there was any fuzzing, do ``quilt refresh`` before the next
+``quilt push``.
+
+If a patch does apply cleanly because it is not needed anymore
+(applied upstream, etc.), it can be removed with
+``quilt delete <patchname>.patch && git rm debian/patches/patchname``
+(assming the source package is managed with Git, which is the case in
+our team).
+
+If the patch is still needed, force its application with
+``quilt push -f``, editing the files indicated while reviewing the
+corresponding ``*.rej`` files, and then update the patch with
+``quilt refresh``.
+
 Other commands
 ^^^^^^^^^^^^^^
 
-Please see ``man 1 quilt`` to have a comprehensive list of commands.
+Please see ``man 1 quilt`` to have a comprehensive list of commands
+and the `UsingQuilt <https://wiki.debian.org/UsingQuilt>`__ page on
+the Debian Wiki.
 
 FAQ
 ===



View it on GitLab: https://salsa.debian.org/med-team/policy/-/compare/30bc5ce83cd75bcd224bfee620ea8045b930c348...d96c02f52f85290dc5359d60ce68732e34d68b2c

-- 
View it on GitLab: https://salsa.debian.org/med-team/policy/-/compare/30bc5ce83cd75bcd224bfee620ea8045b930c348...d96c02f52f85290dc5359d60ce68732e34d68b2c
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200908/057e6e6d/attachment-0001.html>