Merge branch 'devel' and generate version 2.10

build-deb.sh

@@ -68,6 +68,9 @@ cp ${RPIMONITOR_SRC}/rpimonitor/rpimonitord usr/bin
 cp -a ${RPIMONITOR_SRC}/rpimonitor/web/ usr/share/rpimonitor
 cp -a ${RPIMONITOR_SRC}/scripts/ usr/share/rpimonitor
 cp ${RPIMONITOR_SRC}/rpimonitor/updatestatus.txt var/lib/rpimonitor
+pushd usr/share/rpimonitor/web
+  ln -s /var/lib/rpimonitor/stat stat
+popd
 
 echo
 echo -e "\033[1mPost processing\033[0m"

debian/changelog

@@ -1,8 +1,18 @@
+rpimonitor (2.10-1) UNRELEASED; urgency=low
+
+  * Use only data.conf and daemon.conf to avoid duplicate statistics + status when .conf placed in /etc/rpimonitor (Fix issue # 68 )
+  * Add addons allowing to create custom pages (Enhancement issue #27 #28 #47)
+  * Add suport of UTF-8 (Fix issue #43)
+  * Add BananaPi configuration from tkaiser (http://forum.lemaker.org/forum.php?mod=viewthread&tid=8137)
+  * Add mysql status in services.conf example file
+
+ -- Xavier Berger <berger.xavier@gmail.com>  {DATE}
+
 rpimonitor (2.9.1-1) UNRELEASED; urgency=low
 
  * Fix issue #63 - Multiple pages index not correctly managed
 
- -- Xavier Berger <berger.xavier@gmail.com>  {DATE}
+ -- Xavier Berger <berger.xavier@gmail.com>  Sat Oct 18 11:29:44 CEST 2014
 
 rpimonitor (2.9-1) UNRELEASED; urgency=low
 

repo/Packages

@@ -1,13 +1,13 @@
 Package: rpimonitor
-Version: 2.9.1-1
+Version: 2.10-1
 Architecture: all
 Maintainer: Xavier Berger <berger.xavier@gmail.com>
 Depends: perl, librrds-perl, libhttp-daemon-perl (>= 6.0.0) | libwww-perl (<< 6.0.0), libjson-perl, libipc-sharelite-perl, libfile-which-perl, aptitude
-Filename: XavierBerger/RPi-Monitor-deb/raw/master/repo/rpimonitor_2.9.1-1_all.deb
-Size: 444410
-MD5sum: ab7caf23af3d24fc36ffe9879058f973
-SHA1: 7c402e234d75323aa8f806f71521b0e3b89c5463
-SHA256: 1e351a87d8ed6775fc22fa053f9706ed1ab7006f2f8fda621825bb3d28714491
+Filename: XavierBerger/RPi-Monitor-deb/raw/master/repo/rpimonitor_2.10-1_all.deb
+Size: 453386
+MD5sum: b9c451ee34ebccc42b572ef72e77050a
+SHA1: f382b0f9f82a39dbe463af1356cfd58b2f717e7b
+SHA256: 8a4f0a8aba56983a848d3e6c4b396a50baaf8757f0fac57464ad6ee738448a3f
 Section: misc
 Description: RPi-Monitor is a self monitoring application designed to run on Raspberry Pi.
 

repo/Release

@@ -1,24 +1,24 @@
 Architectures: amd64 i386 armhf source any all
 Codename: XavierBerger/RPi-Monitor-deb/raw/master/repo
 Components: main
-Date: Sat, 18 Oct 2014 09:29:48 UTC
+Date: Tue, 06 Jan 2015 17:59:54 UTC
 Description: RPi-Monitor Debian package repository.
 Label: XavierBerger
 Origin: XavierBerger
 Suite: custom
 MD5Sum:
- 6ccaac3b57a7ba1f5e1210134130b13c              621 Packages
- 9c1b33f005fedd53a68e8f4e574a051a              441 Packages.gz
+ 91dae397bbcd879e54772b300259479f              619 Packages
+ c176ee8a9646f665053f5e2fe3140f26              442 Packages.gz
  d41d8cd98f00b204e9800998ecf8427e                0 Release
 SHA1:
- d207044300d5ff89f0cb83dffbe204e2c70b1e27              621 Packages
- 93c1f5082313a9940a7f90eebf1cc16baf822cd1              441 Packages.gz
+ 8cedac5850d148de4ade84c5d22a72353adeaadf              619 Packages
+ 0cd8565eaede5942dc82ce52217be6d3396b2e24              442 Packages.gz
  da39a3ee5e6b4b0d3255bfef95601890afd80709                0 Release
 SHA256:
- c98950a471de3a717915063d69c36bdfb26f8a10032f0f0d3183472f87092be2              621 Packages
- f137aa4fdce341c525e21972bbe705c8d5f95ecf542201465200ce0896216210              441 Packages.gz
+ be6e3656804fef70eb40fa883854201b304645609b30f882bd6ad101d79fc1ef              619 Packages
+ 1306710ce600be2d8a281e6d3500333f1730b0a46108b36a035e312cc5461e7c              442 Packages.gz
  e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855                0 Release
 SHA512:
- e08b43e25ed822dc09ed29c6c4fc4e415735e2fa0f8ee8deb4b48e2a3c03a8d2d3dd32a6bcf07055d7800594d17920b67268f9b7920a665ffaf8b1662b6c0716              621 Packages
- f04af1a4ddb4d3ba4f369f0a3c140ec38bd3309e7fb3cd5f0ed0d9c84d14866ed5e2f3d6cdb127e4b42ad26d1860b0daa7238f99328d601f36e9d1ddddc6c17d              441 Packages.gz
+ 77d2783b317abb86f24711dbd4ebd31726e4dcbbed6b4871fbc69b252c98cd09026d7b1cd5880ba9deb40e5a969b612993afd48896932c2083bdc75f37a8adae              619 Packages
+ 08c583b6fb02d958ffa191b3b8f249fac176b7ce5e4bbfa7c05bd7b82dd447235c7aaa3faf2f3d3a1dcc9b819d563f4a89fb7bd30507207dbddd254f84116f92              442 Packages.gz
  cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e                0 Release

repo/Release.gpg

@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
-iQEcBAABAgAGBQJUQjMMAAoJEOTjYt4sDTwPOK4H/iiAWy3tkBaHnIRaeK9YR8fD
-pl1CUiXGexynWrZHZzRz/t4h2uMJPLIv42xT2UlXhThKAV4uryU9IwBazWNjBvnZ
-Rhz6ngVKlGno2cfQAAVYL92T04XUh7cYX7PBgkABfWfXRPIyXK7Emjvr0quaQe9k
-vlWXZfiC3oW7xzzrwzWdHSg+O7VBCmHrF8vUb3qnZlAMWsKYM6nNSb1wGP/oCgdX
-RuE6U0vNlraGxr5K0eGRiYeeO3hZMF8d8q8h/9I4pBEhNMrzvjfqfjoQegISFqtH
-DJRyHOHzBoBNASrWkq8Wc8Uas3PusUD9DYeyOU7/1KOe+HQ5hgWLogfuxhh/+eQ=
-=x0hS
+iQEcBAABAgAGBQJUrCKaAAoJEOTjYt4sDTwP2OMH+gJC/OJakdPbeFxdcer29w3f
+SVxEu+CK6nZ+akL+jaBuieIaDtZZDNXaIRyrO6W7XH4JoE/v8ot9I7aEgPnHWAtP
+Xpe3+sOGrFjSgiiO4sNLKSL0YwLtDgEYr5RVzJmp5fHC7Q+StV/fgP7A7te7RI4B
+kSw86mSMvIBBbsFJCuQB0MDdvS3auD4viiWG+WGh//PZwuIOPB1y3pYX6VUeH4uN
+DTEY5I8QOvn9aWhQqRVjx3vQtE9DOC6nhPZZsTRSFRoqrWPTxcvjtjOlintkkNeE
+geI3pqXGoKa+LR4ZYBIvEg2lCCvnWaFTg6LXX+SiMc4Lx9I+4uvTJ0DpTU/ASok=
+=EvTg
 -----END PGP SIGNATURE-----

repo/apt-release.conf

@@ -0,0 +1,7 @@
+APT::FTPArchive::Release::Origin "XavierBerger";
+APT::FTPArchive::Release::Label "XavierBerger";
+APT::FTPArchive::Release::Suite "custom";
+APT::FTPArchive::Release::Codename "XavierBerger/RPi-Monitor-deb/raw/master/repo";
+APT::FTPArchive::Release::Architectures "amd64 i386 armhf source any all";
+APT::FTPArchive::Release::Components "main";
+APT::FTPArchive::Release::Description "RPi-Monitor Debian package repository.";