Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop

2020-10-14 18:30:13 +02:00 · 2020-09-20 21:33:15 +02:00 · 2020-09-19 10:33:34 +02:00 · 2020-09-19 09:20:04 +02:00 · 2020-09-16 17:38:04 +02:00 · 2020-09-16 10:39:37 +02:00
4 changed files with 10 additions and 7 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,5 +0,0 @@
 risotto (0.1) unstable; urgency=low
  * first version
 -- Cadoles <contact@cadoles.com>  Fri, 20 Mar 2020 15:18:25 +0100
--- a/debian/control
+++ b/debian/control
@ -2,13 +2,19 @@ Source: risotto
 Section: admin
 Priority: extra
 Maintainer: Cadoles <contact@cadoles.com>
-Build-depends: debhelper (>=11), python3-all, python3-setuptools
+Build-depends: debhelper (>=11), python3-all, python3-setuptools, dh-python
 Standards-Version: 3.9.4
 Homepage: https://forge.cadoles.com/Infra/risotto
 Package: python3-risotto
 Architecture: any
 Pre-Depends: dpkg, python3, ${misc:Pre-Depends}
 Depends: ${python:Depends}, ${misc:Depends}, python3-asyncpg, python3-rougail, python3-aiohttp
 Description: configuration manager libraries
 Package: risotto
 Architecture: any
 Pre-Depends: dpkg, python3, ${misc:Pre-Depends}
-Depends: ${python:Depends}, ${misc:Depends}
+Depends: ${python:Depends}, ${misc:Depends}, python3-risotto
 Description: configuration manager
--- a/debian/risotto.install
+++ b/debian/risotto.install
@ -0,0 +1,2 @@
 script/risotto-server usr/bin/
 sql/risotto.sql usr/share/eole/db/eole-risotto/gen/
--- a/script/risotto-server
+++ b/script/risotto-server
Author	SHA1	Message	Date
Emmanuel Garette	941261c830	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-10-14 18:30:13 +02:00
Emmanuel Garette	98c77bf719	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-09-20 21:33:15 +02:00
Emmanuel Garette	1b9d87fa53	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-09-19 10:33:34 +02:00
Emmanuel Garette	0e988d7040	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-09-19 09:20:04 +02:00
Emmanuel Garette	be97d757d9	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-09-16 17:38:04 +02:00
Benjamin Bohard	19d90fd9bc	Delete changelog	2020-09-16 10:39:37 +02:00
Emmanuel Garette	5653de1e99	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-09-16 08:16:33 +02:00
Emmanuel Garette	399bfb9ab6	add sql in risotto package	2020-09-06 09:47:14 +02:00
Emmanuel Garette	234b82b459	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-08-12 15:09:49 +02:00
Emmanuel Garette	c9e0bcbbfe	update dependencies	2020-08-12 15:09:20 +02:00
Emmanuel Garette	47e4976f54	install python3-risotto	2020-08-12 11:09:45 +02:00
Emmanuel Garette	dd33ea5b8f	add dh-python build dependency	2020-08-12 10:59:26 +02:00
Emmanuel Garette	689df4ec23	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-08-12 10:48:59 +02:00
Emmanuel Garette	223fb9aaf3	separate risotto and python3-risotto package	2020-08-12 10:48:12 +02:00
Emmanuel Garette	bed27a1e58	separate risotto and python3-risotto package	2020-08-12 10:44:59 +02:00
Emmanuel Garette	40eff91684	ajout de la dependance vers asyncpg	2020-08-12 08:41:15 +02:00
		`@ -0,0 +1,2 @@`
							`script/risotto-server usr/bin/`
							`sql/risotto.sql usr/share/eole/db/eole-risotto/gen/`