[med-svn] [ball] branch master updated (0c5aaa0 -> be10cf8)

[Andreas Tille]

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

tille pushed a change to branch master
in repository ball.

      from  0c5aaa0   s/Conflicts: \(.*<<\)/Breaks: \1/ according to Debian Policy Manual section 7.4
       new  be10cf8   Mass commit of NMU changes of 1.4.2+20140406-1.1

The 1 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/ballview.menu                               |  2 +-
 debian/changelog                                   | 32 +++++-----
 debian/control                                     | 15 ++---
 debian/patches/0101-cmake-syntax.patch             |  4 --
 .../0102-fix-boost-compatibility-issue.patch       |  8 ++-
 ..._OPTIONS-CMake-macro-changed-in-CMake-2.8.patch |  6 +-
 debian/patches/HelpSipAmbiguity.patch              | 13 ++++
 debian/patches/findsip.patch                       | 70 ++++++++++++++++++++++
 debian/patches/gcc5.diff                           | 69 +++++++++++++++++++++
 debian/patches/link_against_x11.patch              | 18 ++++++
 .../{0104-nopsboxit.patch => nopsboxit.patch}      | 11 ++--
 debian/patches/series                              |  8 ++-
 debian/rules                                       |  7 +--
 13 files changed, 213 insertions(+), 50 deletions(-)
 create mode 100644 debian/patches/HelpSipAmbiguity.patch
 create mode 100644 debian/patches/findsip.patch
 create mode 100644 debian/patches/gcc5.diff
 create mode 100644 debian/patches/link_against_x11.patch
 copy debian/patches/{0104-nopsboxit.patch => nopsboxit.patch} (60%)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ball.git