Debian 0.8.6 1 (#657)

Co-authored-by: r00t <[email protected]>
volkszaehler · May 18, 2024 · aeaa4c3 · aeaa4c3
1 parent 76c83fa
commit aeaa4c3
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 31 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ ENDIF()
 
 set(VZLOGGER_MAJOR_VERSION 0)
 set(VZLOGGER_MINOR_VERSION 8)
-set(VZLOGGER_SUB_VERSION 5)
+set(VZLOGGER_SUB_VERSION 6)
 set(VERSION_SEP "-")
 set(VZLOGGER_SHORT_VERSION "${VZLOGGER_MAJOR_VERSION}${VERSION_SEP}${VZLOGGER_MINOR_VERSION}")
 set(VZLOGGER_VERSION "${VZLOGGER_SHORT_VERSION}${VERSION_SEP}${VZLOGGER_SUB_VERSION}")

diff --git a/debian/changelog b/debian/changelog
@@ -1,11 +1,12 @@
-vzlogger (0.8.5-1) unstable; urgency=medium
+vzlogger (0.8.6-1) unstable; urgency=medium
 
   * New upstream release (Closes: #1070430)
   * Fixed passing of hardening flags to cmake 
   * Bumped Standards-Version to 4.7.0
-  * Fixed several Lintian ifo level issues 
+  * Fixed several Lintian info level issues
+  * Moved configuration change from git to quilt patch 
 
- -- Joachim Zobel <[email protected]>  Sat, 11 May 2024 13:40:14 +0200
+ -- Joachim Zobel <[email protected]>  Fri, 17 May 2024 06:32:32 +0200
 
 vzlogger (0.8.3-1) unstable; urgency=medium
 

diff --git a/debian/patches/just-works-conf b/debian/patches/just-works-conf
@@ -0,0 +1,43 @@
+--- a/etc/vzlogger.conf
++++ b/etc/vzlogger.conf
+@@ -29,9 +29,11 @@
+
+     // realtime notification settings
+     "push": [
++        /*
+         {
+             "url": "http://127.0.0.1:5582"  // notification destination, e.g. frontend push-server
+         }
++        */
+     ],
+
+     // mqtt client support (if ENABLE_MQTT set at cmake generation)
+@@ -154,6 +156,28 @@
+             }
+         },
+         {
++            /* A minimal example that "just works" on Debian.
++               The steps needed are:
++               1. Install influxdb: sudo apt install influxdb influxdb-client
++               2. Start the client by calling influx on the command line and
++               create db: CREATE DATABASE vzlogger
++               3. Set enabled to true in the configuration below
++             */
++            "enabled": false,               // disabled meters will be ignored
++            "allowskip": false,                  // errors when opening meter may be ignored if enabled
++
++            "protocol": "random",
++            "interval": 2,
++            "max": 40.0,                    // has to be double!
++            "min": -5.0,                    // has to be double!
++            "channel": {
++                "uuid": "25a53b28-75ec-4764-a8a6-68587722ddab",
++                // For details on the influxdb configuration see vzlogger.conf.InfluxDB
++                "api": "influxdb",
++                "host": "localhost:8086"
++            }
++        },
++        {
+             "enabled": false,               // disabled meters will be ignored
+             "allowskip": false,                  // errors when opening meter may be ignored if enabled
+
diff --git a/debian/patches/series b/debian/patches/series
@@ -0,0 +1 @@
+just-works-conf
diff --git a/debian/vzlogger.docs b/debian/vzlogger.docs
@@ -1 +1 @@
-README*.md
+README.*.md
diff --git a/debian/watch b/debian/watch
@@ -1,4 +1,2 @@
 version=4
-opts=filenamemangle=s/.+\/v?([\.\d]+)\.tar\.gz/vzlogger-$1\.tar\.gz/,\
-downloadurlmangle=s/archive\/refs\/tags\/v([\.\d]+)\.tar\.gz/releases\/download\/v$1\/vzlogger-$1\.tar\.gz/ \
-  https://github.com/volkszaehler/vzlogger/tags .*/v?([\.\d]+)\.tar\.gz
+https://github.com/volkszaehler/vzlogger/tags .*/v?(\d.*)@ARCHIVE_EXT@
diff --git a/etc/vzlogger.conf b/etc/vzlogger.conf
@@ -29,11 +29,9 @@
 
     // realtime notification settings
     "push": [
-        /*
         {
             "url": "http://127.0.0.1:5582"  // notification destination, e.g. frontend push-server
         }
-        */
     ],
 
     // mqtt client support (if ENABLE_MQTT set at cmake generation)
@@ -155,27 +153,6 @@
                 "middleware": "http://localhost/middleware.php"
             }
         },
-        {
-            /* A minimal example that "just works" on Debian. 
-               The steps needed are:
-               1. Install influxdb: sudo apt install influxdb influxdb-client
-               2. Start the client by calling influx on the command line and
-               create db: CREATE DATABASE vzlogger
-             */
-            "enabled": false,               // disabled meters will be ignored
-            "allowskip": false,                  // errors when opening meter may be ignored if enabled
-
-            "protocol": "random",
-            "interval": 2,
-            "max": 40.0,                    // has to be double!
-            "min": -5.0,                    // has to be double!
-            "channel": {
-                "uuid": "25a53b28-75ec-4764-a8a6-68587722ddab",
-                // For details on the influxdb configuration see vzlogger.conf.InfluxDB
-                "api": "influxdb",          
-                "host": "localhost:8086" 
-            }
-        },
         {
             "enabled": false,               // disabled meters will be ignored
             "allowskip": false,                  // errors when opening meter may be ignored if enabled