... | ... | @@ -67,7 +67,7 @@ error: lib/dns/dyndb.c: patch does not apply |
|
|
gbp:error: Couldn't apply patches
|
|
|
```
|
|
|
|
|
|
4. If it fails, do it manually using quilt
|
|
|
4. If it fails, do it manually using quilt (<<< This is the only step really requiring manual intervention >>>)
|
|
|
```
|
|
|
$ while quilt push; do quilt refresh; done
|
|
|
Applying patch debian/patches/07_multiarch.diff
|
... | ... | @@ -125,4 +125,61 @@ Hunk #1 FAILED at 133. |
|
|
1 out of 1 hunk FAILED -- saving rejects to file lib/dns/dyndb.c.rej
|
|
|
Applied patch debian/patches/skip-rtld-deepbind-for-dyndb.diff (forced; needs refresh)
|
|
|
$ emacs lib/dns/dyndb.c.rej lib/dns/dyndb.c
|
|
|
$ quilt refresh
|
|
|
Refreshed patch debian/patches/skip-rtld-deepbind-for-dyndb.diff
|
|
|
```
|
|
|
|
|
|
6. Rinse and repeat until done:
|
|
|
```
|
|
|
$ while quilt push; do quilt refresh; done
|
|
|
File series fully applied, ends at patch debian/patches/skip-rtld-deepbind-for-dyndb.diff
|
|
|
```
|
|
|
|
|
|
7. Add the fixed patches to the repository and rebase then using `gbp pq`:
|
|
|
```
|
|
|
$ git commit -a -F - debian/patches << EOF
|
|
|
Rebase patches for BIND 9.13.6
|
|
|
|
|
|
Gbp-Dch: ignore
|
|
|
EOF
|
|
|
[master b78ec65c3] Rebase patches for BIND 9.13.6
|
|
|
Date: Mon Feb 18 08:48:46 2019 +0000
|
|
|
7 files changed, 30 insertions(+), 52 deletions(-)
|
|
|
$ gbp pq rebase
|
|
|
gbp:info: No pq branch found, importing patches
|
|
|
gbp:info: Trying to apply patches at 'b2d43c35ead0462861d3c994d1c30b146e6594a8'
|
|
|
gbp:info: 7 patches listed in 'debian/patches/series' imported on 'patch-queue/master'
|
|
|
gbp:info: Switching to 'patch-queue/master'
|
|
|
Current branch patch-queue/master is up to date.
|
|
|
$ gbp pq export
|
|
|
gbp:info: On 'patch-queue/master', switching to 'master'
|
|
|
gbp:info: Generating patches from git (master..patch-queue/master)
|
|
|
$ git commit --amend -a -F - debian/patches << EOF
|
|
|
Rebase patches for BIND 9.13.6
|
|
|
|
|
|
Gbp-Dch: ignore
|
|
|
EOF
|
|
|
[master caeea7f26] Rebase patches for BIND 9.13.6
|
|
|
Date: Mon Feb 18 08:48:46 2019 +0000
|
|
|
3 files changed, 11 insertions(+), 11 deletions(-)
|
|
|
```
|
|
|
|
|
|
8. Update and commit the changelog (this will start editor):
|
|
|
```
|
|
|
$ gbp dch -R -a -c
|
|
|
gbp:info: Changelog last touched at '5a7c095dc9d5463323dbb19108e38c86cb33c16d'
|
|
|
gbp:info: Changelog committed for version 1:9.13.6-1
|
|
|
```
|
|
|
|
|
|
9. Optionally, use a snapshot changelog (and use `gbp dch -R -a -c` when finished):
|
|
|
```
|
|
|
$ gbp dch -S -a -c
|
|
|
gbp:info: Changelog last touched at '5a7c095dc9d5463323dbb19108e38c86cb33c16d'
|
|
|
gbp:info: Changelog 1:9.13.6-1~1.gbpcaeea7 (snapshot #1) prepared up to caeea7f
|
|
|
gbp:info: Changelog committed for version 1:9.13.6-1~1.gbpcaeea7
|
|
|
```
|
|
|
|
|
|
9. Build the package using debuild in the local system:
|
|
|
```
|
|
|
$ gbp buildpackage --git-export-dir=/tmp/build --git-builder=debuild
|
|
|
``` |
|
|
\ No newline at end of file |