[megaglest] 05/143: updates based on feedback from pabs

Sat Jan 31 20:46:03 UTC 2015

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

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

commit 86d3019d591048ad233b3c7764657b803e9c5a4c
Author: Mark Vejvoda <mark_vejvoda at hotmail.com>
Date:   Thu May 26 15:14:36 2011 +0000

    updates based on feedback from pabs
---
 debian/README.Debian     |  3 +--
 debian/TODO              | 11 +++--------
 debian/compat            |  2 +-
 debian/control           | 26 ++++++++++++++++----------
 debian/megaglest.desktop | 11 -----------
 debian/megaglest.install |  4 +---
 debian/menu              |  1 +
 debian/rules             |  7 -------
 debian/source/format     |  1 +
 9 files changed, 24 insertions(+), 42 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 5367546..323bd49 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,8 +1,7 @@
 MegaGlest for Debian
 -----------------------
 
-It is recommented to perform Config -> Auto Config before starting to play and
-complaining "the game doesn't show anything!". If your glx version is lower
+If your glx version is lower
 than 1.3 set CheckGlCaps=0 in the ~/.megaglest/glestuser.ini file.
 
  -- Giuseppe Borzi <gborzi at ieee.org>, Mon, 12 Dec 2005 20:27:08 +0100
diff --git a/debian/TODO b/debian/TODO
index 198fc66..f6a035a 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,17 +1,12 @@
 - make the game big endian friendly (post started on glest
   forum: http://www.glest.org/board2/viewtopic.php?t=1426)
-- change configuration.xml creation method: do not symlink to
-  the package one, but copy it and change it
 - glest.ini should not contain references to a specific font,
   but should autodetect fonts present on the system and create
   the ugly '-*-fixed-bold-r-normal--*-*-*-*-*-*-*-*' things
+  NOTE: If specific fonts don't exist megaglest falls back to fixed
   (BTW, why don't they just kill this retareded way of
-  specifying fonts?)
+  specifying fonts? This is planned for the next release, that is using a
+  proper font library)
 - see what patches were added by other distros:
-   http://download.opensuse.org/distribution/SL-OSS-factory/inst-source/suse/src/
-   http://download.opensuse.org/distribution/10.2/repo/src-oss/suse/src/
-   http://cvs.fedoraproject.org/viewcvs/rpms/glest
-   http://cvs.fedoraproject.org/viewcvs/rpms/glest-data
-   http://rpms.mandrivaclub.com/rpms/mandriva/devel//cooker/x86_64/media/contrib/release/glest-2.0.0-2mdv2007.1.x86_64.html
 - update debian/glest.6 to add information about the new options
   added for multiplayer games
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 9001a73..4895388 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,12 @@
 Source: megaglest
-Section: contrib/games
+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>, Alexander Reichle-Schmehl <tolimar at debian.org>, Mark Vejvoda <mark_vejvoda at hotmail.com>
+Uploaders: Giuseppe Borzi <gborzi at ieee.org>, 
+ Eddy Petrișor <eddy.petrisor at gmail.com>, 
+ Siegfried-Angel Gevatter Pujals <rainct at ubuntu.com>, 
+ Alexander Reichle-Schmehl <tolimar at debian.org>, 
+ Mark Vejvoda <mark_vejvoda at hotmail.com>
 Build-Depends: debhelper (>= 7.0.50~),
   cmake,
   libsdl1.2-dev, 
@@ -14,29 +18,31 @@ Build-Depends: debhelper (>= 7.0.50~),
   libpng12-dev,
   libjpeg-dev,
   libz-dev,
-  libcurl-dev,
+  libcurl4-dev,
   libwxgtk2.8-dev,
-  quilt
-Standards-Version: 3.8.0
+  libxml2
+Standards-Version: 3.9.1
 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
 Homepage: http://www.megaglest.org/
 
 Package: glest
- Depends: megaglest, ${misc:Depends}
+ Depends: megaglest
  Architecture: all
+ Depends: ${misc:Depends}
  Section: oldlibs
  Description: transitional dummy package
 
 Package: megaglest
 Replaces: glest (<< 3.5.2-1~)
-Conflicts: glest (<< 3.5.2-1~)
-Architecture: i386 amd64 ia64 mipsel arm alpha kfreebsd-i386 kfreebsd-amd64 armel lpia
-Depends: ${shlibs:Depends}, ${misc:Depends}, p7zip-full, megaglest-data (= ${binary:Version})
+Breaks: glest (<< 3.5.2-1~)
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, p7zip-full, megaglest-data (>= ${source:Version})
 Description: a free 3D real-time customizable strategy game
  Glest takes place in a context which could be compared to that of the
  pre-renaissance Europe, with the licence that magic forces exist in the
- environment and can be controlled.
+ environment and can be controlled. To play this game you must also install
+ the package: megaglest-data
  .
  The current version is fully playable and supports both single player
  games against CPU controlled players and multiplayer matches over the
diff --git a/debian/megaglest.desktop b/debian/megaglest.desktop
deleted file mode 100644
index 3a54bdc..0000000
--- a/debian/megaglest.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-
-[Desktop Entry]
-Type=Application
-Name=MegaGlest
-Comment=Play a real-time strategy game with 3D graphics
-Exec=megaglest
-Icon=megaglest
-Terminal=false
-Categories=Game;StrategyGame;
-StartupNotify=true
-Name[en_CA]=megaglest.desktop
diff --git a/debian/megaglest.install b/debian/megaglest.install
index 29ebf5f..8da1f68 100644
--- a/debian/megaglest.install
+++ b/debian/megaglest.install
@@ -1,5 +1,3 @@
 debian/tmp/usr/bin/megaglest usr/games
-debian/tmp/usr/bin/megaglest_editor usr/games
-debian/tmp/usr/bin/megaglest_g3dviewer usr/games
-debian/tmp/usr/bin/megaglest_configurator usr/games
+debian/tmp/usr/bin/megaglest_* usr/games
 
diff --git a/debian/menu b/debian/menu
index 548e827..7da0b2c 100644
--- a/debian/menu
+++ b/debian/menu
@@ -2,5 +2,6 @@
 	needs="X11" \
 	section="Games/Strategy" \
 	title="MegaGlest" \
+	longtitle="A real time strategy game." \
 	command="/usr/games/megaglest" \
 	icon="/usr/share/pixmaps/megaglest.png"
diff --git a/debian/rules b/debian/rules
index 591f2d7..1a4f36e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,8 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DMEGAGLEST_DATA_INSTALL_PATH=share/games/megaglest/
-
 %:
-#	dh --with quilt $@
 	dh $@ --parallel
 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

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

