Bug#737137: game-data-packager: patch to support hexdd

2015-01-18 Thread Fabian Greffrath
Am Sonntag, den 18.01.2015, 00:07 + schrieb Simon McVittie: 
 Hacx is more ambiguous, because it isn't clear from the info I've seen
 whether it was originally sold as a Doom II addon, or as a standalone
 game with its own copy of the Doom II executable. I would tend to err on
 the side of separating it out rather than putting it in doom2.yaml, but
 I'll defer to the superior knowledge of people who've actually played it :-P

IIRC, the version of HACX they actually sold was a PWAD to DOOM2.WAD.
But the version 1.2 that is freely available today is a stand-alone
IWAD.

- Fabian


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2015-01-17 Thread Fabian Greffrath
Am Freitag, den 16.01.2015, 11:34 + schrieb Simon McVittie: 
 Great, then CHEX2 should be a package with type: expansion in data/chex.yaml
 rather than having its own data/chex2.yaml. It should probably have
 longname: Chex Quest (including Chex Quest 2) at top level (shown in
 g-d-p --help), and longname: Chex Quest/longname: Chex Quest 2 in the
 individual packages.

Chex 1/2 and Hacx should go into doom.yaml. Technically, they are just
some more Doom WADs and even the most basic source ports (i.e.
chocolate-doom and prboom-plus) support them.

- Fabian


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2015-01-17 Thread Simon McVittie
On 17/01/15 21:38, Fabian Greffrath wrote:
 Chex 1/2 and Hacx should go into doom.yaml.

For at least Chex Quest, I disagree. My intention is that the division
into YAML files (and, one day, entries in a GUI) is not about whether
things happen to run on the same engine - that's an implementation
detail. Rather, it's about whether, based on how the game is/was
advertised and distributed, an average player would think of it as the
same game or not. Chex Quest was a standalone game given away in
breakfast cereal to children too young to be playing Doom, that's
clearly not meant to be basically the same :-)

That's why plutonia-wad and tnt-wad are now generated by
final-doom.yaml. Technically, they're IWADs for a Doom II-compatible
engine, so on a technical basis you could argue for them to be either
two separate games like they were in shell-script-based g-d-p (because
they're independent IWADs and you can in principle have one but not the
other) or part of Doom II (because they run on the Doom II engine) - but
they were sold together as Final Doom, a standalone game (as opposed to
an expansion pack for Doom II), and so that's how I think their g-d-p
support should be structured.

Hacx is more ambiguous, because it isn't clear from the info I've seen
whether it was originally sold as a Doom II addon, or as a standalone
game with its own copy of the Doom II executable. I would tend to err on
the side of separating it out rather than putting it in doom2.yaml, but
I'll defer to the superior knowledge of people who've actually played it :-P

S


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2015-01-16 Thread Simon McVittie
Control: clone 737137 -2 -3 -4
Control: retitle -2 game-data-packager: add support for Strife
Control: retitle -3 game-data-packager: add support for Hacx
Control: retitle -4 game-data-packager: add support for Chex Quest 1  2
Control: tags -2 = newcomer
Control: tags -3 = newcomer
Control: tags -4 = newcomer
Control: tags 737137 = patch pending

On Mon, 12 Jan 2015 at 01:39:32 +, Simon McVittie wrote:
 I have added support for hexdd.wad in git (as hexen-deathkings-data
 following the newer $GAME(-$QUALIFIER)-data naming scheme).

I'm cloning new bugs for the other feature requests that has crept into
#737137, because if I do that, the original feature request can be closed
soon. (Also, there's no particular reason why we have to do all these games at
the same time.)

 On Fri, 31 Jan 2014 at 15:12:59 +, Johey Shmit wrote:
  Attached is a patch against git that adds support
  for the following games:
  
  - heretic shareware

Fixed in git.

  - hexen shareware

 I added support for hexen-demo-data but it's currently commented out,
 because it doesn't work on Chocolate Doom. At some point I'll try it
 with Doomsday.

That's #775484 if someone wants to look into it.

  - hexen add on hexdd

That's the original feature request from this bug, which can be closed
soon.

  - strife registered

That's clone -2 (it will get a real bug number shortly). It should just
require writing a data/strife.yaml resembling data/hexen.yaml. At the
moment you also still need a supported/strife resembling supported/hexen,
but that's completely trivial.

  - strife shareware

That's sort of linked to clone -2, but I don't think we should implement
this if we don't have any engines that can actually play it anyway.
Whoever does the Strife support is welcome to include all the shareware
checksums, unpacking details etc. in data/strife.yaml, but the actual
package stanza should be commented out (like hexen-demo-data is at the
moment).

 I can't support Heretic shareware until I've added a way to spell
 obtain these two files, concatenate them, then unpack them in the YAML files
 that now describe supported games, and Python code to implement that.
 But I need that feature at some point anyway, for Quake.

Fixed in git.

On Mon, 12 Jan 2015 at 10:47:28 +0100, Fabian Greffrath wrote:
 Yes, please change it back to /usr/share/games/doom.

Fixed in git.

  If you want Hacx or any of the versions of Chex Quest, they'll need
  the same data.
 
 As a starting point:
 http://doomwiki.org/wiki/CHEX.WAD
 http://doomwiki.org/wiki/CHEX2.WAD
 http://doomwiki.org/wiki/HACX.WAD
 
 Later on, I can provide the other checksums as well, if needed. 

Clones -3 and -4. As with Strife, these two should just need a data/foo.yaml
and a supported/foo resembling the ones for hexen.

 Please note that CHEX2.WAD is a PWAD that requires the CHEX.WAD IWAD to
 play, i.e. it's an extension.

Great, then CHEX2 should be a package with type: expansion in data/chex.yaml
rather than having its own data/chex2.yaml. It should probably have
longname: Chex Quest (including Chex Quest 2) at top level (shown in
g-d-p --help), and longname: Chex Quest/longname: Chex Quest 2 in the
individual packages.

S


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2015-01-12 Thread Fabian Greffrath
Am Montag, den 12.01.2015, 01:39 + schrieb Simon McVittie: 
 I'm a little confused about what the right thing is here. The installation
 folder has in fact been /usr/share/games/(hexen|heretic) since v35,
 possibly accidentally. I can change it back to /usr/share/games/doom
 if necessary - it's easy to do now.

