[redeclipse] 07/23: Merge branch 'master' into next

[Martin Werner]

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

arand-guest pushed a commit to branch next
in repository redeclipse.

commit be1782d3564cec1d7d68bf6d996fecb9afc305a0
Merge: 21dde05 69fd808
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Fri Apr 3 11:44:45 2015 +0200

    Merge branch 'master' into next
    
    Sync next with master after move to main.
    
    Conflicts:
    	debian/changelog

 debian/changelog | 7 +++++++
 debian/control   | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 2e9a6bd,fd678fc..ea05f91
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,10 +1,22 @@@
 +redeclipse (1.5.0-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release 1.5.0
 +  * Drop upstreamed patches
 +    - Delete don-t-check-for-keymap-when-using-standalone.patch
 +    - Delete gnu-link-rt.patch
 +  * Add (upstream) patch to fix binary name in install
 +    - Add system-install-Fix-binary-name.patch
 +  * Bump standards-version to 3.9.6, no changes
 +
 + -- Martin Erik Werner <martinerikwerner at gmail.com>  Sun, 29 Mar 2015 16:02:22 +0200
 +
+ redeclipse (1.4-6) unstable; urgency=medium
+ 
+   [ Markus Koschany ]
+   * Move Red Eclipse to the main archive since it fully complies with the DFSG.
+ 
+  -- Martin Erik Werner <martinerikwerner at gmail.com>  Sat, 09 Aug 2014 18:32:43 +0200
+ 
  redeclipse (1.4-5) unstable; urgency=low
  
    * Standards-Version 3.9.5 (no changes)

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