Replace fixed debian changelog with generated one

Eliminates manual processing and possibility of divergence. Prevents
a repeat of #373.

Replaces the _master from pre-releases with ~master which should mean
that an official release will upgrade over builds from an earlier git
tree.

diff --git a/.gitignore b/.gitignore
index d3ae3ba614e9bb2d9103a377d812766c80f7eb39..d8ff3f3872baa45dd4c9107dbb9a02a2868e234d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -74,3 +74,5 @@ CMakeFiles/
 cmake_install.cmake
 
 .jetbrains*
+
+contrib/debian/changelog

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 5eef884709c10a28073a6d7e7f9574cf36332a15..19e5df77fbb64a6ffb17be80a066f955dcdd2ffe 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -21,3 +21,9 @@ dist_noinst_DATA = \
 dist_noinst_SCRIPTS = \
        debian/netdata.init \
        $(NULL)
+
+debian/changelog:
+       echo "netdata ($(PACKAGE_VERSION)) UNRELEASED; urgency=medium" | \
+               tr '_' '~' > $@
+       echo "  * Latest release" >> $@
+       echo " -- Netdata Team <>  `date -R`" >> $@

diff --git a/contrib/debian/changelog b/contrib/debian/changelog
deleted file mode 100644 (file)
index acb68bf..0000000
--- a/contrib/debian/changelog
+++ /dev/null
@@ -1,41 +0,0 @@
-netdata (1.1.0) UNRELEASED; urgency=medium
-
-  * Data collection
-    - added IPv6 monitoring
-    - added SYNPROXY DDoS protection monitoring
-    - apps.plugin: added charts for users and user groups
-    - apps.plugin: grouping of processes now support patterns
-    - apps.plugin: now it is faster, after the new features added
-    - apps.plugin: error log flood protection
-    - better auto-detection of partitions for disk monitoring
-    - better fireqos intergation for QoS monitoring
-    - squid monitoring now uses squidclient
-    - SNMP monitoring now supports 64bit counters
-
-  * API
-    - fixed issues in CSV output generation
-    - netdata can now be restricted to listen on a specific IP
-
-  * Core
-    - error log flood protection
-
-  * Dashboard
-    - better error handling when the netdata server is unreachable
-    - each chart now has a toolbox
-    - on-line help support
-    - check for netdata updates button
-    - added example /tv.html dashboard
-
-  * Packaging
-    - now compiles with musl libc (alpine linux)
-    - added debian packaging
-    - support non-root installations
-    - the installer generates uninstall script
-
- -- Costa Tsaousis <costa@tsaousis.gr>  Fri, 20 Apr 2016 00:00:00 +0000
-
-netdata (1.0.0) UNRELEASED; urgency=medium
-
-  * Initial release.
-
- -- Matthew Newton <mcn4@leicester.ac.uk>  Fri, 01 Apr 2016 17:24:11 +0100