[Powerguru-commit] [SCM] powerguru branch, master, updated. d5a53b03b51e6031918f16b7f85e9c0f647f0f90

[Rob Savoye]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "powerguru".

The branch, master has been updated
       via  d5a53b03b51e6031918f16b7f85e9c0f647f0f90 (commit)
      from  980a5d65f08a093dcb24fb7b73cc16f02b9193a4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/powerguru.git/commit/?id=d5a53b03b51e6031918f16b7f85e9c0f647f0f90


commit d5a53b03b51e6031918f16b7f85e9c0f647f0f90
Author: Rob Savoye <address@hidden>
Date:   Sun Jan 13 10:31:12 2019 -0700

    Make work again, split off python files into seoarate package

diff --git a/debian/changelog b/debian/changelog
index 5ffdcc2..e368f48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
+powerguru (0.2) stable; urgency=low
+  * Refactored release.
+
+ -- Rob Savoye <address@hidden>  Sat,  12 Jan 2019 04:20:00 -0800
+
 powerguru (0.1) stable; urgency=low
   * Initial release.
 
- -- Rob Savoye <address@hidden>  Sat,  4 June 2005 04:20:00 -0800
-
+ -- Rob Savoye <address@hidden>  Sat,  4 Jun 2005 04:20:00 -0800
diff --git a/debian/control b/debian/control
index d3c3544..8d033fe 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,40 @@
 Source: powerguru
 Section: devel
 Priority: optional
-Maintainer: Rob Savoye <senecass.com>
+Maintainer: Rob Savoye <welcomehome.org>
 Standards-Version: 2.5.0.0
+Homepage: http://www.gnu.org/software/powerguru
+Build-Depends: autoconf, automake, libtool,
+              postgresql,
+              ow-shell,
+              owfs,
+              python-ow,
+              libow-dev,
+              libboost-dev,
+              libownet-dev,
+              libxml2-dev,
+              libsnmp-dev,
+              libboost-filesystem-dev,
+              libboost-system-dev,
+              libboost-regex-dev,
+              libboost-log-dev,
+              libboost-thread-dev,
+              libboost-program-options-dev
+
+#PI builds also need
+#wiringpi
 
 Package: powerguru
 Architecture: all
 Depends: dpkg (>=1.2.1)
 Description: A monitoring and control program for power devices.
        Powerguru is an program for monitoring, data logging, and controlling
-       your inverter, charger controller, or power meter.
+       your inverter, charger controller, or power meter. The current version
+       has been refocused to be use for IOT workshops.
 
+Package: pypowerguru
+Architecture: any
+Section: utils
+Priority: extra
+Description: Python version of this projects that mostly do the same thing as
+        as the C++ version.
diff --git a/debian/powerguru.install b/debian/powerguru.install
index 31ef420..285ccd9 100644
--- a/debian/powerguru.install
+++ b/debian/powerguru.install
@@ -1,2 +1,2 @@
-/usr/pgd/pgd
+/usr/bin/pgd
 /usr/bin/pguru
diff --git a/debian/pypowerguru.install b/debian/pypowerguru.install
index 10a9e84..856ba50 100644
--- a/debian/pypowerguru.install
+++ b/debian/pypowerguru.install
@@ -1,2 +1,3 @@
-/usr/pgd/pgd.py
-/usr/bin/pguru.py
+/usr/bin/pgd.py
+/usr/bin/mergedb.py
+/usr/bin/chart.py
diff --git a/debian/rules b/debian/rules
index 30b69f1..120c59e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,37 +1,39 @@
 #! /usr/bin/make -f
-#
-# Copyright 1994, 1995 by Ian Jackson.
-# I hereby give you perpetual unlimited permission to copy,
-# modify and relicense this file, provided that you do not remove
-# my name from the file itself.  (I assert my moral right of
-# paternity under the Copyright, Designs and Patents Act 1988.)
-# This file may have to be extensively modified
-# Copyright 1996 by Kevin Dalley.
 
