diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f838a5766..7c8114275b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed restart with deb or rpm installation ([#1222](https://github.com/scm-manager/scm-manager/issues/1222) and [#1227](https://github.com/scm-manager/scm-manager/pull/1227)) - Fixed broken migration with empty security.xml ([#1219](https://github.com/scm-manager/scm-manager/issues/1219) and [#1221](https://github.com/scm-manager/scm-manager/pull/1221)) - Added missing architecture to debian installation documentation ([#1230](https://github.com/scm-manager/scm-manager/pull/1230)) +- Fixed wrong package information for deb and rpm packages ([#1229](https://github.com/scm-manager/scm-manager/pull/1229)) ## [2.1.1] - 2020-06-23 diff --git a/README.md b/README.md index 0a7fd405e6..4386fbe026 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@

The easiest way to share and manage your Git, Mercurial and Subversion -repositories over http. +repositories. - Very easy installation - No need to hack configuration files, SCM-Manager is completely diff --git a/pom.xml b/pom.xml index db981176f6..e2a51b1a4d 100644 --- a/pom.xml +++ b/pom.xml @@ -35,12 +35,17 @@ 2.2.0-SNAPSHOT The easiest way to share your Git, Mercurial - and Subversion repositories over http. + and Subversion repositories. scm https://github.com/scm-manager/scm-manager + + Cloudogu GmbH + https://cloudogu.com + + MIT License @@ -50,9 +55,33 @@ - sdorra + sebastian.sdorra Sebastian Sdorra - s.sdorra@gmail.com + sebastian.sdorra@cloudogu.com + Europe/Berlin + + + rene.pfeuffer + Rene Pfeufer + rene.pfeuffer@cloudogu.com + Europe/Berlin + + + eduard.heimbuch + Eduard Heimbuch + eduard.heimbuch@cloudogu.com + Europe/Berlin + + + florian.scholdei + Florian Scholdei + florian.scholdei@cloudogu.com + Europe/Berlin + + + Konstantin Schaper + Konstantin Schaper + konstantin.schaper@cloudogu.com Europe/Berlin diff --git a/scm-packaging/deb/pom.xml b/scm-packaging/deb/pom.xml index 960225020e..a4f3a2e11e 100644 --- a/scm-packaging/deb/pom.xml +++ b/scm-packaging/deb/pom.xml @@ -133,7 +133,6 @@ - file src/main/fs/etc/scm/logging.xml diff --git a/scm-packaging/deb/src/main/deb/control/control b/scm-packaging/deb/src/main/deb/control/control index 06a721b7ff..29926baf5b 100644 --- a/scm-packaging/deb/src/main/deb/control/control +++ b/scm-packaging/deb/src/main/deb/control/control @@ -3,7 +3,8 @@ Version: [[version]] Section: devel Priority: extra Architecture: all -Description: The easiest way to share and manage your Git, Mercurial and Subversion repositories over http -Maintainer: Sebastian Sdorra +Description: The easiest way to share and manage your Git, Mercurial and Subversion repositories +Maintainer: SCM-Team +Homepage: https://scm-manager.org Depends: adduser, procps, psmisc, net-tools Recommends: openjdk-11-jre-headless, mercurial diff --git a/scm-packaging/rpm/pom.xml b/scm-packaging/rpm/pom.xml index 6fa1dff083..9d4c7d9ed1 100644 --- a/scm-packaging/rpm/pom.xml +++ b/scm-packaging/rpm/pom.xml @@ -41,6 +41,12 @@ Packaging for RedHat/Centos/Fedora rpm + + https://scm-manager.org + @@ -103,6 +109,8 @@ true scm-server + SCM-Manager Server + The easiest way to share and manage your Git, Mercurial and Subversion repositories Development/Tools MIT true @@ -278,7 +286,6 @@ - org.apache.maven.plugins maven-deploy-plugin