From e944ec00b245b1aa232e8ddc9b159a48c80f6b6c Mon Sep 17 00:00:00 2001 From: matthewwall Date: Thu, 22 Sep 2016 20:31:41 -0400 Subject: [PATCH] update packaging for 3.6 release --- pkg/changelog.rpm | 2 ++ pkg/debian/changelog | 3 +++ pkg/debian/rules | 3 +++ pkg/weewx.spec.in | 3 +++ setup.py | 4 ++++ 5 files changed, 15 insertions(+) diff --git a/pkg/changelog.rpm b/pkg/changelog.rpm index 22902e1a..8f446f8a 100644 --- a/pkg/changelog.rpm +++ b/pkg/changelog.rpm @@ -1,3 +1,5 @@ +* Thu Sep 22 2016 Matthew Wall (weewx) - 3.6.0a1-1 +- new upstream release * Sun Mar 13 2016 Matthew Wall (weewx) - 3.5.0-1 - new upstream release * Sat Jan 16 2016 Matthew Wall (weewx) - 3.4.0-1 diff --git a/pkg/debian/changelog b/pkg/debian/changelog index 8ce6efc4..a188df10 100644 --- a/pkg/debian/changelog +++ b/pkg/debian/changelog @@ -1,3 +1,6 @@ +weewx (3.6.0a1-1) unstable; urgency=low + * new upstream release + -- Matthew Wall (weewx) Thu, 22 Sep 2016 20:29:30 -0400 weewx (3.5.0-1) unstable; urgency=low * new upstream release -- Matthew Wall (weewx) Sun, 13 Mar 2016 21:27:26 -0400 diff --git a/pkg/debian/rules b/pkg/debian/rules index 3b0055c7..6353baa2 100755 --- a/pkg/debian/rules +++ b/pkg/debian/rules @@ -40,9 +40,11 @@ install: build cp -r $(SRC)/docs/* $(DST_DOCDIR) cp -r $(SRC)/skins $(DST_CFGDIR) cp -r $(SRC)/util/apache $(DST_CFGDIR) + cp -r $(SRC)/util/import $(DST_CFGDIR) cp -r $(SRC)/util/logrotate.d $(DST_CFGDIR) cp -r $(SRC)/util/logwatch $(DST_CFGDIR) cp -r $(SRC)/util/rsyslog.d $(DST_CFGDIR) + cp -r $(SRC)/util/udev $(DST_CFGDIR) cp -r $(SRC)/extensions $(DST_BINDIR) # remove stuff that should not go out @@ -75,6 +77,7 @@ install: build ln -s ../share/weewx/wee_debug $(DST)/usr/bin/wee_debug ln -s ../share/weewx/wee_device $(DST)/usr/bin/wee_device ln -s ../share/weewx/wee_extension $(DST)/usr/bin/wee_extension + ln -s ../share/weewx/wee_import $(DST)/usr/bin/wee_import ln -s ../share/weewx/wee_reports $(DST)/usr/bin/wee_reports ln -s ../share/weewx/wunderfixer $(DST)/usr/bin/wunderfixer diff --git a/pkg/weewx.spec.in b/pkg/weewx.spec.in index 95c327c3..07c554d9 100644 --- a/pkg/weewx.spec.in +++ b/pkg/weewx.spec.in @@ -73,9 +73,11 @@ cp -r bin/* %{buildroot}%{dst_bin_dir} cp -r docs/* %{buildroot}%{dst_doc_dir} cp -r skins %{buildroot}%{dst_cfg_dir} cp -r util/apache %{buildroot}%{dst_cfg_dir} +cp -r util/import %{buildroot}%{dst_cfg_dir} cp -r util/logrotate.d %{buildroot}%{dst_cfg_dir} cp -r util/logwatch %{buildroot}%{dst_cfg_dir} cp -r util/rsyslog.d %{buildroot}%{dst_cfg_dir} +cp -r util/udev %{buildroot}%{dst_cfg_dir} cp -r extensions %{buildroot}%{dst_bin_dir} # remove stuff that should not go out @@ -108,6 +110,7 @@ ln -s ../share/weewx/wee_database %{buildroot}%{_bindir}/wee_database ln -s ../share/weewx/wee_debug %{buildroot}%{_bindir}/wee_debug ln -s ../share/weewx/wee_device %{buildroot}%{_bindir}/wee_device ln -s ../share/weewx/wee_extension %{buildroot}%{_bindir}/wee_extension +ln -s ../share/weewx/wee_import %{buildroot}%{_bindir}/wee_import ln -s ../share/weewx/wee_reports %{buildroot}%{_bindir}/wee_reports ln -s ../share/weewx/wunderfixer %{buildroot}%{_bindir}/wunderfixer diff --git a/setup.py b/setup.py index 8d5e30e2..336bce85 100755 --- a/setup.py +++ b/setup.py @@ -425,6 +425,7 @@ if __name__ == "__main__": 'user', 'weecfg', 'weedb', + 'weeimport', 'weeplot', 'weeutil', 'weewx', @@ -435,6 +436,7 @@ if __name__ == "__main__": 'bin/wee_debug', 'bin/wee_device', 'bin/wee_extension', + 'bin/wee_import', 'bin/wee_reports', 'bin/weewxd', 'bin/wunderfixer'], @@ -448,6 +450,8 @@ if __name__ == "__main__": 'docs/copyright.htm', 'docs/customizing.htm', 'docs/debian.htm', + 'docs/hardware.htm', + 'docs/macos.htm', 'docs/readme.htm', 'docs/redhat.htm', 'docs/setup.htm',