[redeclipse] 405/494: Merge branch 'master-svn'

[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 9ea42eedc4fca77e354e5d0001e5dc7c29bf1c16
Merge: 4194de1 9564a2d
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Sat Sep 1 11:35:57 2012 +0200

    Merge branch 'master-svn'
    
    Conflicts:
    	debian/changelog
    	debian/gbp.conf
    	debian/patches/build-with-ldflags.patch
    	debian/patches/series

 changelog                               |  10 +-
 clean                                   |   1 -
 control                                 |   1 -
 copyright                               |  76 +++++----
 generate-copyright                      | 262 ++++++++++++++++++++++++++++++++
 patches/backported-fix-icon-sizes.patch |  66 --------
 patches/build-with-ldflags.patch        |  34 -----
 patches/build-with-system-enet.patch    |  22 +--
 patches/security-text-command-fix.patch |  33 ----
 patches/series                          |   3 -
 patches/windowed-by-default.patch       |   2 +-
 redeclipse-server.doc-base              |   2 +-
 redeclipse.bug-presubj                  |   2 +-
 redeclipse.doc-base                     |   5 +-
 redeclipse.docs                         |   1 +
 rules                                   |  21 +--
 scripts/redeclipse                      |   2 +-
 17 files changed, 346 insertions(+), 197 deletions(-)

diff --cc changelog
index d8138c8,5f3028e..188850f
--- a/changelog
+++ b/changelog
@@@ -1,6 -1,11 +1,11 @@@
- redeclipse (1.2-4) UNRELEASED; urgency=low
+ redeclipse (1.3) experimental; urgency=low
  
+   * New upstream release
+   * XZ compression for orig tarball
+   * No more icon conversion in build
+     - Drop ImageMagick build-dependency
+   * Dropped debian/patches/build-with-ldflags.patch, upstreamed
 -  * Add unversion lib dependency alternatives
 +  * Add unversioned lib dependency alternatives
      - libgl1-mesa-dev | libgl-dev
      - libsdl1.2-dev | libsdl-dev
      - lib1g-dev | libz-dev
@@@ -10,9 -15,10 +15,10 @@@
        Patch which appends $(LDFLAGS) to all end-targets
      - Removed build-with-debug-symbols.patch:
        Now handled in d/rules instead
-   * Enable parallel build
+   * Enable paralell build
+   * debian/copyright now generated from upstream equivalent
  
 - -- Martin Erik Werner <martinerikwerner at gmail.com>  Sat, 01 Sep 2012 11:29:00 +0200
 + -- Martin Erik Werner <martinerikwerner at gmail.com>  Tue, 07 Aug 2012 21:18:04 +0200
  
  redeclipse (1.2-3) unstable; urgency=high
  

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