-# To make the binary distribution package, the ``Debianized'' source package
-# and the context diff to the original package, type `./debian.rules dist'.
-# Make sure that `debian.rules' is executable before the final distribution
-# is made.
-#
-# Invoke each target with `./debian.rules <target>'.  All targets should be
-# invoked with the package root as the current directory.
-#
-# The `binary' target must be run as root, as it needs to install files with
-# specific ownerships.
+# 
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+#               2014, 2015, 2016, 2017, 2018, 2019
+#      Free Software Foundation, Inc.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 # The name of the package (for example, `emacs').
 package = powerguru
 
-CC = gcc
-CFLAGS = -O2 -Wall # sane warning options vary between programs
+CXXFLAGS = -O2 -Wall # sane warning options vary between programs
 LDFLAGS = # none
 
-
 build:
        $(checkdir)
-       ./configure --prefix=/usr
-       $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" all
-       $(MAKE) -C doc/C alldocs
+       ./autogen.sh
+       ./configure --prefix=/usr --with-devices=ownet \
+               --prefix=$(PWD)/debian/tmp/usr \
+                CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)"
+       $(MAKE) -j 4
+       $(MAKE) apidoc
+       $(MAKE) -C doc/C html
        touch build
 
 clean:
@@ -40,41 +42,32 @@ clean:
        -$(MAKE) -i distclean
        -rm -rf *~ debian/tmp debian/*~ debian/files*
        rm -f config.cache doc/config.log
+       touch clean
 
 #binary-indep: checkroot build
-binary-arch:   checkroot build
-       $(checkdir)
-       -rm -rf debian/tmp
-       install -d debian/tmp debian/tmp/DEBIAN
-       install -d debian/tmp/usr/doc/$(package)
-       install -d -g root -m 755 -o root debian/tmp/etc/$(package)
-       install debian/{postinst,preinst} debian/tmp/DEBIAN/.
-       cd $(package); $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" \
-         LDFLAGS="$(LDFLAGS)" \
-         prefix=`pwd`/debian/tmp/usr install
-       cd $(package); $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" \
-         LDFLAGS="$(LDFLAGS)" \
-         pkgdatadir=debian/tmp/usr/doc/$(package) install-doc
-#      gzip -9v debian/tmp/usr/man/man1/*
-#      install -d debian/tmp/usr/doc/$(package)/html/stylesheet-images
-       install -m 0644 doc/C/powerguru.pdf debian/tmp/usr/doc/$(package)
-       install -m 0644 doc/C/powerguru.html debian/tmp/usr/doc/$(package)
-       install -m 0644 debian/copyright debian/tmp/usr/doc/$(package)
-       install -m 0644 debian/changelog 
debian/tmp/usr/doc/$(package)/changelog.Debian
-       gzip -9v debian/tmp/usr/doc/$(package)/changelog.Debian
-       install -m 0644 ChangeLog debian/tmp/usr/doc/$(package)
-       gzip -9v debian/tmp/usr/doc/$(package)/ChangeLog
-       ln -s ChangeLog.gz debian/tmp/usr/doc/$(package)/changelog.gz
-       -cd example; $(MAKE) -i distclean
-#      (cd example; tar cf - . ) | \
-#              (cd debian/tmp/usr/doc/$(package)/examples; tar xf -)
-#      install debian/tmp/usr/doc/$(package)/examples
-       dpkg-gencontrol
-#      chown -R root.root debian/tmp
-#      chmod -R g-ws debian/tmp
-       dpkg --build debian/tmp ..
+binary-arch: install
+       dh_testdir
+       dh_testroot
+       dh_installchangelogs -XChangeLog
+       dh_installdocs
+       dh_installexamples
+       dh_install --sourcedir=$(CURDIR)/debian/tmp
+       dh_installman
+       dh_lintian
+       dh_link
+#      dh_strip --dbg-package=powerguru-dbg$(BUILD_DEBUG)
+       dh_compress
+       dh_fixperms
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
 
-# Below here is fairly generic really
+install: build
+       dh_testdir
+       dh_testroot
+       dh_installdirs
+       $(MAKE) install
+       $(MAKE) -C python install
 
 binary:                binary-arch
 

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog           |   8 +++-
 debian/control             |  31 ++++++++++++-
 debian/powerguru.install   |   2 +-
 debian/pypowerguru.install |   5 ++-
 debian/rules               | 105 +++++++++++++++++++++------------------------
 5 files changed, 88 insertions(+), 63 deletions(-)


hooks/post-receive
-- 
powerguru