1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
-*- mode: markdown -*-
Introduction
============
This package uses the workflow documented in `dgit-maint-merge(7)`.
Initial setup
=============
git config dgit.default.quilt-mode single
Patch handling
==============
See `dgit-maint-merge(7)`.
Importing a new upstream release
================================
1. Prepare the environment, e.g.:
NEW_UPSTREAM_VERSION=2.11
NEW_UPSTREAM_TAG=v2.11
2. Import the new upstream release:
git fetch --tags origin &&
git fetch --tags upstream-repo &&
git tag --verify "$NEW_UPSTREAM_TAG" &&
git merge "$NEW_UPSTREAM_TAG" &&
git deborig "$NEW_UPSTREAM_TAG"
3. Update debian/changelog:
gbp dch --new-version "${NEW_UPSTREAM_VERSION}-1" debian/ &&
dch --append "Import upstream release ${NEW_UPSTREAM_VERSION}" &&
git commit debian/changelog \
-m "$(echo "Update debian/changelog.\n\nGbp-Dch: Ignore\n")"
4. Build (for example using `dgit-sbuild`), test, run QA checks (Lintian,
autopkgtest, etc.). Fix problems, rinse and repeat.
5. Mark changelog entry as released:
gbp dch --release &&
git commit debian/changelog \
-m "$(echo "Release ${NEW_UPSTREAM_VERSION}-1.\n\nGbp-Dch: Ignore\n")"
6. Build once last time
7. Upload
8. Push to Vcs-Git:
gbp push origin
|
