Merge branch 'master' into dist/eole/2.7.2/master

Git package is not called git-core anymore
2021-03-01 11:56:26 +01:00 · 2021-03-01 11:56:14 +01:00 · 2021-03-01 11:08:55 +01:00
2 changed files with 2 additions and 2 deletions
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: https://forge.cadoles.com/Cadoles/eole-redis
 Package: eole-gitea
 Architecture: all
-Depends: ${misc:Depends}, git-core, eole-db, eole-mysql
+Depends: ${misc:Depends}, git, eole-db, eole-mysql
 Description: Dictionnaires et templates pour la configuration d'un serveur Gitea, testée uniquement avec eolebase
 .
 Pour toute information complémentaire, veuillez vous rendre sur la forge Cadoles.
--- a/dicos/50_gitea.xml
+++ b/dicos/50_gitea.xml
@@ -12,7 +12,7 @@
    <containers>
        <container name='forge' id='101'>
            <package>apt-transport-https</package>
-            <package>git-core</package>
+            <package>git</package>
            <file filelist='gitea' name='/etc/gitea/conf/app.ini' source='gitea.conf' mkdir='True' rm='True' mode='770' owner='root' group='gitservice'/>
            <service servicelist='gitea'>forge</service>
            <service_access service='gitea_without_nginx'>
Author	SHA1	Message	Date
Philippe Caseiro	cdd9de9c28	Merge branch 'master' into dist/eole/2.7.2/master	2021-03-01 11:56:26 +01:00
Philippe Caseiro	ad3a51f33a	Git package is not called git-core anymore	2021-03-01 11:56:14 +01:00
Philippe Caseiro	4fc27c40d8	Git package is not called git-core anymore	2021-03-01 11:08:55 +01:00