Tizen release 0.6.12-20140521

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

3 files changed, 90 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 6532c318..5300c1dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -132,6 +132,53 @@ git-buildpackage (0.6.13) unstable; urgency=medium
 
  -- Guido Günther <agx@sigxcpu.org>  Thu, 03 Apr 2014 21:31:38 +0200
 
+git-buildpackage (0.6.12-tizen20140521) unstable; urgency=low
+
+  [ Markus Lehtonen ]
+  * Rebase on top of upstream version 0.6.12
+  * Changes in rpm-ch
+    - add --message cmdline option
+      For giving the text for new changelog entry/entries, skipping git commit
+      messages entirely.
+    - implement '--all' option
+      If defined, git-rpm-ch uses all commits in the Git history. Also,
+      '--since' option is omitted.
+    - implement --color-scheme option
+    - use name (string) as the entry author
+    - internal refactoring
+    - fix crash in guessing the start commit
+  * Changes in pq-rpm
+    - implement --retain-history option
+      With this option defined gbp tries to preserve the history when
+      converting. That is, for each commit in the old branch create one
+      corresponding commit in the new orphan packaging branch. This works by
+      dumping packaging files and updating patches for each commit. However,
+      empty commits are not generated - these are caused e.g. by changes in
+      files that are ignored by patch-generation.
+      NOTE! Only valid for the 'convert' action.
+    - convert: don't try to commit empty set of patches
+    - make sure we always get a sane author
+    - slight unification of log messages
+    - decrease (default) verbosity a bit
+    - don't create pq branch when switching
+  * Changes in buildpackage-rpm
+    - buildpackage-rpm: fix desktop notifications
+    - buildpackage-rpm: remove --purge option
+    - guess/parse spec as early as possible
+  * Documentation
+    - Include man pages in RPM packages
+    - Add -doc subpackage to RPM packaging
+    - Build deb and rpm html docs in one docbook
+    - A multitude of small cosmetic fixes
+  * Other misc. internal changes
+    - GitRepository: implement create_tree() method
+    - rpm: suppress some verbosity when updating patches in spec file
+
+  [ Li Jinjing ]
+  * Fix missing return value in get_current_branch method
+
+ -- Markus Lehtonen <markus.lehtonen@linux.intel.com>  Wed, 21 May 2014 16:32:46 +0300
+
 git-buildpackage (0.6.12) unstable; urgency=medium
 
   * [89f3005] Use a much simpler version to fix the command name in --help
diff --git a/packaging/git-buildpackage.changes b/packaging/git-buildpackage.changes
index d026530b..448846de 100644
--- a/packaging/git-buildpackage.changes
+++ b/packaging/git-buildpackage.changes
@@ -1,3 +1,44 @@
+* Wed May 21 2014 Markus Lehtonen <markus.lehtonen@linux.intel.com> tizen/0.6.12-20140521
+- Rebase on top of upstream version 0.6.12
+- Changes in rpm-ch
+  * add --message cmdline option
+    For giving the text for new changelog entry/entries, skipping git commit
+    messages entirely.
+  * implement '--all' option
+    If defined, git-rpm-ch uses all commits in the Git history. Also,
+    '--since' option is omitted.
+  * implement --color-scheme option
+  * use name (string) as the entry author
+  * internal refactoring
+  * fix crash in guessing the start commit
+- Changes in pq-rpm
+  * implement --retain-history option
+    With this option defined gbp tries to preserve the history when
+    converting. That is, for each commit in the old branch create one
+    corresponding commit in the new orphan packaging branch. This works by
+    dumping packaging files and updating patches for each commit. However,
+    empty commits are not generated - these are caused e.g. by changes in
+    files that are ignored by patch-generation.
+    NOTE! Only valid for the 'convert' action.
+  * convert: don't try to commit empty set of patches
+  * make sure we always get a sane author
+  * slight unification of log messages
+  * decrease (default) verbosity a bit
+  * don't create pq branch when switching
+- Changes in buildpackage-rpm
+  * buildpackage-rpm: fix desktop notifications
+  * buildpackage-rpm: remove --purge option
+  * guess/parse spec as early as possible
+- Documentation
+  * Include man pages in RPM packages
+  * Add -doc subpackage to RPM packaging
+  * Build deb and rpm html docs in one docbook
+  * A multitude of small cosmetic fixes
+- Other misc. internal changes
+  * GitRepository: implement create_tree() method
+  * rpm: suppress some verbosity when updating patches in spec file
+  * [ Li Jinjing ] Fix missing return value in get_current_branch method
+
 * Thu Mar 06 2014 Markus Lehtonen <markus.lehtonen@linux.intel.com> tizen/0.6.8-20140306
 - Rebase on top of upstream version 0.6.8
 - Introduce git-rpm-ch tool.
diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec
index 759e6766..98068e78 100644
--- a/packaging/git-buildpackage.spec
+++ b/packaging/git-buildpackage.spec
@@ -3,7 +3,7 @@
 
 Name:       git-buildpackage
 Summary:    Build packages from git
-Version:    0.6.8
+Version:    0.6.12
 Release:    0
 Group:      Development/Tools/Building
 License:    GPLv2
@@ -110,7 +110,7 @@ Recommends: rpm-build
 %else
 Requires:   rpm-build
 %endif
-Provides:   tizen-gbp-rpm = 20140306
+Provides:   tizen-gbp-rpm = 20140521
 
 %description rpm
 Set of tools from Debian that integrate the package build system with Git.