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
|
Differences from the generic workflow described below, for this
particular package:
* upstream svn got some activity since 0.8.0 release, although not
impacted the files we use; they are included in a single patch
exported from a commit on "upstream" branch
* upstream includes debian/ dir, I removed it with a special commit
on "upstream" branch to be able to use the workflow as described
Thus as of upstream version 0.8.0 the "upstream" branch is ahead of the
upstream tag.
==== >8 ====
These branches are used:
upstream: tracks upstream release
pristine-tar: material to reconstruct orig tarballs from upstream branch
debian: debian packaging, including patches in "3.0 (quilt)" format
patches: the paches from debian/patches, exported as shown below
"upstream" and "debian" branches have disjoint histories. "patches" is
rebased on new upstream releases. "patches" is used for the working dir
(.../$PACKAGE/) and "debian" is for the debian dirs (.../$PACKAGE/debian/).
Expected workflow:
* commit packaging changes in debian/ (thus on branch "debian")
* commit changes to upstream code to branch "patches", rebase and
amend them as needed; export them to debian/patches (see below)
and commit the debian/patch changes together with any other
related packaging changes (typically at least a changelog entry)
debian/patches/ generated by:
git format-patch -N --subject-prefix="" -o debian/patches/ upstream..patches
debian/patches/series is updated by hand (for now).
|
