Discussion:
[Blends-commit] [SCM] games branch, master, updated. 0.9-84-g7fca3f8
Markus Koschany
2014-08-17 12:56:02 UTC
Permalink
The following commit has been merged in the master branch:
commit c9c161eae5be1a18fa532d2c58a441c5b1fa0dc4
Author: Markus Koschany <apo at gambaru.de>
Date: Thu Aug 14 12:00:09 2014 +0200

Add libflatzebra-dev to c++-dev

diff --git a/tasks/c++-dev b/tasks/c++-dev
index 570b8aa..c96293b 100644
--- a/tasks/c++-dev
+++ b/tasks/c++-dev
@@ -93,6 +93,8 @@ Depends: libclaw-dev

Depends: libglc-dev

+Depends: libflatzebra-dev
+
Suggests: marsshooter

Suggests: 0ad
--
Debian Games Pure Blend
Markus Koschany
2014-08-17 12:56:02 UTC
Permalink
The following commit has been merged in the master branch:
commit 737219021f3e67badf9c4dfa0a3f4ba040b1c737
Merge: c9c161eae5be1a18fa532d2c58a441c5b1fa0dc4 f393a15ce2a1ebb0ff14c1f6461590cadfa90a41
Author: Markus Koschany <apo at gambaru.de>
Date: Sun Aug 17 14:52:40 2014 +0200

Merge branch 'master' of git+ssh://git.debian.org/git/blends/projects/games

diff --combined tasks/c++-dev
index c96293b,5ed8977..a6a3cd1
--- a/tasks/c++-dev
+++ b/tasks/c++-dev
@@@ -31,6 -31,8 +31,8 @@@ Depends: libbullet-de

Depends: libbox2d-dev

+ Depends: libalure-dev
+
Depends: libalut-dev

Depends: libboost-all-dev
@@@ -93,8 -95,6 +95,8 @@@ Depends: libclaw-de

Depends: libglc-dev

+Depends: libflatzebra-dev
+
Suggests: marsshooter

Suggests: 0ad
--
Debian Games Pure Blend
Markus Koschany
2014-08-17 12:56:02 UTC
Permalink
The following commit has been merged in the master branch:
commit 6031009447a5e088ea1196468bebecff8c16d586
Author: Markus Koschany <apo at gambaru.de>
Date: Sun Aug 17 14:53:06 2014 +0200

Revert "Add frogatto to platform task."

This reverts commit f393a15ce2a1ebb0ff14c1f6461590cadfa90a41.

Frogatto-data is non-free. The game could be included in another development
task targeted at producing free content for this game.

diff --git a/tasks/platform b/tasks/platform
index 0ecf1de..eef14fb 100644
--- a/tasks/platform
+++ b/tasks/platform
@@ -18,8 +18,6 @@ Depends: blobwars

Depends: ffrenzy

-Depends: frogatto
-
Depends: gnujump

Depends: holotz-castle
--
Debian Games Pure Blend
Markus Koschany
2014-08-17 12:56:02 UTC
Permalink
The following commit has been merged in the master branch:
commit 716b5ce9873736d43b0bba3716ef395aa37e483e
Author: Markus Koschany <apo at gambaru.de>
Date: Sun Aug 17 14:55:02 2014 +0200

Remove out-of-order. It is non-free.

diff --git a/tasks/adventure b/tasks/adventure
index 0102d4d..602a9d2 100644
--- a/tasks/adventure
+++ b/tasks/adventure
@@ -28,8 +28,6 @@ Depends: lure-of-the-temptress

Depends: onscripter

-Depends: out-of-order
-
Depends: qtads

Depends: renpy
--
Debian Games Pure Blend
Markus Koschany
2014-08-17 12:56:03 UTC
Permalink
The following commit has been merged in the master branch:
commit 7fca3f843cfd39f2127080d613c84793fa6a89b1
Author: Markus Koschany <apo at gambaru.de>
Date: Sun Aug 17 14:55:52 2014 +0200

Run make dist

diff --git a/debian-games-tasks.desc b/debian-games-tasks.desc
index 42e34d5..17832ac 100644
--- a/debian-games-tasks.desc
+++ b/debian-games-tasks.desc
@@ -104,6 +104,7 @@ Packages: list
maelstrom
marsshooter
mirrormagic
+ mmpong-gl
monster-masher
moon-buggy
moon-lander
@@ -141,6 +142,7 @@ Packages: list
starvoyager
supertransball2
supertux
+ tatan
tecnoballz
teeworlds
tenmado
@@ -260,6 +262,7 @@ Packages: list
libsfml-dev
libbullet-dev
libbox2d-dev
+ libalure-dev
libalut-dev
libboost-all-dev
libfreetype6-dev
@@ -286,6 +289,7 @@ Packages: list
libirrlicht-dev
libclaw-dev
libglc-dev
+ libflatzebra-dev

