[SCM] Packaging for Red Eclipse branch, master, updated. debian/1.2-2-22-g39236fe

[Martin Erik Werner]

The following commit has been merged in the master branch:
commit b171a6a41b02bbc496d992ed48ead81979bb4de9
Merge: cdec96d791e9c6c52b730fea7da00f640280bd2f c8f02bc7864fb04ed0584eafd1e6e801311dde46
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

diff --combined debian/changelog
index 9f86150,435cd0f..d8138c8
--- a/debian/changelog
+++ b/debian/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)
  

-- 
Packaging for Red Eclipse