Merge branch 'dev' into 'master'

Fix Debian build process

See merge request s3lph/icalendar-timeseries-server!6

.gitlab-ci.yml

@@ -50,7 +50,24 @@ build_debian:
   - sed -re 's/file-magic/python-magic/' -i setup.py
   - echo -n > package/debian/icalendar-timeseries-server/usr/share/doc/icalendar-timeseries-server/changelog
   - |
-    for version in "$(cat CHANGELOG.md | grep '<!-- BEGIN CHANGES' | cut -d ' ' -f 4)"; do
+    cat > package/debian/icalendar-timeseries-server/DEBIAN/control <<EOF
+    Package: icalendar-timeseries-server
+    Version: ${ITS_VERSION}
+    Maintainer: ${PACKAGE_AUTHOR}
+    Section: web
+    Priority: optional
+    Architecture: all
+    Depends: python3 (>= 3.7), python3-jinja2, python3-bottle, python3-dateutil, python3-icalendar, python3-isodate, python3-tz
+    Description: Scrape iCalendar endpoints and present their data in a
+     timeseries format.  A small service that scrapes iCalendar files
+     served over HTTP, parses their contents and returns a timeseries
+     format compatible to the /api/v1/query API endpoint of a Prometheus
+     server. This allows e.g. a Grafana administrator to add a Prometheus
+     data source pointing at this server, returning the events in the
+     calendars in the event metric.
+    EOF
+  - |
+    for version in $(cat CHANGELOG.md | grep '<!-- BEGIN CHANGES' | cut -d ' ' -f 4); do
       echo "icalendar-timeseries-server (${version}-1); urgency=medium\n" >> package/debian/icalendar-timeseries-server/usr/share/doc/icalendar-timeseries-server/changelog
       cat CHANGELOG.md | grep -A 1000 "<"'!'"-- BEGIN CHANGES ${version} -->" | grep -B 1000 "<"'!'"-- END CHANGES ${version} -->" | tail -n +2 | head -n -1 | sed -re 's/^-/  */g' >> package/debian/icalendar-timeseries-server/usr/share/doc/icalendar-timeseries-server/changelog
       echo "\n -- ${PACKAGE_AUTHOR}  $(date -R)\n" >> package/debian/icalendar-timeseries-server/usr/share/doc/icalendar-timeseries-server/changelog

CHANGELOG.md

@@ -1,6 +1,18 @@
 # iCalendar Timeseries Server Changelog
 
 
+<!-- BEGIN RELEASE v0.3.2 -->
+## Version 0.3.2
+
+### Changes
+
+<!-- BEGIN CHANGES 0.3.2 -->
+- Fix Debian package build process
+<!-- END CHANGES 0.3.2 -->
+
+<!-- END RELEASE v0.3.2 -->
+
+
 <!-- BEGIN RELEASE v0.3.1 -->
 ## Version 0.3.1
 

icalendar_timeseries_server/__init__.py

@@ -1,2 +1,2 @@
 
-__version__ = '0.3.1'
+__version__ = '0.3.2'

package/debian/icalendar-timeseries-server/DEBIAN/control

@@ -1,14 +0,0 @@
-Package: icalendar-timeseries-server
-Version: 0.1
-Maintainer: s3lph <account-gitlab-ideynizv@kernelpanic.lol>
-Section: web
-Priority: optional
-Architecture: all
-Depends: python3 (>= 3.7), python3-jinja2, python3-bottle, python3-dateutil, python3-icalendar, python3-isodate, python3-tz
-Description: Scrape iCalendar endpoints and present their data in a
- timeseries format.  A small service that scrapes iCalendar files
- served over HTTP, parses their contents and returns a timeseries
- format compatible to the /api/v1/query API endpoint of a Prometheus
- server. This allows e.g. a Grafana administrator to add a Prometheus
- data source pointing at this server, returning the events in the
- calendars in the event metric.