Yes, please change it back to /usr/share/games/doom. Chocolate Doom,
which uses 4 different executables for the four different games,
searches onyl in this directory. Other engines (e.g. ZDoom, Vavoom,
Doomsday), which share one executable for the four games, search in this
directory anyway.

 If you want Hacx or any of the versions of Chex Quest, they'll need
 the same data.

As a starting point:
http://doomwiki.org/wiki/CHEX.WAD
http://doomwiki.org/wiki/CHEX2.WAD
http://doomwiki.org/wiki/HACX.WAD

Later on, I can provide the other checksums as well, if needed. 

Please note that CHEX2.WAD is a PWAD that requires the CHEX.WAD IWAD to
play, i.e. it's an extension.

 Do we have anything in Debian that can play the Strife demo?
 Vavoom from stable maybe? If not, I'm not going to include support for it.

I don't think so. Strife has been completely reverse-engineered from
scratch and IIRC even Chocolate Strife, which is considered the most
faithful reproduction, does not feature suipport for the demo version.

- Fabian


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2015-01-11 Thread Simon McVittie
On Thu, 30 Jan 2014 at 15:04:18 +, Johey Shmit wrote:
 included is a patch to support the hexen addon 'hexdd.wad'.

I have added support for hexdd.wad in git (as hexen-deathkings-data
following the newer $GAME(-$QUALIFIER)-data naming scheme).

I have not added support for Strife, Hacx, or any version of Chex Quest,
so I haven't marked this bug pending (yet).

I added support for hexen-demo-data but it's currently commented out,
because it doesn't work on Chocolate Doom. At some point I'll try it
with Doomsday.

On Thu, 30 Jan 2014 at 18:24:05 +0100, Fabian Greffrath wrote:
 Am Donnerstag, den 30.01.2014, 15:04 + schrieb Johey Shmit: 
  This patch also changes the installation folder of heretic and hexen wads
  back to /usr/share/games/hexen|heretic as it was before version 30. I 
  originally
  suggested the change to put all doom engine files into /usr/share/games/doom
  but I now think that was not such a good idea.
 
 Please keep it that way!
 
 Currently all Doom engines in Debian that also support playing Heretic
 or Hexen have /u/s/games/doom set as their IWAD directory.

I'm a little confused about what the right thing is here. The installation
folder has in fact been /usr/share/games/(hexen|heretic) since v35,
possibly accidentally. I can change it back to /usr/share/games/doom
if necessary - it's easy to do now.

On Fri, 31 Jan 2014 at 15:12:59 +, Johey Shmit wrote:
 Attached is a patch against git that adds support
 for the following games:
 
 - heretic shareware
 - hexen shareware
 - strife shareware
 - hexen add on hexdd
 - strife registered

To put this into the new packaging scheme for g-d-p, I would like the
following for each wad file, and for each file that gets downloaded
or unpacked while deriving the downloadable ones:

* canonical filename
* some sort of version identification, if there are others with the same
  canonical filename (e.g. the various flavours of doom.wad documented
  on the Doom wiki)
* exact size (e.g. cksum $files)
* md5 (md5sum $files)
* sha1 (sha1sum $files)
* sha256 (sha256sum $files)
* where to put it (e.g. /usr/share/games/doom?)

I've been able to harvest some of this from the Doom wiki.

If you want Hacx or any of the versions of Chex Quest, they'll need
the same data.

Ideally, I would like to rename any shareware wads whose names collide with
non-shareware (e.g. hexen.wad could be either shareware or retail) so
that it is physically possible to install both at the same time.
Doomsday seems to support hexendemo.wad so perhaps that could be its
canonical name in Debian?

I can't support Heretic shareware until I've added a way to spell
obtain these two files, concatenate them, then unpack them in the YAML files
that now describe supported games, and Python code to implement that.
But I need that feature at some point anyway, for Quake.

On Mon, 03 Feb 2014 at 11:37:44 +0100, Fabian Greffrath wrote:
 BTW, chocolate-doom supports all three variants of Heretic (shareware, 3
 Ep commercial and 5 Ep retail) but not Hexen demo and Strife demo.

Do we have anything in Debian that can play the Strife demo?
Vavoom from stable maybe? If not, I'm not going to include support for it.

On Wed, 05 Feb 2014 at 13:11:47 +, Johey Shmit wrote:
 True for a generic PWAD-target. But wouldn't it make sense to do the hash 
 checking for
 'official' pwads (hexdd, doom's no rest for the living and Master levels) 
 and
 the shareware versions? These could be placed under the existing 'main' games.

This is the structure I'm using for everything now, with a temporary
historical exception for quake2. Please see data/hexen.yaml for a complete
example (one full game, one expansion, one demo, although the demo is
commented out for now).

The idea is that everything that was sold as a full playable game in its
own right (registered IWADs, in Doom terms) is its own .yaml file and target,
but everything that depends on a particular full game (PWADs), or is a
cut-down demo version of a full game (shareware/demo IWADs), is bundled
into that game's target.

That way, casual players who know they have acquired a game that was sold
as Foo 3 can point g-d-p at its installation directory (or ideally CD),
tell it foo3, and g-d-p will figure out for itself whether there
are any expansions bundled with it :-)

Regards,
S


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-02-05 Thread Johey Shmit



 Fabian Greffrath fab...@greffrath.com schrieb am 10:25 Dienstag, 4.Februar 
 2014:

  Am Montag, den 03.02.2014, 19:08 +0100 schrieb Fabian Greffrath: 
  The Debian doomsday package contains a wrapper script called
  doomsday-compat that translates between the general -iwad 
 ...
  -file ... sytnax and doomsday's own. It is the one that is 
 registered
  as an alternative for /usr/games/doom. However, curretly it only checks
  for IWADs and I have forgotten to add support for hexdd.wad, which is of
  course a PWAD. :/
 
 That's fixed in GIT now and should at least work for the simple -iwad
 hexen.wad -file hexdd.wad case.

Speaking of PWADs: I just realized that the 'main' game menu in g-d-p is 
getting really long. Perhaps it would be better to support hexdd and all 
shareware versions in the way the quake mission packs are supportet:

 game-data-packager heretic -share ...
 game-data-packager hexen -hexdd ...
 game-data-packager doom -hacx ...

or something like that (are there any conventions on the options?).

