[megaglest] 35/143: wrap-and-sort -s

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository megaglest.

commit e0433ea553df0975bd0ebacb40cbc4c1b5aeba00
Author: Paul Wise <pabs at debian.org>
Date:   Tue Dec 20 01:35:39 2011 +0000

    wrap-and-sort -s
---
 debian/control   | 69 +++++++++++++++++++++++++++++---------------------------
 debian/copyright |  6 ++---
 2 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/debian/control b/debian/control
index c321091..c4e561d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,32 +2,34 @@ Source: megaglest
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Giuseppe Borzi <gborzi at ieee.org>, 
- Eddy Petrișor <eddy.petrisor at gmail.com>, 
- Siegfried-Angel Gevatter Pujals <rainct at ubuntu.com>, 
+Uploaders:
+ Giuseppe Borzi <gborzi at ieee.org>,
+ Eddy Petrișor <eddy.petrisor at gmail.com>,
+ Siegfried-Angel Gevatter Pujals <rainct at ubuntu.com>,
  Mark Vejvoda <mark_vejvoda at hotmail.com>
-Build-Depends: debhelper (>= 7.0.50~),
-  cmake,
-  help2man,
-  xvfb,
-  xauth,
-  libsdl1.2-dev, 
-  libxerces-c2-dev,
-  libvorbis-dev, 
-  libogg-dev, 
-  libopenal-dev, 
-  liblua5.1-dev, 
-  libpng12-dev,
-  libjpeg-dev,
-  libz-dev,
-  libcurl4-gnutls-dev | libcurl4-nss-dev,
-  libminiupnpc-dev,
-  libircclient-dev,
-  libwxgtk2.8-dev,
-  libfontconfig1-dev,
-  libxml2-dev,
-  libftgl-dev,
-  libglew-dev
+Build-Depends:
+ cmake,
+ debhelper (>= 7.0.50~),
+ help2man,
+ libcurl4-gnutls-dev | libcurl4-nss-dev,
+ libfontconfig1-dev,
+ libftgl-dev,
+ libglew-dev,
+ libircclient-dev,
+ libjpeg-dev,
+ liblua5.1-dev,
+ libminiupnpc-dev,
+ libogg-dev,
+ libopenal-dev,
+ libpng12-dev,
+ libsdl1.2-dev,
+ libvorbis-dev,
+ libwxgtk2.8-dev,
+ libxerces-c2-dev,
+ libxml2-dev,
+ libz-dev,
+ xauth,
+ xvfb
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/megaglest/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/megaglest/?op=log
@@ -45,16 +47,17 @@ Package: megaglest
 Replaces: glest (<< 3.5.2.3-1~)
 Breaks: glest (<< 3.5.2.3-1~)
 Architecture: any
-Depends: ${shlibs:Depends}, 
- ${misc:Depends}, 
- p7zip-full, 
- famfamfam-flag-png, 
- ttf-dejavu-core,
- fonts-uralic,
+Depends:
+ famfamfam-flag-png,
  fonts-liberation,
+ fonts-uralic,
+ megaglest-data (<= ${source:Version}),
+ megaglest-data (>= ${source:Upstream-Version}),
+ p7zip-full,
+ ttf-dejavu-core,
  ttf-wqy-zenhei,
- megaglest-data (>= ${source:Upstream-Version}), 
- megaglest-data (<= ${source:Version})
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: 3D multi-player real time strategy game
  MegaGlest is a free 3D real-time customizable strategy game
  which takes place in a context which could be compared to that of the
diff --git a/debian/copyright b/debian/copyright
index a2d8f4e..5bdae20 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,7 +19,7 @@ Copyright: 2008-2011, Titus Tscharntke (info at titusgames.de)
            2006-2008, Alexander Chemeris --> data types for win32
            2006,      Nemanja Trifunovic --> utf8 code
 
-This package was debianized by Giuseppe Borzi <gborzi at ieee.org> 
+This package was debianized by Giuseppe Borzi <gborzi at ieee.org>
 and Mark Vejvoda <mark_vejvoda at hotmail.com>
 on Wed, 25 May 2011 Wed, 25 May 2011 23:31:21 -0700.
 
@@ -32,7 +32,7 @@ Embedded libs:
     Dave Dribin
     Toxic Software
     Georgy Yunaev gyunaev at ulduzsoft.com
-   
+
     libminiupnpc:
     Thomas Bernard
     Reuben Hawkins
@@ -69,7 +69,7 @@ Original Glest:
     Copyright (C) 2001-2008 Martiño Figueroa
      - Everything except the files inside the directories listed below,
        which belong to Matthias Braun.
-    
+
     Copyright (C) 2005 Matthias Braun <matze at braunis.de>
      - source/shared_lib/*/platform/posix/
      - source/shared_lib/*/platform/sdl/

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