From 1f061266e28949fbcd7fb222bf0232a0b719392b Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 1 Jul 2020 06:51:51 +0200
Subject: [PATCH] update project metadata in order to fix deb and rpm package
 information

---
 CHANGELOG.md                                  |  1 +
 README.md                                     |  2 +-
 pom.xml                                       | 35 +++++++++++++++++--
 scm-packaging/deb/pom.xml                     |  1 -
 .../deb/src/main/deb/control/control          |  5 +--
 scm-packaging/rpm/pom.xml                     |  9 ++++-
 6 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7eb88e6c62..6adb74d02b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed installation of debian packages on distros without preinstalled `at` ([#1216](https://github.com/scm-manager/scm-manager/issues/1216) and [#1217](https://github.com/scm-manager/scm-manager/pull/1217))
 - 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
 ### Fixed
diff --git a/README.md b/README.md
index 0a7fd405e6..4386fbe026 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 </p>
 
 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 @@
   <version>2.2.0-SNAPSHOT</version>
   <description>
     The easiest way to share your Git, Mercurial
-    and Subversion repositories over http.
+    and Subversion repositories.
   </description>
   <name>scm</name>
 
   <url>https://github.com/scm-manager/scm-manager</url>
 
+  <organization>
+    <name>Cloudogu GmbH</name>
+    <url>https://cloudogu.com</url>
+  </organization>
+
   <licenses>
     <license>
       <name>MIT License</name>
@@ -50,9 +55,33 @@
 
   <developers>
     <developer>
-      <id>sdorra</id>
+      <id>sebastian.sdorra</id>
       <name>Sebastian Sdorra</name>
-      <email>s.sdorra@gmail.com</email>
+      <email>sebastian.sdorra@cloudogu.com</email>
+      <timezone>Europe/Berlin</timezone>
+    </developer>
+    <developer>
+      <id>rene.pfeuffer</id>
+      <name>Rene Pfeufer</name>
+      <email>rene.pfeuffer@cloudogu.com</email>
+      <timezone>Europe/Berlin</timezone>
+    </developer>
+    <developer>
+      <id>eduard.heimbuch</id>
+      <name>Eduard Heimbuch</name>
+      <email>eduard.heimbuch@cloudogu.com</email>
+      <timezone>Europe/Berlin</timezone>
+    </developer>
+    <developer>
+      <id>florian.scholdei</id>
+      <name>Florian Scholdei</name>
+      <email>florian.scholdei@cloudogu.com</email>
+      <timezone>Europe/Berlin</timezone>
+    </developer>
+    <developer>
+      <id>Konstantin Schaper</id>
+      <name>Konstantin Schaper</name>
+      <email>konstantin.schaper@cloudogu.com</email>
       <timezone>Europe/Berlin</timezone>
     </developer>
   </developers>
diff --git a/scm-packaging/deb/pom.xml b/scm-packaging/deb/pom.xml
index 7a3d0c9b47..81da36a3fc 100644
--- a/scm-packaging/deb/pom.xml
+++ b/scm-packaging/deb/pom.xml
@@ -157,7 +157,6 @@
               </mapper>
             </data>
 
-
             <data>
               <type>file</type>
               <src>src/main/fs/etc/scm/logging.xml</src>
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 <sebastian.sdorra@cloudogu.com>
+Description: The easiest way to share and manage your Git, Mercurial and Subversion repositories
+Maintainer: SCM-Team <scm-team@cloudogu.com>
+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 fa5743c9c5..86ed0c29ff 100644
--- a/scm-packaging/rpm/pom.xml
+++ b/scm-packaging/rpm/pom.xml
@@ -41,6 +41,12 @@
   <description>Packaging for RedHat/Centos/Fedora</description>
   <name>rpm</name>
 
+  <!--
+  de.dentrassi.maven:rpm
+  has no other way to set the url of the package
+  -->
+  <url>https://scm-manager.org</url>
+
   <dependencies>
 
     <dependency>
@@ -127,6 +133,8 @@
         <configuration>
           <attach>true</attach>
           <packageName>scm-server</packageName>
+          <summary>SCM-Manager Server</summary>
+          <description>The easiest way to share and manage your Git, Mercurial and Subversion repositories</description>
           <group>Development/Tools</group>
           <license>MIT</license>
           <skipSigning>true</skipSigning>
@@ -319,7 +327,6 @@
         </configuration>
       </plugin>
 
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>