As my patch is not in git yet, I could make a new one if the above sounds like 
a good idea!


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-02-05 Thread Jonathan Dowland
On Wed, Feb 05, 2014 at 11:41:57AM +, Johey Shmit wrote:
 Speaking of PWADs: I just realized that the 'main' game menu in g-d-p
 is getting really long. Perhaps it would be better to support hexdd
 and all shareware versions in the way the quake mission packs are
 supportet:
 
  game-data-packager heretic -share ...
  game-data-packager hexen -hexdd ...
  game-data-packager doom -hacx ...
 
 or something like that (are there any conventions on the options?).

Hmm. I think a new target 'pwad' might be the best approach at the
moment, with parent-IWAD sub-arguments. so

  game-data-packager pwad --doom2 foo.wad - foo-pwad
  (foo-pwad depends: doom2-engine)

To avoid cluttering it too much. I don't think the pwad functionality
should be buried under the existing targets since most of the machinery
for them (hash checking the IWADs etc.) is irrelevant (it's also less
discoverable)

On the one hand, one day there'll be a gdp GUI frontend which will make
the long list more usable, on the other, I imagine we'll always have a
CLI option so...


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-02-05 Thread Johey Shmit
 Jonathan Dowland j...@debian.org schrieb am 13:02 Mittwoch, 5.Februar 2014:

  On Wed, Feb 05, 2014 at 11:41:57AM +, Johey Shmit wrote:
 
  Speaking of PWADs: I just realized that the 'main' game menu in 
 g-d-p
  is getting really long. Perhaps it would be better to support hexdd
  and all shareware versions in the way the quake mission packs are
  supportet:
 
   game-data-packager heretic -share ...
   game-data-packager hexen -hexdd ...
   game-data-packager doom -hacx ...
 
  or something like that (are there any conventions on the options?).
 
 Hmm. I think a new target 'pwad' might be the best approach at the
 moment, with parent-IWAD sub-arguments. so
 
   game-data-packager pwad --doom2 foo.wad - foo-pwad
   (foo-pwad depends: doom2-engine)

Shouldn't that be: foo-pwad depends: doom2-wad ?

 To avoid cluttering it too much. I don't think the pwad functionality
 should be buried under the existing targets since most of the machinery
 for them (hash checking the IWADs etc.) is irrelevant (it's also less
 discoverable)

