[txw2] 04/04: Merge remote-tracking branch 'origin/master'

[Timo Aaltonen]

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

tjaalton-guest pushed a commit to branch master
in repository txw2.

commit fe849b28776b175891447274e3cf67b9cccd50c0
Merge: 17acdb1 0e8003e
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Wed Jan 8 16:44:13 2014 +0200

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

 debian/changelog | 5 +++++
 debian/compat    | 2 +-
 debian/control   | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 00cad6d,730863e..c3b1d52
--- a/debian/changelog
+++ b/debian/changelog
@@@ -4,9 -4,11 +4,14 @@@ txw2 (0.1+20110809-1) UNRELEASED; urgen
    * New upstream release.
    * Use maven for the build.
  
+   [ Emmanuel Bourg ]
+   * debian/control:
+     - Standards-Version updated to 3.9.5 (no changes)
+   * Switched to debhelper level 9
+ 
 +  [ Timo Aaltonen ]
 +  * rules: Fix get-orig-source target.
 +
   -- Timo Aaltonen <tjaalton at ubuntu.com>  Mon, 16 Dec 2013 15:28:25 +0200
  
  txw2 (0.1+20070624-1) unstable; urgency=low

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