Skip to content
Snippets Groups Projects

T7556: Update git workflows

Merged T7556: Update git workflows
update-git-workflows into master
All threads resolved!
Merged Andrej Shadura requested to merge update-git-workflows into master
All threads resolved!
Viewing commit 14e7bf49
Next
Show latest version
3 files
+ 2040
− 0
Compare changes
  • Side-by-side
  • Inline
Files
3
  • 14e7bf49
    Andrej Shadura
    Add a DEP-14 diagram · 14e7bf49
    Andrej Shadura authored 
    The diagram comes in two formats:
 - SVG with editable text (apertis-dep-14-gitlab.svg)
   This is the primary source.
 - SVG with texts as paths (apertis-dep-14-gitlab-curves.svg)
   This is generated from the primary source; it is a preferred
   format for embedding as a figure in a document, since it
   doesn’t depend on the availability of fonts or the renderer’s
   ability to render them correctly.

Signed-off-by: default avatarAndrej Shadura <andrew.shadura@collabora.co.uk>
content/guides/gitlab-based_packaging_workflow.md
+ 2
− 0
@@ -20,6 +20,8 @@ The packaging git repositories follow the
[DEP-14](http://dep.debian.net/deps/dep14/) Git layout specification with the
following conventions:
![DEP-14 in Apertis](/images/apertis-dep-14-gitlab-curves.svg)
- `upstream/${UPSTREAM_DISTRIBUTION}` branches with the unpacked upstream
project code from the debian package (e.g. `upstream/buster`)
- `debian/${UPSTREAM_DISTRIBUTION}` branches with the Debian changes on top of
Apertis Website Terms of Use Privacy Policy