True for a generic PWAD-target. But wouldn't it make sense to do the hash 
checking for
'official' pwads (hexdd, doom's no rest for the living and Master levels) 
and
the shareware versions? These could be placed under the existing 'main' games.


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-02-04 Thread Fabian Greffrath
Am Montag, den 03.02.2014, 19:08 +0100 schrieb Fabian Greffrath: 
 The Debian doomsday package contains a wrapper script called
 doomsday-compat that translates between the general -iwad ...
 -file ... sytnax and doomsday's own. It is the one that is registered
 as an alternative for /usr/games/doom. However, curretly it only checks
 for IWADs and I have forgotten to add support for hexdd.wad, which is of
 course a PWAD. :/

That's fixed in GIT now and should at least work for the simple -iwad
hexen.wad -file hexdd.wad case.

- Fabian


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-02-03 Thread Johey Shmit


 Fabian Greffrath fab...@greffrath.com schrieb am 7:08 Montag, 3.Februar 
 2014:

  Am Samstag, den 01.02.2014, 16:09 + schrieb Johey Shmit: 
  Great! Thanks for including the patches! But please leave in the Chex 
 Quest 3
  support. It will still help people who compile and install zdoom by 
 themselves
  (like I do at the moment).
 
 I think, g-d-p can use every contribution that it gets. However, I
 question the benefit of supporting game data for which there is no
 matching engine in Debian. This would leave out Chex Quest 3, Hexen Demo
 and Strife Demo.

Yes, I agree. I just assumed that at least vavoom ist supporting all the
shareware version. I however did not check that, sorry.

Vavoom is failing to run on my kubuntu at the moment, I'll try to install
sid on a different partition when i find the time.

But I just did a quick check with doomsday and the shareware versions of heretic
and hexen did run without any immediate errors (did not play long though).

So I guess we can support them!

However the hexdd addon did load but as soon as the first level starts doomsday
crashes.

Could you check that with vavoom? Otherwise we should leave that out for
the moment.

 Regarding the former, it is just one of countless ZDoom-specific add-ons
 out there and I believe we should not start packaging them, because (a)
 where should we stop once we started (b) why should we start with this
 one and (c) we do not even have that engine in the archive. Regarding
 the latter two, I am sure that chocolate-doom currently does not support
 them, not sure about doomsday, though. 
 
 Do you know for sure that Heretic Shareware is properly supported? I'd
 consider it highly frustrating for our users to send them through a
 packaging procedure for explicitely supported game data but without
 providing a matching engine to actually play that game.

You are absolutely right! I made the mistake of using zdoom for all my
testing and was not thinking this through.

  Yes, that sounds better. But I do not see that category in my kde 
 configuration (running
  Kubuntu 13.10). Although some desktop files include 
 Categories=Game;ActionGame; those
  games (like Vavoom and wolf4sdl) still show up directly in 'Games'.
 
 AFAICT if a category is displayed as a separate sub-menu is decided by
 the number of items in it.
 
  Games that use 'Categories=Game;ArcadeGame;' are being placed in 
 the correct submenu.
 
 Maybe simply because there are more games in this category and it pays
 off to display them in a separate menu.
 
  ArcadeGame is included in  /etc/xdg/kde4-applications.menu and 
 'ActionGame' is not so I
  guessed that 'ActionGame' is not one of the allowed names.
 
 It is:
 http://standards.freedesktop.org/menu-spec/latest/apas02.html

Thanks for the link, I must have been blind, sorry.



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-02-03 Thread Fabian Greffrath
Am Montag, den 03.02.2014, 10:10 + schrieb Johey Shmit: 
 However the hexdd addon did load but as soon as the first level starts 
 doomsday
 crashes.

Please pass -game hexen-dk to doomsday. Yes, that's a pain in the ass,
but doomsday does not support the -iwad ... -file ... combination of
parameters. *sigh*

 Could you check that with vavoom? Otherwise we should leave that out for
 the moment.

If you want to test Vavoom, make sure to use the version from
experimental. However, it fails to run on my machine as soon as I
rebuild the package. I believe it's time to kick it from the archive,
upstream is dead anyway.

BTW, chocolate-doom supports all three variants of Heretic (shareware, 3
Ep commercial and 5 Ep retail) but not Hexen demo and Strife demo.

- Fabian


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-02-03 Thread Jonathan Dowland
On Mon, Feb 03, 2014 at 11:37:44AM +0100, Fabian Greffrath wrote:
 Please pass -game hexen-dk to doomsday. Yes, that's a pain in the ass,
 but doomsday does not support the -iwad ... -file ... combination of
 parameters. *sigh*

Gah. I'd like to see 'provides: doom-engine (or similar) to mean
supports the following set of command line arguments and semantics.
(I have some pending debian-policy email to get the ball rolling on
this).


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-02-03 Thread Fabian Greffrath
Am Montag, den 03.02.2014, 16:00 + schrieb Jonathan Dowland: 
 Gah. I'd like to see 'provides: doom-engine (or similar) to mean
 supports the following set of command line arguments and semantics.
 (I have some pending debian-policy email to get the ball rolling on
 this).

The Debian doomsday package contains a wrapper script called
doomsday-compat that translates between the general -iwad ...
-file ... sytnax and doomsday's own. It is the one that is registered
as an alternative for /usr/games/doom. However, curretly it only checks
for IWADs and I have forgotten to add support for hexdd.wad, which is of
course a PWAD. :/

- Fabian


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-02-02 Thread Fabian Greffrath
Am Samstag, den 01.02.2014, 16:09 + schrieb Johey Shmit: 
 Great! Thanks for including the patches! But please leave in the Chex Quest 
 3
 support. It will still help people who compile and install zdoom by themselves
 (like I do at the moment).

I think, g-d-p can use every contribution that it gets. However, I
question the benefit of supporting game data for which there is no
matching engine in Debian. This would leave out Chex Quest 3, Hexen Demo
and Strife Demo.

Regarding the former, it is just one of countless ZDoom-specific add-ons
out there and I believe we should not start packaging them, because (a)
where should we stop once we started (b) why should we start with this
one and (c) we do not even have that engine in the archive. Regarding
the latter two, I am sure that chocolate-doom currently does not support
them, not sure about doomsday, though. 

Do you know for sure that Heretic Shareware is properly supported? I'd
consider it highly frustrating for our users to send them through a
packaging procedure for explicitely supported game data but without
providing a matching engine to actually play that game.

 Yes, that sounds better. But I do not see that category in my kde 
 configuration (running
 Kubuntu 13.10). Although some desktop files include 
 Categories=Game;ActionGame; those
 games (like Vavoom and wolf4sdl) still show up directly in 'Games'.

AFAICT if a category is displayed as a separate sub-menu is decided by
the number of items in it.

 Games that use 'Categories=Game;ArcadeGame;' are being placed in the correct 
 submenu.

Maybe simply because there are more games in this category and it pays
off to display them in a separate menu.

 ArcadeGame is included in  /etc/xdg/kde4-applications.menu and 'ActionGame' 
 is not so I
 guessed that 'ActionGame' is not one of the allowed names.

It is:
http://standards.freedesktop.org/menu-spec/latest/apas02.html

- Fabian


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-02-01 Thread Jonathan Dowland
On Sat, Feb 01, 2014 at 07:28:52AM +0100, Fabian Greffrath wrote:
 Honestly, I am afraid the list of DSFG-free high-rated PWADs will be
 rather short.

I suspect you are right. From memory, the PWAD TXT template that was
used for the majority of files had a three-way license boilerplate:
one was 'you can do anything you want with this file' which is clearly
DFSG compatible; another was (I believe) 'you may use this pwad as a
base for another but you must credit the author' which might be and
another was 'you may not modify this file' which is obviously not.
I suspect the majority of old PWADs used either the second or third
clause and the majority of new ones use none of them (the template
falling out of fashion).


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-02-01 Thread Johey Shmit
Hi Fabian,


 Fabian Greffrath fab...@greffrath.com schrieb am 19:58 Freitag, 31.Januar 
 2014:

  Am Freitag, den 31.01.2014, 19:56 +0100 schrieb Fabian Greffrath: 
 
  PS: I know this is getting perky, but now that you have practice at it,
  would you mind adding Chex Quest(R) and the Hacx 1.2 IWAD as well? ;)
 
 Oh, and No Rest For The Living aka pack_nerve aka nerve.wad?

I'm not owning Chex Quest 1 and No Rest For The Living but I added support 
for
Chex Quest 3 and HacX as they are freely available.

BTW. I'm suggesting moving the desktop entries into a subcategory. Judging from
/etc/xdg/kde4-applications.menu it looks like 'ArcadeGame' would be the right 
one.From cb2ddb37e16bb9daa14cb7bc0bbf8115d6b19d8a Mon Sep 17 00:00:00 2001
From: Johey Shmit joheysh...@yahoo.com
Date: Sat, 1 Feb 2014 14:27:36 +0100
Subject: [PATCH 2/3] added support for Chex Quest 3 and HacX

Signed-off-by: Johey Shmit joheysh...@yahoo.com
---
 Makefile   | 14 -
 chex3/DEBIAN/control.in| 15 ++
 debian/control |  4 +--
 doom-common.mk |  8 +
 .../usr/share/applications/chex3.desktop.in|  9 ++
 doom-common/usr/share/applications/hacx.desktop.in |  9 ++
 hacx/DEBIAN/control.in | 15 ++
 lib/chex3-mirrors  |  1 +
 lib/doom-common| 12 
 lib/hacx-mirrors   |  4 +++
 supported/chex3| 34 ++
 supported/hacx | 34 ++
 12 files changed, 149 insertions(+), 10 deletions(-)
 create mode 100644 chex3/DEBIAN/control.in
 create mode 100644 doom-common/usr/share/applications/chex3.desktop.in
 create mode 100644 doom-common/usr/share/applications/hacx.desktop.in
 create mode 100644 hacx/DEBIAN/control.in
 create mode 100644 lib/chex3-mirrors
 create mode 100644 lib/hacx-mirrors
 create mode 100644 supported/chex3
 create mode 100644 supported/hacx

