Skip to content

Commit

Permalink
Fix div rpm and debian problems
Browse files Browse the repository at this point in the history
  • Loading branch information
rafaelma committed Nov 30, 2016
1 parent a372b83 commit b896b2e
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 10 deletions.
5 changes: 5 additions & 0 deletions deb/changelog
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
zabbix-cli (1.6.0-1) unstable; urgency=low

* Initial upload to Debian (Closes: #842337):

-- Petter Reinholdtsen <[email protected]> Mon, 17 Oct 2016 11:41:24 +0000
File renamed without changes.
2 changes: 1 addition & 1 deletion debian/control → deb/control
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Maintainer: Petter Reinholdtsen <[email protected]>
Build-Depends: debhelper (>= 9~)
, python | python-all | python-dev | python-all-dev
, python-setuptools
Standards-Version: 3.9.8
Standards-Version: 3.9.6
Homepage: https://github.com/usit-gd/zabbix-cli
Vcs-Browser: https://github.com/usit-gd/zabbix-cli
Vcs-Git: https://github.com/usit-gd/zabbix-cli
Expand Down
21 changes: 20 additions & 1 deletion debian/copyright → deb/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ License: BSD-3-Clause

Files: zabbix_cli/pyzabbix.py
Copyright: 2016 Luke Cyca <[email protected]>
License: LGPL 2.1
License: LGPL-2.1

License: GPL-3.0+
This package is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -55,3 +55,22 @@ License: BSD-3-Clause
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

License: LGPL-2.1
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
.
This library 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
Lesser General Public License for more details.
.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA
.
On Debian systems, the complete text of the GNU General Public
License version 3 can be found in "/usr/share/common-licenses/GPL-3".
File renamed without changes.
5 changes: 0 additions & 5 deletions debian/changelog

This file was deleted.

14 changes: 11 additions & 3 deletions rpm/zabbix-cli.spec
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,21 @@ mkdir -p %{buildroot}%{_defaultdocdir}/zabbix-cli-%{version}
%{python2_sitelib}/zabbix_cli/
%{_bindir}/zabbix-cli*
%dir %{_datadir}/zabbix-cli/
%dir %{_defaultdocdir}/zabbix-cli/
%dir %{_defaultdocdir}/zabbix-cli-%{version}
%{_datadir}/zabbix-cli/zabbix-cli.conf
%doc LICENSE docs/manual.rst

%changelog
* Tue Nov 22 2016 Rafael Martinez Guerrero <[email protected]> - 1.6.0-1
- New release
* Wed Nov 30 2016 Rafael Martinez Guerrero <[email protected]> - 1.6.0-1
- Add support for multilevel configuration [Issue: #8]
- Add new command to define maintenance definitions [Issue: #9]
- Add new command to remove maintenance definitions [Issue: #11]
- Add new command to show maintenance definitions [issue: #10]
- Add new command to show maintenance periods [Issue: #14]
- Add new command to show active zabbix-cli configuration parameters and configuration files [Issue: #13]
- Add RPM specs file
- Add DEBIAN files
- Bugfix: Fix zabbix-cli-init parameters parsing. We use the argparse module now.

* Sat Oct 29 2016 Volker Froehlich <[email protected]> - 1.5.4-5
- Match the actual license claimed in the code
Expand Down

0 comments on commit b896b2e

Please sign in to comment.