[grass] branch experimental updated (8c22ebd -> 30034ed)

[Sebastiaan Couwenberg]

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

sebastic pushed a change to branch experimental
in repository grass.

      from  8c22ebd   Update Conflicts for grass7 upstream packages.
       new  b32e548   Reinstate (x-)grass symlinks to (x-)grass70.
       new  30034ed   Also Conflict with upstream grass7-daily packages.

The 2 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           |  2 +-
 debian/control             | 15 ++++++++++-----
 debian/control.in          | 18 ++++++++++++------
 debian/grass-core.links    |  4 ++++
 debian/grass-core.links.in |  4 ++++
 5 files changed, 31 insertions(+), 12 deletions(-)

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