[chocolate-doom] branch master updated (06ecb58 -> ca69acf)

[Fabian Greffrath]

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

fabian pushed a change to branch master
in repository chocolate-doom.

      from  06ecb58   further clarify/simplify debian/copyright
       new  1477cf1   Imported Upstream version 2.2.1
       new  19b143d   Merge tag 'upstream/2.2.1'
       new  d826fd8   Install upstream appdata files and remove them in the clean rule
       new  9e6d395   Provide unique license names in debian/copyright
       new  ca69acf   update debian/changelog

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 NEWS                             |  42 ++++++++
 README.Strife                    |  70 ++-----------
 codeblocks/config.h              |   6 +-
 codeblocks/game-res.rc           |  10 +-
 codeblocks/setup-res.rc          |   8 +-
 configure.ac                     |  18 +++-
 debian/changelog                 |   8 ++
 debian/chocolate-doom.install    |   1 +
 debian/chocolate-heretic.install |   1 +
 debian/chocolate-hexen.install   |   1 +
 debian/chocolate-strife.install  |   1 +
 debian/clean                     |   1 +
 debian/copyright                 |   6 +-
 man/Makefile.am                  |   1 +
 man/doom.template                |   2 +
 man/environ.man                  |   5 +-
 man/heretic.template             |   2 +
 man/hexen.template               |   2 +
 man/iwad_paths.man               |  48 +++++++++
 man/strife.template              |   2 +
 msvc/config.h                    |   6 +-
 msvc/doom.vcproj                 |   4 +
 msvc/heretic.vcproj              |   4 -
 msvc/hexen.vcproj                |   8 --
 msvc/win32.rc                    |   8 +-
 pkg/osx/Info.plist.in            |   6 ++
 src/.gitignore                   |   1 +
 src/Makefile.am                  |  19 ++++
 src/d_iwad.c                     | 209 ++++++++++++++++++++++++++-------------
 src/doom.appdata.xml.in          |  45 +++++++++
 src/doom/g_game.c                |  17 ++--
 src/doomtype.h                   |   6 ++
 src/heretic.appdata.xml.in       |  44 +++++++++
 src/heretic/d_main.c             |   1 -
 src/heretic/g_game.c             |   1 -
 src/hexen.appdata.xml.in         |  44 +++++++++
 src/hexen/g_game.c               |   1 -
 src/hexen/h2_main.c              |   1 -
 src/setup/multiplayer.c          |  13 ++-
 src/setup/setup-manifest.xml.in  |   1 +
 src/setup/setup.desktop.in       |   3 +-
 src/strife.appdata.xml.in        |  45 +++++++++
 src/strife/g_game.c              |   1 -
 43 files changed, 536 insertions(+), 187 deletions(-)
 create mode 100644 man/iwad_paths.man
 create mode 100644 src/doom.appdata.xml.in
 create mode 100644 src/heretic.appdata.xml.in
 create mode 100644 src/hexen.appdata.xml.in
 create mode 100644 src/strife.appdata.xml.in

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