[pkg-haskell-tools] 05/11: dht upgrade: Use 'dht dch' instead of debchange

[Ilias Tsitsimpis]

This is an automated email from the git hooks/post-receive script.

iliastsi-guest pushed a commit to branch master
in repository pkg-haskell-tools.

commit 389fc9b0a21921bfd50012c77bdfa083231f8e9c
Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
Date:   Sat Jul 23 16:53:58 2016 +0300

    dht upgrade: Use 'dht dch' instead of debchange
    
    Use the dht-dch wrapper instead of explicitly calling debchange. This
    way, we are using our custom heuristics of whether a new changelog entry
    should be created, or the current one be amended.
---
 debian/changelog | 5 +++--
 scripts/upgrade  | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4a78ef8..720b451 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pkg-haskell-tools (0.10.4) UNRELEASED; urgency=medium
+pkg-haskell-tools (0.10.4) unstable; urgency=medium
 
   [ Joachim Breitner ]
   * dht make-all: Fancy dynamic console output
@@ -9,8 +9,9 @@ pkg-haskell-tools (0.10.4) UNRELEASED; urgency=medium
     This newer version is needed because 'dht dch' relies on
     #826837 in order to properly work.
   * dht dch: Use the '--no-auto-nmu' debchange option
+  * dht upgrade: Use 'dht dch' instead of debchange
 
- -- Joachim Breitner <nomeata at debian.org>  Thu, 02 Jun 2016 18:12:52 +0200
+ -- Ilias Tsitsimpis <i.tsitsimpis at gmail.com>  Sat, 23 Jul 2016 17:09:36 +0300
 
 pkg-haskell-tools (0.10.3) unstable; urgency=medium
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 9d88d3d..a1d9745 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -113,10 +113,10 @@ do
   git commit -q -m 'Temporary base commit'
 
   # next commit
-  debchange --changelog debian/changelog --newversion="$epoch$version-1" 'New upstream release'
+  dht dch --newversion="$epoch$version-1" 'New upstream release'
   origtargz -u
   dht cabal-debian --exec-map c2hs:c2hs --exec-map gtk2hsC2hs:gtk2hs-buildtools --exec-map gtk2hsHookGenerator:gtk2hs-buildtools --exec-map gtk2hsTypeGen:gtk2hs-buildtools --exec-map hsc2hs:ghc --upgrade
-  dch -D $dist -r ''
+  dht dch -D $dist -r ''
   git commit . -q -m "$cabal_name: Upgrading from $old_version to $version"
 
   commit=$(git rev-parse HEAD)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/pkg-haskell-tools.git