[Pkg-cli-apps-commits] [tangerine] 07/08: Merge remote-tracking branch 'origin/master'

[Chow Loong Jin]

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

hyperair pushed a commit to branch master
in repository tangerine.

commit 414e40bec374545b531caa5fd68b27847b5e384f
Merge: e8ebc2d be81b99
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sun Dec 22 04:40:01 2013 +0800

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	debian/changelog
    	debian/rules

 debian/changelog | 9 ++++++++-
 debian/rules     | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index f2ff490,fc14b49..8016535
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
- tangerine (0.3.4-3) unstable; urgency=low
++tangerine (0.3.4-4) unstable; urgency=low
 +
 +  * [56b859b] Amend build-deps to use dbus#2.0
 +  * [3e2274d] No-change bump of Standards-Version to 3.9.4
 +  * [7ea4151] Update dbus-sharp patch for DBus#2.0
 +  * [3c46189] Move away from cli.make
 +  * [ce0543e] Bump dh level to 9 for buildflags
 +
 + -- Chow Loong Jin <hyperair at debian.org>  Sun, 22 Dec 2013 04:32:02 +0800
 +
+ tangerine (0.3.4-3) unstable; urgency=low
+ 
+   * [acef333] Correct dh syntax
+   * [303cc6f] Update debian/rules for DH8-compatible "--with cli"
+ 
+  -- Jo Shields <directhex at apebox.org>  Sat, 21 Jan 2012 17:25:09 +0000
+ 
  tangerine (0.3.4-2) unstable; urgency=low
  
    * [3bf5b64] Use debsrc 3.0 (quilt)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/tangerine.git