[lgeneral] branch master updated (fbbb4f5 -> f856100)

[Markus Koschany]

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

apo-guest pushed a change to branch master
in repository lgeneral.

      from  fbbb4f5   Update copyright year.
       new  3847f81   Do not repack the tarball anymore. It is now completely DFSG compatible.
       new  ec6ec70   Start new changelog entry
       new  df4bfe8   Imported Upstream version 1.2.6
       new  82896ae   Merge tag 'upstream/1.2.6'
       new  a545f70   Drop all patches. They were merged upstream.
       new  72d148f   Remove override for dh_install.
       new  5304fed   Drop README.source. LGeneral is pristine now.
       new  d3bba25   Update changelog for 1.2.6-1
       new  7aa6204   Remove clean file.
       new  16af6f9   Fix installation of lgeneral.png.
       new  63fba1a   Still clean messages.po.
       new  f856100   Remove opts=dversionmagle from debian/watch.

The 12 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:
 AUTHORS                              |  14 ++-
 ChangeLog                            |  12 +++
 Makefile.am                          |  13 +--
 Makefile.in                          |  13 +--
 TODO                                 |  22 +---
 configure                            |   2 +-
 configure.in                         |   2 +-
 debian/README.source                 |   9 --
 debian/changelog                     |  13 +++
 debian/clean                         |   1 -
 debian/copyright                     |   5 -
 debian/lgeneral.install              |  12 +--
 debian/patches/desktop-file.patch    |  20 ----
 debian/patches/icon.patch            |  24 -----
 debian/patches/remove-mapnames.patch |  38 -------
 debian/patches/series                |   3 -
 debian/rules                         |   8 +-
 debian/watch                         |   1 -
 lgc-pg/convdata/Makefile.am          |   2 +-
 lgc-pg/convdata/Makefile.in          |   2 +-
 lgc-pg/maps.c                        |  18 ++--
 lgc-pg/misc.c                        |   4 +-
 lgc-pg/misc.h                        |   5 +
 lgc-pg/parser.c                      |   4 +-
 lgc-pg/scenarios.c                   |  78 +++++++-------
 lgc-pg/shp.c                         |  46 ++++----
 lgc-pg/units.c                       |  58 +++++-----
 lgeneral-redit/src/parser.c          |   9 +-
 lgeneral.desktop                     |   9 ++
 lgeneral.desktop.in                  |   7 --
 lgeneral48.png => lgeneral.png       | Bin
 lgeneral16.png                       | Bin 437 -> 0 bytes
 lgeneral32.png                       | Bin 1170 -> 0 bytes
 src/action.h                         |   4 +-
 src/engine.c                         | 200 +++++++++++++++++++++--------------
 src/main.c                           |  12 ++-
 src/map.c                            |  32 ++----
 src/misc.h                           |   5 +
 src/parser.c                         |   4 +-
 src/scenario.c                       |   3 +-
 src/slot.c                           |  38 ++++---
 41 files changed, 344 insertions(+), 408 deletions(-)
 delete mode 100644 debian/README.source
 delete mode 100644 debian/patches/desktop-file.patch
 delete mode 100644 debian/patches/icon.patch
 delete mode 100644 debian/patches/remove-mapnames.patch
 delete mode 100644 debian/patches/series
 create mode 100644 lgeneral.desktop
 delete mode 100644 lgeneral.desktop.in
 rename lgeneral48.png => lgeneral.png (100%)
 delete mode 100644 lgeneral16.png
 delete mode 100644 lgeneral32.png

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