1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
This package uses quilt to manage all modifications to the upstream
source. Changes are stored in the source package as diffs in
debian/patches and applied during the build.
For more information about quilt, see /usr/share/doc/quilt/README.source
Permanent patches
0??-*.diff: Buildsystem
1??-*.diff: Code
2??-*.diff: Other
3??-*.diff: "
Temporary patches
4??-*.diff: Bugs fix most likely taken from upstream Git
CVE-*-*.diff: Security fix
This package uses Git-Buildpackage as a VCS to manage the packaging.
You might experience troubles when merging the upstream branch in the sid or experimental branches.
Try merging with -s recursive -X theirs
Or use git checkout --theirs upstream/x.y.z -- <paths> to sort the mess.
|
