diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-07-13 21:44:46 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-07-13 21:46:27 +0100 |
| commit | ae7f22768e13f01eb337330332bf18780b8104c0 (patch) | |
| tree | 65fed96a9b3ab9a3a750b338e01d214d1dbaa420 /debian/patches/series | |
| parent | fef6a04f189f791b9bee9f17797890b12fee495f (diff) | |
Rebase patch queue onto upstream 8.39:
Adjusted the soname patch
Dropped CVE-2016-1283.patch as it is in upstream
Process:
* Manually unapplied patches with
for f in `cat debian/patches/series`; do patch -p1 -R <debian/patches/"$f"; done
* gbp pq export
This generates a patches-unapplied branch
* On a fresh branch (git checkout --orphan, although next time
use the "Commit upstream" sub-branch)
tar to extract new orig and git add -Af to import it
* git rebase to rebase the patch queue onto the new upstream
* gbp pq import to get the patch queue into debian/
* dpkg-source --before-build .
to get a patches-applied branch
* rm -rf .pc; git add -Af and commit
Diffstat (limited to 'debian/patches/series')
| -rw-r--r-- | debian/patches/series | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/debian/patches/series b/debian/patches/series index b766780..bdf74b5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,5 +5,3 @@ pcregrep.1-patch soname.patch no_jit_x32_powerpcspe.patch Disable_JIT_on_sparc64.patch -apply-upstream-revision-1631-closes-8159 -CVE-2016-1283.patch |