Task: games-card
Section: debian-games
@@ -485,6 +489,7 @@ Packages: list
openarena
alex4
xmoto
+ smc
holotz-castle
blobwars
atomix
@@ -601,6 +606,7 @@ Packages: list
angband
alex4
xmoto
+ smc
holotz-castle
blobwars
atomix
@@ -736,6 +742,7 @@ Packages: list
oneisenough
pachi
plee-the-bear
+ smc
seahorse-adventures
supertux
toppler
@@ -977,6 +984,7 @@ Packages: list
rrootage
sopwith
starfighter
+ tatan
tenmado
titanion
torus-trooper
@@ -1069,6 +1077,7 @@ Packages: list
freeorion
freecraft
gbatnav
+ glob2
gnurobots
hedgewars
lightyears
@@ -1099,6 +1108,7 @@ Packages: list
wesnoth
widelands
xfrisk
+ xscorch
zec

Task: games-tetris
diff --git a/debian/control b/debian/control
index 9c8865b..27fb896 100644
--- a/debian/control
+++ b/debian/control
@@ -120,6 +120,7 @@ Recommends: a7xpg,
maelstrom,
marsshooter,
mirrormagic,
+ mmpong-gl,
monster-masher,
moon-buggy,
moon-lander,
@@ -157,6 +158,7 @@ Recommends: a7xpg,
starvoyager,
supertransball2,
supertux,
+ tatan,
tecnoballz,
teeworlds,
tenmado,
@@ -191,11 +193,9 @@ Suggests: efp,
fofix,
gnome-games,
kdegames,
- mmpong-gl,
netrek-client-cow,
pangzero,
- pinball,
- tatan
+ pinball
Description: Debian's arcade games
This metapackage will install arcade games.

@@ -281,6 +281,7 @@ Recommends: chipmunk-dev,
gdb,
glee-dev,
liballegro5-dev,
+ libalure-dev,
libalut-dev,
libboost-all-dev,
libbox2d-dev,
@@ -288,6 +289,7 @@ Recommends: chipmunk-dev,
libclanlib-dev,
libclaw-dev,
libenet-dev,
+ libflatzebra-dev,
libfreetype6-dev,
libgl1-mesa-dev,
libglc-dev,
@@ -552,6 +554,7 @@ Recommends: 0ad,
scorched3d,
searchandrescue,
sgt-puzzles,
+ smc,
sopwith,
springlobby,
supertransball2,
@@ -573,8 +576,7 @@ Recommends: 0ad,
xgalaga,
xmoto
Suggests: pinball,
- redeclipse,
- smc
+ redeclipse
Description: Debian's finest games
This metapackage will install a selection of outstanding Debian games
representing almost all genres and styles. They were chosen based on multiple
@@ -654,6 +656,7 @@ Recommends: a7xpg,
ri-li,
searchandrescue,
sgt-puzzles,
+ smc,
sopwith,
supertransball2,
supertux,
@@ -671,8 +674,7 @@ Recommends: a7xpg,
xboard,
xgalaga,
xmoto
-Suggests: pinball,
- smc
+Suggests: pinball
Description: Debian's finest games (light version)
This metapackage will install a selection of outstanding Debian games that are
suitable for low-end computers without hardware accelerated video cards. This
@@ -783,13 +785,13 @@ Recommends: abe,
pachi,
plee-the-bear,
seahorse-adventures,
+ smc,
supertux,
toppler,
whichwayisup,
xjump,
xmoto,
xscavenger
-Suggests: smc
Description: Debian's platform games
This metapackage will install platform games.

@@ -1022,6 +1024,7 @@ Recommends: alienblaster,
rrootage,
sopwith,
starfighter,
+ tatan,
tenmado,
titanion,
torus-trooper,
@@ -1038,8 +1041,7 @@ Recommends: alienblaster,
xsoldier
Suggests: barrage,
gravitywars,
- supertransball2,
- tatan
+ supertransball2
Description: Debian's shoot 'em up games
This metapackage will install mainly shoot 'em up games also known as shmup
or STG and some closely related shooter games.
@@ -1121,6 +1123,7 @@ Recommends: 0ad,
freecraft,
freeorion,
gbatnav,
+ glob2,
gnurobots,
hedgewars,
lightyears,
@@ -1151,12 +1154,11 @@ Recommends: 0ad,
wesnoth,
widelands,
xfrisk,
+ xscorch,
zec
Suggests: colobot,
- glob2,
lgeneral,
- netrek-client-cow,
- xscorch
+ netrek-client-cow
Description: Debian's strategy games
This metapackage will install strategy games.
--
Debian Games Pure Blend
Loading...