debian maint updates

1 files changed, 40 insertions, 19 deletions

diff --git a/software/debian_maint.page b/software/debian_maint.page
index 1e74f34..2b371bd 100644
--- a/software/debian_maint.page
+++ b/software/debian_maint.page
@@ -3,16 +3,6 @@ format: markdown
 title: Debian Maintainership
 ...
 
-## Reference
-
-- [Official Policy Manual]([https://www.debian.org/doc/debian-policy/):
-  basically a style guide for how software should be packaged and how a Debian
-  operating system should work.
-- [Packaging Tutorial](https://www.debian.org/doc/manuals/packaging-tutorial/packaging-tutorial.en.pdf):
-  this was a great getting-started resource for me: what files under `debian/`
-  do what, what automated tooling exists, how packaging has changed over time,
-  etc. "Hands on".
-
 ## Developer Machine Setup
 
 Install pacakges:
@@ -23,12 +13,28 @@ Install pacakges:
 
 I set the following user-wide environment variables:
 
-    QUILT_PATCHES="debian/patches"
     DH_VERBOSE=1
     DEB_BUILD_MAINT_OPTIONS="hardening=+all"
     DEBFULLNAME=""
     DEBEMAIL=""
 
+`~/.quiltrc`:
+
+    QUILT_PATCHES="debian/patches"
+    QUILT_NO_DIFF_INDEX=1
+    QUILT_NO_DIFF_TIMESTAMPS=1
+    QUILT_REFRESH_ARGS="-p ab"
+    QUILT_DIFF_ARGS="--color=auto"
+    QUILT_DIFF_OPTS='-p'
+
+Create a quick blank debug docker (faster than most other tools for creating
+throw-away environments):
+
+    docker pull debian:sid
+    docker run -t -i debian:sid bash
+    # In container:
+    apt update
+
 Create a `cowbuilder` environment:
 
     sudo cowbuilder --create            # on new machines
@@ -54,9 +60,22 @@ Run from inside source directory, except apt-get commands:
     dh_make -f ../something-1.0.tar.gz  # does the renaming to .orig.tar.gz automatically
     pdebuild --pbuilder cowbuilder
 
-Patching:
+## Patches/Quilt
+
+To apply all patches to local directory:
+
+    quilt push -a
+
+Create a new patch, edit files, refresh:
+
+    quilt new some_good_name.patch
+    quilt add file_to_edit.c   # could be multiple
+    # make additional edits
+    quilt refresh
 
-    edit-patch
+Un-apply (return to upstream source state):
+
+    quilt pop -a
 
 ## dgit
 
@@ -102,10 +121,12 @@ Running piuparts is simple (but slow):
 
     sudo piuparts <pkg>.deb
 
-Create a quick blank debug docker (faster than most other tools for creating
-throw-away environments):
+## References
 
-    docker pull debian:sid
-    docker run -t -i debian:sid bash
-    # In container:
-    apt update
+- [Official Policy Manual]([https://www.debian.org/doc/debian-policy/):
+  basically a style guide for how software should be packaged and how a Debian
+  operating system should work.
+- [Packaging Tutorial](https://www.debian.org/doc/manuals/packaging-tutorial/packaging-tutorial.en.pdf):
+  this was a great getting-started resource for me: what files under `debian/`
+  do what, what automated tooling exists, how packaging has changed over time,
+  etc. "Hands on".