[redeclipse] 392/494: Merge branch 'wheezy'

[Martin Werner]

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

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

commit 1575bd9896255d0b0c80885d0bc7a6607a8df2fa
Merge: f7376ae fc0f9ae
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Tue Aug 7 21:20:36 2012 +0200

    Merge branch 'wheezy'
    
    Conflicts:
    	debian/changelog
    	debian/patches/security-text-command-fix.patch
    	debian/patches/series

 changelog                               |  7 ++++++-
 gbp.conf                                |  3 +++
 patches/security-text-command-fix.patch | 13 +++++++++++--
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --cc changelog
index 9f86150,435cd0f..d8138c8
--- a/changelog
+++ b/changelog
@@@ -1,16 -1,5 +1,21 @@@
- redeclipse (1.2-3) unstable; urgency=high
++redeclipse (1.2-4) UNRELEASED; urgency=low
 +
 +  * Add unversioned lib dependency alternatives
 +    - libgl1-mesa-dev | libgl-dev
 +    - libsdl1.2-dev | libsdl-dev
 +    - lib1g-dev | libz-dev
 +  * Enable hardening build flags
 +    - dh compat level 9
 +    - Added build-with-ldflags.patch:
 +      Patch which appends $(LDFLAGS) to all end-targets
 +    - Removed build-with-debug-symbols.patch:
 +      Now handled in d/rules instead
 +  * Enable parallel build
++
++ -- Martin Erik Werner <martinerikwerner at gmail.com>  Tue, 07 Aug 2012 21:18:04 +0200
++
+ redeclipse (1.2-3) unstable; urgency=high
+ 
    * Add debian/patches/security-text-command-fix.patch
      - File access security fix (Closes: #684143)
  

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