diff --git a/Makefile b/Makefile
index 88f3cc3..2f7a81a 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,13 @@ default: $(DIRS)
 		LONG=Strife Shareware
 	make -f doom-common.mk IWAD=strife GAME=strife VERSION=$(VERSION) \
 		CONTROLIN=strife/DEBIAN/control.in \
-		LONG=Strife Quest for the Sigil
+		LONG=Strife: Quest for the Sigil
+	make -f doom-common.mk IWAD=chex3 GAME=chex3 VERSION=$(VERSION) \
+		CONTROLIN=chex3/DEBIAN/control.in \
+		LONG=Chex Quest 3
+	make -f doom-common.mk IWAD=hacx GAME=hacx VERSION=$(VERSION) \
+		CONTROLIN=hacx/DEBIAN/control.in \
+		LONG=HacX
 	make -f quake.mk LONG=Quake VERSION=$(VERSION) PACKAGE=quake-registered \
 		FOLDER=id1
 	make -f quake.mk LONG=Quake music VERSION=$(VERSION) \
@@ -92,6 +98,12 @@ clean:
 	make -f doom-common.mk IWAD=strife VERSION=$(VERSION) \
 		CONTROLIN=strife/DEBIAN/control.in \
 		LONG=Strife: Quest for the Sigil clean
+	make -f doom-common.mk IWAD=chex3 VERSION=$(VERSION) \
+		CONTROLIN=chex3/DEBIAN/control.in \
+		LONG=Chex Quest 3 clean
+	make -f doom-common.mk IWAD=hacx VERSION=$(VERSION) \
+		CONTROLIN=hacx/DEBIAN/control.in \
+		LONG=HacX clean
 	make -f quake.mk LONG=Quake VERSION=$(VERSION) PACKAGE=quake-registered \
 		FOLDER=id1 clean
 	make -f quake.mk LONG=Quake music VERSION=$(VERSION) \
diff --git a/chex3/DEBIAN/control.in b/chex3/DEBIAN/control.in
new file mode 100644
index 000..eb17361
--- /dev/null
+++ b/chex3/DEBIAN/control.in
@@ -0,0 +1,15 @@
+Package: PACKAGE
+Section: non-free/games
+Priority: optional
+Architecture: all
+Multi-Arch: foreign
+Recommends: chocolate-doom | chex3-engine
+Breaks: chocolate-doom ( 2)
+Provides: chex3-wad
+Installed-Size: 56
+Version: VERSION
+Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
+Description: IWADs from Charles Jacobi's Chex Quest 3 computer game
+ Chex Quest 3 requires both a chex3-engine and an IWAD file to play.
+ This package contains the IWAD from Charles Jacobi's game Chex Quest 3
+ and was generated using the game-data-packager program.
diff --git a/debian/control b/debian/control
index da9543e..891c001 100644
--- a/debian/control
+++ b/debian/control
@@ -36,5 +36,5 @@ Description: Installer for game data files
  .
  At the moment, game-data-packager has support for building .deb
  files for Doom games (Doom, Doom 2 and Final Doom); LGeneral;
- Heretic; Hexen; Hexen 2; Rise of the Triad; Quake; Quake II; Quake III Arena
- and Wolfenstein 3D.
+ Heretic; Hexen; Hexen 2; Rise of the Triad; Quake; Quake II; Quake III Arena;
+ Wolfenstein 3D; Strife; Chex Quest 3 and HacX.
diff --git a/doom-common.mk b/doom-common.mk
index c316ba5..4f6d476 100644
--- a/doom-common.mk
+++ b/doom-common.mk
@@ -62,6 +62,14 @@ build/$(IWAD)-wad/usr/share/applications/$(IWAD)-wad.desktop:
 		m4 -DGAME=strife -DLONG=$(LONG) -DENGINE=$(GAME) \
 			

Bug#737137: game-data-packager: patch to support hexdd

2014-02-01 Thread Fabian Greffrath
Am Samstag, den 01.02.2014, 13:51 + schrieb Johey Shmit: 
 I'm not owning Chex Quest 1 and No Rest For The Living but I added 
 support for
 Chex Quest 3 and HacX as they are freely available.

Cool, thanks! However, Chex Quest 3 is only for ZDoom, which we
unfortunately cannot ship in Debian. I'll change this to Chex Quest when
I commit the patch. NRFTL requires some explicite support in source
ports, which (of the ones shipped in Debian) currently only prboom-plus
provides.

 BTW. I'm suggesting moving the desktop entries into a subcategory. Judging 
 from
 /etc/xdg/kde4-applications.menu it looks like 'ArcadeGame' would be the right 
 one.

Hm, I'd rather say ActionGame?

- Fabian


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-02-01 Thread Johey Shmit


 Fabian Greffrath fab...@greffrath.com schrieb am 16:37 Samstag, 1.Februar 
 2014:

  Am Samstag, den 01.02.2014, 13:51 + schrieb Johey Shmit: 
  I'm not owning Chex Quest 1 and No Rest For The 
 Living but I added support for
  Chex Quest 3 and HacX as they are freely available.
 
 Cool, thanks! However, Chex Quest 3 is only for ZDoom, which we
 unfortunately cannot ship in Debian. I'll change this to Chex Quest when
 I commit the patch. NRFTL requires some explicite support in source
 ports, which (of the ones shipped in Debian) currently only prboom-plus
 provides.

Great! Thanks for including the patches! But please leave in the Chex Quest 3
support. It will still help people who compile and install zdoom by themselves
(like I do at the moment).

  BTW. I'm suggesting moving the desktop entries into a subcategory. 
 Judging from
  /etc/xdg/kde4-applications.menu it looks like 'ArcadeGame' would be 
 the right one.
 
 Hm, I'd rather say ActionGame?

Yes, that sounds better. But I do not see that category in my kde configuration 
(running
Kubuntu 13.10). Although some desktop files include Categories=Game;ActionGame; 
those
games (like Vavoom and wolf4sdl) still show up directly in 'Games'.

Games that use 'Categories=Game;ArcadeGame;' are being placed in the correct 
submenu.

