[triplea] branch master updated (1788a57 -> f177a9f)

[Scott Sheridan Howard]

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

showard pushed a change to branch master
in repository triplea.

      from  1788a57   some fixes for upnp library
       new  ad7d1f9   Merge from experimental to unstable. * Merge from experimental to unstable. * Debian S-V no changes * updated Vcs-Git. * Remove project-support.jpg from package, non-free file.
       new  2ef9032   Imported Upstream version 1.6.1.2+dfsg
       new  7bff427   Merge branch 'merge_to_unstable_upstream' into merge_to_unstable
       new  f177a9f   Merge branch '1.6.1.2+dfsg-debian'

The 4 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:
 debian/changelog               |  14 +++++++++++---
 debian/control                 |   4 ++--
 debian/rules                   |  31 +++++++++++++++++++++++++++++--
 debian/watch                   |   2 +-
 doc/images/project-support.jpg | Bin 3788 -> 0 bytes
 5 files changed, 43 insertions(+), 8 deletions(-)
 delete mode 100644 doc/images/project-support.jpg

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