Merge branch 'release/1.11.1'

lueschem · Sep 16, 2022 · 8177f92 · 8177f92
2 parents e9a5c12 + f69c85f
commit 8177f92
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+edi (1.11.1) jammy; urgency=medium
+
+  [ Matthias Lüscher ]
+  * Added link to open source summit 2022 presentation.
+
+ -- Matthias Lüscher (Launchpad) <m.luescher@datacomm.ch>  Fri, 16 Sep 2022 17:32:06 +0200
+
 edi (1.11.0) jammy; urgency=medium
 
   [ Matthias Lüscher ]

diff --git a/docs/conf.py b/docs/conf.py
@@ -55,8 +55,8 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.11.0'
-release = '1.11.0'
+version = '1.11.1'
+release = '1.11.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/presentations.rst b/docs/presentations.rst
@@ -1,6 +1,17 @@
 Presentations
 =============
 
+Automating and Managing an IoT Fleet Using Git
+++++++++++++++++++++++++++++++++++++++++++++++
+
+Location: Open Source Summit Europe 2022, Dublin
+
+Date: 14. September 2022
+
+Slides: `AutomatingAndManagingAnIoTFleetUsingGit.pdf`_
+
+.. _AutomatingAndManagingAnIoTFleetUsingGit.pdf: https://www.get-edi.io/assets/pdfs/AutomatingAndManagingAnIoTFleetUsingGit.pdf
+
 Efficient Usage of Debian on Embedded Devices
 +++++++++++++++++++++++++++++++++++++++++++++
 

diff --git a/edi/lib/versionhelpers.py b/edi/lib/versionhelpers.py
@@ -26,7 +26,7 @@
 
 # The do_release script will update this version!
 # During launchpad debuild neither the git version nor the package version is available.
-edi_fallback_version = '1.11.0'
+edi_fallback_version = '1.11.1'
 
 
 def get_edi_version():

diff --git a/setup.py b/setup.py
@@ -38,7 +38,7 @@
 setup(
     name='edi',
 
-    version='1.11.0',
+    version='1.11.1',
 
     description='Embedded Development Infrastructure - edi',
     long_description=long_description,