[SCM] Packaging for Red Eclipse branch, master-svn-ppa, updated. debian/1.2-2-52-g97e4152

[Martin Erik Werner]

The following commit has been merged in the master-svn-ppa branch:
commit fc58f2137f40c6e2ee46037c0f47791c7698ee64
Merge: 12e900d80759882a00f43c3fe662e1609125d059 545b2deb24d7d68bafd57df0840c66e0ba16af05
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Sat Aug 4 02:56:08 2012 +0200

    Merge branch 'master-svn' into master-svn-ppa
    
    Conflicts:
    	debian/rules

diff --combined debian/changelog
index a774701,134b0c9..fef31a8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,12 @@@
 -redeclipse (1.2+svn3759-1) UNRELEASED; urgency=low
 +redeclipse-svn (1.2+svn3759-1) UNRELEASED; urgency=low
  
    * New upstream development snapshot
    * XZ compression for orig tarball
+   * No more icon conversion in build
+     - Drop ImageMagick build-dependency
+   * Dropped debian/patches/build-with-ldflags.patch, upstreamed
  
 - -- Martin Erik Werner <martinerikwerner at gmail.com>  Sat, 14 Jul 2012 17:43:35 +0200
 + -- Martin Erik Werner <martinerikwerner at gmail.com>  Sat, 14 Jul 2012 18:58:01 +0200
  
  redeclipse (1.2-3) UNRELEASED; urgency=low
  
diff --combined debian/control
index 5192adf,1525f80..00a2189
--- a/debian/control
+++ b/debian/control
@@@ -1,9 -1,9 +1,8 @@@
 -Source: redeclipse
 +Source: redeclipse-svn
  Section: contrib/games
  Priority: optional
 -Uploaders: Martin Erik Werner <martinerikwerner at gmail.com>
 -Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 +Maintainer: Martin Erik Werner <martinerikwerner at gmail.com>
  Build-Depends: debhelper (>= 9),
-                imagemagick,
                 libenet-dev,
                 liblg1-mesa-dev | libgl-dev,
                 libsdl-image1.2-dev,
@@@ -16,10 -16,10 +15,10 @@@ Homepage: http://www.redeclipse.ne
  Vcs-Git: git://git.debian.org/pkg-games/redeclipse.git
  Vcs-Browser: http://git.debian.org/?p=pkg-games/redeclipse.git;a=summary
  
 -Package: redeclipse
 +Package: redeclipse-svn
  Architecture: any
  Pre-Depends: dpkg (>= 1.15.6~)
 -Depends: redeclipse-data (>= ${source:Upstream-Version}),
 +Depends: redeclipse-svn-data (>= ${source:Upstream-Version}),
           ${misc:Depends},
           ${shlibs:Depends}
  Description: multiplayer FPS game based on Cube2
@@@ -36,16 -36,16 +35,16 @@@
    * Available for Windows, Linux/BSD and Mac OSX
    * Builtin editor lets you create your own maps cooperatively online
  
 -Package: redeclipse-dbg
 +Package: redeclipse-svn-dbg
  Section: contrib/debug
  Priority: extra
  Architecture: any
  Pre-Depends: dpkg (>= 1.15.6~)
 -Depends: redeclipse (= ${binary:Version}), ${misc:Depends}
 +Depends: redeclipse-svn (= ${binary:Version}), ${misc:Depends}
  Description: debug symbols for the Red Eclipse FPS game
   This package contains the debugging symbols for the Red Eclipse FPS game.
  
 -Package: redeclipse-server
 +Package: redeclipse-svn-server
  Architecture: any
  Pre-Depends: dpkg (>= 1.15.6~)
  Depends: ${misc:Depends}, ${shlibs:Depends}
@@@ -54,12 -54,12 +53,12 @@@ Description: server for the Red Eclips
   also includes some example scripts for configuring the server. It contains no
   init integration.
  
 -Package: redeclipse-server-dbg
 +Package: redeclipse-svn-server-dbg
  Section: contrib/debug
  Priority: extra
  Architecture: any
  Pre-Depends: dpkg (>= 1.15.6~)
 -Depends: redeclipse-server (= ${binary:Version}), ${misc:Depends}
 +Depends: redeclipse-svn-server (= ${binary:Version}), ${misc:Depends}
  Description: debug symbols for the Red Eclipse dedicated server
   This package contains the debugging symbols for the dedicated server of the
   Red Eclipse FPS game.
diff --combined debian/rules
index b2d932c,61c9c89..e2a1f43
--- a/debian/rules
+++ b/debian/rules
@@@ -14,25 -14,19 +14,22 @@@ override_dh_auto_build
  		CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
  		CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
  		LDFLAGS="$(LDFLAGS)" \
- 		client server icons
+ 		client server
  
  override_dh_strip:
 -	dh_strip -predeclipse --dbg-package=redeclipse-dbg
 -	dh_strip -predeclipse-server --dbg-package=redeclipse-server-dbg
 +	dh_strip -predeclipse-svn --dbg-package=redeclipse-svn-dbg
 +	dh_strip -predeclipse-svn-server --dbg-package=redeclipse-svn-server-dbg
  	dh_strip
  
  override_dh_auto_install:
  	dh_auto_install -- \
  		CXXFLAGS="$(CXXFLAGS)" \
  		prefix=/usr games=/games gamesbin=/games \
 +		appname=redeclipse-svn \
  		system-install-client system-install-server \
  		system-install-docs system-install-menus
- 	install -d debian/tmp/usr/share/pixmaps
- 	convert 'src/redeclipse.ico[1]' \
- 		debian/tmp/usr/share/pixmaps/redeclipse-svn.xpm
 +	sed -e 's,\(^Name.*\),\1\ SVN,' \
 +		-i debian/tmp/usr/share/applications/redeclipse-svn.desktop
  
  override_dh_compress:
  	dh_compress --exclude=.cfg
@@@ -41,15 -35,15 +38,15 @@@ override_dh_builddeb
  	dh_builddeb -- -Zxz
  
  VER=$(shell dpkg-parsechangelog | sed -rne 's/^Version: ([^-]+).*/\1/p')
 -DIR=redeclipse-$(VER).orig
 -UTAR=redeclipse_$(VER).orig.tar.bz2
 -TAR=redeclipse_$(VER).orig.tar.xz
 +DIR=redeclipse-svn-$(VER).orig
 +UTAR=redeclipse-svn_$(VER).orig.tar.bz2
 +TAR=redeclipse-svn_$(VER).orig.tar.xz
  get-orig-source:
  	uscan --noconf --force-download --download-current-version --destdir=.
  	rm -rf $(DIR)
  	tar -xf $(UTAR)
  	rm -f $(UTAR)
 -	mv redeclipse/ $(DIR)
 +	mv redeclipse-svn/ $(DIR)
  	rm -rf $(DIR)/src/include/
  	rm -rf $(DIR)/src/xcode/
  	rm -rf $(DIR)/src/lib/

-- 
Packaging for Red Eclipse