ArcadeGame is included in  /etc/xdg/kde4-applications.menu and 'ActionGame' is 
not so I
guessed that 'ActionGame' is not one of the allowed names.


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-01-31 Thread Johey Shmit
Hello Fabian,



 Fabian Greffrath fab...@greffrath.com schrieb am 20:18 Donnerstag, 
 30.Januar 2014:
  Am Donnerstag, den 30.01.2014, 19:09 + schrieb Johey Shmit: 
  Yes, that's true of course. But aren't the games startet by the 
 desktop
  entries which point to a wad file directly anyway? The built in wad
  browsers of the game engines aren't really used in that scenario, so we
  could split up the wad files into separate directories.
 
 I regularly run e.g. doom -iwad doom2.wad -file ~/doom/whatever.wad 
 in
 a Terminal and would find it very inconvenient if I had to specify a
 specific path to the IWAD files just because they happen to be
 heretic.wad or hexen.wad.

Ok, I see your point. Attached is a patch against git that adds support
for the following games:

- heretic shareware
- hexen shareware
- strife shareware
- hexen add on hexdd
- strife registered

All files are put into /usr/share/games/doom/.

Thanks for considering including the patch!From 37d8986a9917983d164e258cf5f4706ca0665bb1 Mon Sep 17 00:00:00 2001
From: Johey Shmit joheysh...@yahoo.com
Date: Fri, 31 Jan 2014 16:05:09 +0100
Subject: [PATCH] added support for Heretic SW, Hexen SW, Hexen addon hexdd,
 Strife SW and Strife registered

Signed-off-by: Johey Shmit joheysh...@yahoo.com
---
 Makefile   |  30 ++
 doom-common.mk |  30 +-
 .../usr/share/applications/doom-common.desktop.in  |   2 +-
 .../applications/heretic-shareware.desktop.in  |   9 ++
 .../usr/share/applications/hexdd.desktop.in|   9 ++
 .../share/applications/hexen-shareware.desktop.in  |   9 ++
 .../share/applications/strife-shareware.desktop.in |   9 ++
 .../usr/share/applications/strife.desktop.in   |   9 ++
 heretic-shareware/DEBIAN/control.in|  15 +++
 hexdd/DEBIAN/control.in|  16 +++
 hexen-shareware/DEBIAN/control.in  |  15 +++
 lib/doom-common| 111 +++--
 lib/game-data-packager-shared  |   9 +-
 lib/heretic-shareware-mirrors  |   3 +
 lib/hexen-shareware-mirrors|   3 +
 lib/strife-shareware-mirrors   |   2 +
 strife-shareware/DEBIAN/control.in |  15 +++
 strife/DEBIAN/control.in   |  15 +++
 supported/heretic-shareware|  37 +++
 supported/hexdd|  17 
 supported/hexen-shareware  |  35 +++
 supported/strife   |  28 ++
 supported/strife-shareware |  34 +++
 23 files changed, 445 insertions(+), 17 deletions(-)
 create mode 100644 doom-common/usr/share/applications/heretic-shareware.desktop.in
 create mode 100644 doom-common/usr/share/applications/hexdd.desktop.in
 create mode 100644 doom-common/usr/share/applications/hexen-shareware.desktop.in
 create mode 100644 doom-common/usr/share/applications/strife-shareware.desktop.in
 create mode 100644 doom-common/usr/share/applications/strife.desktop.in
 create mode 100644 heretic-shareware/DEBIAN/control.in
 create mode 100644 hexdd/DEBIAN/control.in
 create mode 100644 hexen-shareware/DEBIAN/control.in
 create mode 100644 lib/heretic-shareware-mirrors
 create mode 100644 lib/hexen-shareware-mirrors
 create mode 100644 lib/strife-shareware-mirrors
 create mode 100644 strife-shareware/DEBIAN/control.in
 create mode 100644 strife/DEBIAN/control.in
 create mode 100644 supported/heretic-shareware
 create mode 100644 supported/hexdd
 create mode 100644 supported/hexen-shareware
 create mode 100644 supported/strife
 create mode 100644 supported/strife-shareware

diff --git a/Makefile b/Makefile
index ee1b938..88f3cc3 100644
--- a/Makefile
+++ b/Makefile
@@ -12,12 +12,27 @@ default: $(DIRS)
 		LONG=Final Doom: TNT: Evilution VERSION=$(VERSION)
 	make -f doom-common.mk IWAD=plutonia \
 		LONG=Final Doom: The Plutonia Experiment VERSION=$(VERSION)
+	make -f doom-common.mk IWAD=heretic-shareware GAME=heretic VERSION=$(VERSION) \
+		CONTROLIN=heretic-shareware/DEBIAN/control.in \
+		LONG=Heretic Shareware
 	make -f doom-common.mk IWAD=heretic GAME=heretic VERSION=$(VERSION) \
 		CONTROLIN=heretic/DEBIAN/control.in \
 		LONG=Heretic: Shadow of the Serpent Riders
+	make -f doom-common.mk IWAD=hexen-shareware GAME=hexen VERSION=$(VERSION) \
+		CONTROLIN=hexen-shareware/DEBIAN/control.in \
+		LONG=Hexen Shareware
 	make -f doom-common.mk IWAD=hexen GAME=hexen VERSION=$(VERSION) \
 		CONTROLIN=hexen/DEBIAN/control.in \
 		LONG=Hexen: Beyond Heretic
+	make -f doom-common.mk IWAD=hexdd GAME=hexen VERSION=$(VERSION) \
+		CONTROLIN=hexdd/DEBIAN/control.in \
+		LONG=Hexen: Deathkings of the Dark Citadel
+	make -f doom-common.mk IWAD=strife-shareware GAME=strife VERSION=$(VERSION) \
+		CONTROLIN=strife-shareware/DEBIAN/control.in \
+		LONG=Strife 

Bug#737137: game-data-packager: patch to support hexdd

2014-01-31 Thread Fabian Greffrath
Hi Johey,

Am Freitag, den 31.01.2014, 15:12 + schrieb Johey Shmit: 
 Ok, I see your point. Attached is a patch against git that adds support
 for the following games:
 
 - heretic shareware
 - hexen shareware
 - strife shareware
 - hexen add on hexdd
 - strife registered

o_O Wow, thanks for the patch!

- Fabian


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-01-31 Thread Fabian Greffrath
Am Freitag, den 31.01.2014, 19:56 +0100 schrieb Fabian Greffrath: 
 PS: I know this is getting perky, but now that you have practice at it,
 would you mind adding Chex Quest(R) and the Hacx 1.2 IWAD as well? ;)

