Tizen release 0.6.15-20140828tizen/0.6.15-20140828debian/0.6.25

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

3 files changed, 89 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 1c253ade..ef2921ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,53 @@
-git-buildpackage (0.6.15-tizen20140605) UNRELEASED; urgency=low
+git-buildpackage (0.6.15-tizen20140828) unstable; urgency=low
 
+  [ Markus Lehtonen ]
   * Rebase on top of upstream version 0.6.15
+  * Changes in buildpackage-rpm
+    - new 'commitish' keyword for spec vcs tag
+    - notify: catch RuntimeError when importing pynotify
+    - fix exit code in case of GitRepositoryError
+    - always create tarball for native packages
+    - check submodules from the exported treeish
+    - fix crash when running prebuild hook
+    - always run cleaner hook
+    - add --git-no-build option
+    - don't crash on invalid vcs format strings
+    - add '--git-native' option
+    - remove some outdated/unnecessary exception handling
+    - get rid of prepare_export_dir()
+    - handle invalid keys in orig prefix
+    - internal refactoring and fixes
+  * Changes in rpm-ch
+    - implement --commit option
+    - implement --commit-msg option
+    - rpm-ch: implement --meta-bts option
+    - rpm.policy: don't allow leading whitespace in bts meta tags
+  * docs: manpages for the rpm tools
+  * Misc. fixes and features
+    - buildpackage: refactor tarball compression
+    - gbp-dch: fix handling of the '--meta' option
+    - import-orig-rpm: download tarball into parent directory
+    - GitRepository/has_submodules: add treeish argument
+    - tristate: implement __nonzero__() method
+  * Logging:
+    - don't automatically setup gbp-specific logger
+    - fix auto colorizing for custom streams
+  * Tests
+    - multiple fixes and additions in ComponentTestBase class
+    - testutils: add directories arg to ls_* functions
+    - add unit tests for buildpackage-rpm
+  * Packaging
+    - rpm-packaging: recommend/require unzip
+    - recommend/require zipmerge
+    - depend/recommend rpmbuild
+
+  [ Junchun Guan ]
+  * Add PKGBUILD to support arch linux
+
+  [ Li Jinjing ]
+  * rpm packaging: use macro for python binary
 
- -- Markus Lehtonen <markus.lehtonen@linux.intel.com>  Thu, 05 Jun 2014 13:54:54 +0300
+ -- Markus Lehtonen <markus.lehtonen@linux.intel.com>  Thu, 28 Aug 2014 11:40:05 +0300
 
 git-buildpackage (0.6.15) unstable; urgency=medium
 
diff --git a/packaging/git-buildpackage.changes b/packaging/git-buildpackage.changes
index 7842c803..6a65a15a 100644
--- a/packaging/git-buildpackage.changes
+++ b/packaging/git-buildpackage.changes
@@ -1,5 +1,45 @@
-* Thu Jun 05 2014 Markus Lehtonen <markus.lehtonen@linux.intel.com> debian/0.6.15-212-gdbb401b
+* Thu Aug 28 2014 Markus Lehtonen <markus.lehtonen@linux.intel.com> tizen/0.6.15-20140828
 - Rebase on top of upstream version 0.6.15
+- Changes in buildpackage-rpm
+  * new 'commitish' keyword for spec vcs tag
+  * notify: catch RuntimeError when importing pynotify
+  * fix exit code in case of GitRepositoryError
+  * always create tarball for native packages
+  * check submodules from the exported treeish
+  * fix crash when running prebuild hook
+  * always run cleaner hook
+  * add --git-no-build option
+  * don't crash on invalid vcs format strings
+  * add '--git-native' option
+  * remove some outdated/unnecessary exception handling
+  * get rid of prepare_export_dir()
+  * handle invalid keys in orig prefix
+  * internal refactoring and fixes
+- Changes in rpm-ch
+  * implement --commit option
+  * implement --commit-msg option
+  * rpm-ch: implement --meta-bts option
+  * rpm.policy: don't allow leading whitespace in bts meta tags
+- docs: manpages for the rpm tools
+- Misc. fixes and features
+  * buildpackage: refactor tarball compression
+  * gbp-dch: fix handling of the '--meta' option
+  * import-orig-rpm: download tarball into parent directory
+  * GitRepository/has_submodules: add treeish argument
+  * tristate: implement __nonzero__() method
+- Logging:
+  * don't automatically setup gbp-specific logger
+  * fix auto colorizing for custom streams
+- Tests
+  * multiple fixes and additions in ComponentTestBase class
+  * testutils: add directories arg to ls_* functions
+  * add unit tests for buildpackage-rpm
+- Packaging
+  * rpm-packaging: recommend/require unzip
+  * recommend/require zipmerge
+  * depend/recommend rpmbuild
+  * [ Junchun Guan ] Add PKGBUILD to support arch linux
+  * [ Li Jinjing ] rpm packaging: use macro for python binary
 
 * 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
diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec
index b808f119..3ff90288 100644
--- a/packaging/git-buildpackage.spec
+++ b/packaging/git-buildpackage.spec
@@ -111,7 +111,7 @@ Recommends: rpm-build
 %else
 Requires:   rpm-build
 %endif
-Provides:   tizen-gbp-rpm = 20140605
+Provides:   tizen-gbp-rpm = 20140828
 
 %description rpm
 Set of tools from Debian that integrate the package build system with Git.