diff options
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/git-buildpackage.changes | 16 | ||||
| -rw-r--r-- | packaging/git-buildpackage.spec | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/packaging/git-buildpackage.changes b/packaging/git-buildpackage.changes index da3ffc20..938808e2 100644 --- a/packaging/git-buildpackage.changes +++ b/packaging/git-buildpackage.changes @@ -1,3 +1,19 @@ +* Mon Dec 02 2013 Markus Lehtonen <markus.lehtonen@linux.intel.com> 0.6.6 +- Rebase on top of upstream version 0.6.6 +- UpstreamSource: fix archive prefix guessing +- pq-rpm: create diff up to the last merge commit + Before, merge commits broke patch generation, or, (most probably) caused + the generated patches to be unapplicable (similar to how + git-format-patch behaves). + Now, changes up to the last merge commit are squashed into one diff if + merge commits are found in the revision list from which patches are to + be generated. Individual patches (one per commit) are generated from the + last merge commit up to the exported revision. +- pq-rpm: magic word HEAD for patch-squashing + When given as the squash-point, 'HEAD' translates to the end-commit. + This allows one to configure gbp to always squash all commits into one + monolithic diff. + * Thu Oct 17 2013 Markus Lehtonen <markus.lehtonen@linux.intel.com> 0.6.3 - buildpackage: support 'commit' variable for VCS tags - Clone a repository to a specific directory diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec index 0262592d..d44c16b0 100644 --- a/packaging/git-buildpackage.spec +++ b/packaging/git-buildpackage.spec @@ -110,7 +110,7 @@ Recommends: rpm-build %else Requires: rpm-build %endif -Provides: tizen-gbp-rpm = 20131017 +Provides: tizen-gbp-rpm = 20131202 %description rpm Set of tools from Debian that integrate the package build system with Git. |