Oh, and No Rest For The Living aka pack_nerve aka nerve.wad?

*duck*


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-01-31 Thread Fabian Greffrath
Am Freitag, den 31.01.2014, 15:12 + schrieb Johey Shmit: 
 - heretic shareware
 - hexen shareware
 - strife shareware
 - hexen add on hexdd
 - strife registered

PS: I know this is getting perky, but now that you have practice at it,
would you mind adding Chex Quest(R) and the Hacx 1.2 IWAD as well? ;)

- Fabian


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-01-31 Thread Jonathan Dowland
On Fri, Jan 31, 2014 at 07:58:03PM +0100, Fabian Greffrath wrote:
 Oh, and No Rest For The Living aka pack_nerve aka nerve.wad?

Isn't that a PWAD?


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-01-31 Thread Jonathan Dowland
On Thu, Jan 30, 2014 at 07:09:05PM +, Johey Shmit wrote:
 And then I'd like to add support for doom pwads to g-d-p. They would
 also end up in the same directory, making it even more crowded.

I'm not sure how to handle PWADs. I would like to see some packaged. I
had a grand scheme to data-mine the doomworld.com/idgames DB for PWADs
with a DFSG-free license, correlating with the community reviews/score
to get the best ones. I suspect that, if that was ever done, someone
should package the results up into one ZIP somewhere and that could be
packaged as a first-class Debian archive package.

I think that rather than try to add individual PWAD support to g-d-p
I'd like to see someone package and/or write-and-package a half decent
doom launcher. Such a thing could handle downloading PWADs and storing
them somewhere itself. (Of course, I'm not fixed in my opinions!)


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-01-31 Thread Fabian Greffrath
 Isn't that a PWAD?

Yes, but it's an *official* expansion - just like hexdd.wad (also a PWAD
to the Hexen IWAD), which this bug was initially about.

 - Fabian


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-01-31 Thread Fabian Greffrath
 I'm not sure how to handle PWADs. I would like to see some packaged. I
 had a grand scheme to data-mine the doomworld.com/idgames DB for PWADs
 with a DFSG-free license, correlating with the community reviews/score
 to get the best ones. I suspect that, if that was ever done, someone
 should package the results up into one ZIP somewhere and that could be
 packaged as a first-class Debian archive package.

Honestly, I am afraid the list of DSFG-free high-rated PWADs will be
rather short. Instead, I think we should package some of the classics [1],
or at least add support to download and package them with
game-data-packager. Its purpose is to package non-free game data anyway.

 I think that rather than try to add individual PWAD support to g-d-p
 I'd like to see someone package and/or write-and-package a half decent
 doom launcher. Such a thing could handle downloading PWADs and storing
 them somewhere itself. (Of course, I'm not fixed in my opinions!)

Yes, this would of course be better, but I am afraid that someone has to
write this before. ;)

 - Fabian

[1] E.g. the 6 Compet-N PWADs plus Icarus and Eternal Doom.


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-01-30 Thread Johey Shmit
Package: game-data-packager
Version: 37
Severity: wishlist

Dear Maintainer,

included is a patch to support the hexen addon 'hexdd.wad'.

This patch also changes the installation folder of heretic and hexen wads
back to /usr/share/games/hexen|heretic as it was before version 30. I originally
suggested the change to put all doom engine files into /usr/share/games/doom
but I now think that was not such a good idea.

Would you consider adding the patch?

One more question: is it allowed to add support for pwads to g-d-p?
Or is there any other recommended way to get pwads packaged?

Best,

Johey
diff -uNr game-data-packager-37/doom-common/usr/share/applications/hexdd.desktop.in game-data-packager-37.patched/doom-common/usr/share/applications/hexdd.desktop.in
--- game-data-packager-37/doom-common/usr/share/applications/hexdd.desktop.in	1970-01-01 01:00:00.0 +0100
+++ game-data-packager-37.patched/doom-common/usr/share/applications/hexdd.desktop.in	2014-01-30 15:26:09.887953139 +0100
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=LONG
+GenericName=First Person Shooter Game
+TryExec=ENGINE
+Exec=ENGINE -iwad /usr/share/games/ENGINE/hexen.wad -file /usr/share/games/ENGINE/hexdd.wad
+Icon=GAME.xpm
+Terminal=false
+Type=Application
+Categories=Game
diff -uNr game-data-packager-37/doom-common.mk game-data-packager-37.patched/doom-common.mk
--- game-data-packager-37/doom-common.mk	2013-10-13 22:58:10.0 +0200
+++ game-data-packager-37.patched/doom-common.mk	2014-01-30 15:00:46.383630600 +0100
@@ -42,9 +42,15 @@
 		 $@
 
 build/$(IWAD)-wad/usr/share/applications/$(IWAD)-wad.desktop:
-	m4 -DGAME=$(IWAD) -DLONG=$(LONG) -DENGINE=$(GAME) \
-		doom-common/usr/share/applications/doom-common.desktop.in \
-		 $@
+	if [ $(IWAD) = hexdd ] ; then \
+		m4 -DGAME=hexen -DLONG=$(LONG) -DENGINE=$(GAME) \
+			doom-common/usr/share/applications/hexdd.desktop.in \
+			 $@ ; \
+	else \
+		m4 -DGAME=$(IWAD) -DLONG=$(LONG) -DENGINE=$(GAME) \
+			doom-common/usr/share/applications/doom-common.desktop.in \
+			 $@ ; \
+	fi
 
 build/$(IWAD)-wad/DEBIAN/preinst:
 	m4 -DIWAD=$(IWAD).wad \
diff -uNr game-data-packager-37/hexdd/DEBIAN/control.in game-data-packager-37.patched/hexdd/DEBIAN/control.in
--- game-data-packager-37/hexdd/DEBIAN/control.in	1970-01-01 01:00:00.0 +0100
+++ game-data-packager-37.patched/hexdd/DEBIAN/control.in	2014-01-30 14:33:20.787522733 +0100
@@ -0,0 +1,13 @@
+Package: PACKAGE
+Section: non-free/games
+Priority: optional
+Architecture: all
+Depends: hexen-wad
+Provides: GAME-wad
+Installed-Size: 56
+Version: VERSION
+Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
+Description: Hexen: Deathkings of the Dark Citadel
+ This expansion pack requires both a hexen-engine and a hexen-wad to play.
+ This package contains add-on levels to Raven Software's game hexen
+ and was generated using the game-data-packager program.
diff -uNr game-data-packager-37/lib/doom-common game-data-packager-37.patched/lib/doom-common
--- game-data-packager-37/lib/doom-common	2013-10-13 22:58:10.0 +0200
+++ game-data-packager-37.patched/lib/doom-common	2014-01-30 15:42:19.040182483 +0100
@@ -18,7 +18,9 @@
 	debug checksum = $CHECKSUM
 }
 
