Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop
# By Sergio Fernández # Via Sergio Fernández * 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta: MARMOTTA-431: refined some details of the .deb package Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/da95d01c Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/da95d01c Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/da95d01c Branch: refs/heads/develop Commit: da95d01c6afa1f9d9538188e748bab1d12fafd8b Parents: 2ddae23 f7d7371 Author: Rupert Westenthaler <[email protected]> Authored: Wed Feb 19 09:05:21 2014 +0100 Committer: Rupert Westenthaler <[email protected]> Committed: Wed Feb 19 09:05:21 2014 +0100 ---------------------------------------------------------------------- launchers/marmotta-webapp/pom.xml | 14 ++++++++++++++ launchers/marmotta-webapp/src/deb/control/control | 8 ++++++-- launchers/marmotta-webapp/src/deb/control/postinst | 2 +- launchers/marmotta-webapp/src/deb/control/postrm | 4 +++- launchers/marmotta-webapp/src/deb/control/preinst | 2 +- launchers/marmotta-webapp/src/deb/control/prerm | 4 +++- launchers/marmotta-webapp/src/deb/pkg/README | 1 + launchers/marmotta-webapp/src/deb/pkg/changelog | 5 +++++ launchers/marmotta-webapp/src/deb/pkg/copyright | 8 ++++++++ 9 files changed, 42 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
