summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2013-12-02 13:01:13 +0200
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-11-14 14:47:19 +0200
commit830a75573cead333e395c9bb586ed6143f789bef (patch)
tree4121bde9ecbb0259daf2a79d34f995c97f4679eb /debian
parent4902cb5892a50c64663bd47dd04e15d93c5f5e0a (diff)
downloadgit-buildpackage-830a75573cead333e395c9bb586ed6143f789bef.tar.gz
git-buildpackage-830a75573cead333e395c9bb586ed6143f789bef.tar.bz2
git-buildpackage-830a75573cead333e395c9bb586ed6143f789bef.zip
packaging: Prepare for next Tizen tools release
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog19
1 files changed, 19 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 68c1aa5a..7b1f70c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -249,6 +249,25 @@ git-buildpackage (0.6.7) unstable; urgency=low
-- Guido Günther <agx@sigxcpu.org> Fri, 29 Nov 2013 20:52:03 +0100
+git-buildpackage (0.6.6-tizen20131202) unstable; urgency=low
+
+ * 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.
+
+ -- Markus Lehtonen <markus.lehtonen@linux.intel.com> Mon, 02 Dec 2013 12:55:14 +0200
+
git-buildpackage (0.6.6) unstable; urgency=low
[ Guan Junchun ]