-WADDIR=/usr/share/games/doom
+set +u
+[ -n $WADDIR ] || WADDIR=/usr/share/games/doom
+set -u
 DEB=$DATADIR/$DEBBASE
 
 go() {
diff -uNr game-data-packager-37/Makefile game-data-packager-37.patched/Makefile
--- game-data-packager-37/Makefile	2013-11-18 20:32:13.0 +0100
+++ game-data-packager-37.patched/Makefile	2014-01-30 15:00:02.099629764 +0100
@@ -13,11 +13,14 @@
 	make -f doom-common.mk IWAD=plutonia \
 		LONG=Final Doom: The Plutonia Experiment VERSION=$(VERSION)
 	make -f doom-common.mk IWAD=heretic VERSION=$(VERSION) \
-		CONTROLIN=heretic/DEBIAN/control.in \
+		CONTROLIN=heretic/DEBIAN/control.in GAME=heretic \
 		LONG=Heretic: Shadow of the Serpent Riders
 	make -f doom-common.mk IWAD=hexen VERSION=$(VERSION) \
-		CONTROLIN=hexen/DEBIAN/control.in \
+		CONTROLIN=hexen/DEBIAN/control.in GAME=hexen \
 		LONG=Hexen: Beyond Heretic
+	make -f doom-common.mk IWAD=hexdd VERSION=$(VERSION) \
+		CONTROLIN=hexdd/DEBIAN/control.in GAME=hexen \
+		LONG=Hexen: Deathkings of the Dark Citadel
 	make -f quake.mk LONG=Quake VERSION=$(VERSION) PACKAGE=quake-registered \
 		FOLDER=id1
 	make -f quake.mk LONG=Quake music VERSION=$(VERSION) \
@@ -59,11 +62,14 @@
 	make -f doom-common.mk IWAD=plutonia \
 		LONG=Final Doom: The Plutonia Experiment VERSION=$(VERSION) clean
 	make -f doom-common.mk IWAD=heretic VERSION=$(VERSION) \
-		CONTROLIN=heretic/DEBIAN/control.in \
+		CONTROLIN=heretic/DEBIAN/control.in GAME=heretic \
 		LONG=Heretic: Shadow of the Serpent Riders clean
 	make -f doom-common.mk IWAD=hexen VERSION=$(VERSION) \
-		CONTROLIN=hexen/DEBIAN/control.in \
+		CONTROLIN=hexen/DEBIAN/control.in GAME=hexen \
 		LONG=Hexen: Beyond Heretic clean
+	make -f doom-common.mk IWAD=hexdd VERSION=$(VERSION) \
+		CONTROLIN=hexdd/DEBIAN/control.in GAME=hexen \
+		LONG=Hexen: 

Bug#737137: game-data-packager: patch to support hexdd

2014-01-30 Thread Fabian Greffrath
Am Donnerstag, den 30.01.2014, 15:04 + schrieb Johey Shmit: 
 This patch also changes the installation folder of heretic and hexen wads
 back to /usr/share/games/hexen|heretic as it was before version 30. I 
 originally
 suggested the change to put all doom engine files into /usr/share/games/doom
 but I now think that was not such a good idea.

Please keep it that way!

Currently all Doom engines in Debian that also support playing Heretic
or Hexen have /u/s/games/doom set as their IWAD directory.

- Fabian


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-01-30 Thread Fabian Greffrath
Am Donnerstag, den 30.01.2014, 19:09 + schrieb Johey Shmit: 
 Yes, that's true of course. But aren't the games startet by the desktop
 entries which point to a wad file directly anyway? The built in wad
 browsers of the game engines aren't really used in that scenario, so we
 could split up the wad files into separate directories.

I regularly run e.g. doom -iwad doom2.wad -file ~/doom/whatever.wad in
a Terminal and would find it very inconvenient if I had to specify a
specific path to the IWAD files just because they happen to be
heretic.wad or hexen.wad.

 I just feel it's getting too messy in /u/s/games/doom, especially if we
 add support for all the shareware-versions of heretic, hexen and strife to 
 g-d-p.

But they all have distinct unique names or at least alternative names
(e.g. doomu.wad or bfgdoom2.wad) to separate them from each other.

 And then I'd like to add support for doom pwads to g-d-p. They would also
 end up in the same directory, making it even more crowded.

Yes, of course, they are all data for Doom (and compatible engines). So
why not put them all in the same doom data directory?

 Of course I'll change the patch so that all wads end up in one directory if
 you still think that's the best option.

Thank you!

- Fabian


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#737137: game-data-packager: patch to support hexdd

2014-01-30 Thread Johey Shmit
Hi Fabian,



 Fabian Greffrath fab...@greffrath.com schrieb am 18:24 Donnerstag, 
 30.Januar 2014:
  Am Donnerstag, den 30.01.2014, 15:04 + schrieb Johey Shmit: 
 
  This patch also changes the installation folder of heretic and hexen wads
  back to /usr/share/games/hexen|heretic as it was before version 30. I 
 originally
  suggested the change to put all doom engine files into 
 /usr/share/games/doom
  but I now think that was not such a good idea.
 
 Please keep it that way!
 
 Currently all Doom engines in Debian that also support playing Heretic
 or Hexen have /u/s/games/doom set as their IWAD directory.

Yes, that's true of course. But aren't the games startet by the desktop
entries which point to a wad file directly anyway? The built in wad
browsers of the game engines aren't really used in that scenario, so we
could split up the wad files into separate directories.

I just feel it's getting too messy in /u/s/games/doom, especially if we
add support for all the shareware-versions of heretic, hexen and strife to 
g-d-p.

And then I'd like to add support for doom pwads to g-d-p. They would also
end up in the same directory, making it even more crowded.

Of course I'll change the patch so that all wads end up in one directory if
you still think that's the best option.


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org