Skip to content

Commit

Permalink
More changes from Review (copyright, postinst)
Browse files Browse the repository at this point in the history
  • Loading branch information
narc-Ontakac2 committed Mar 11, 2024
1 parent 15ae6f2 commit ad418c3
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 6 deletions.
40 changes: 35 additions & 5 deletions debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,19 @@ Copyright: Copyright 2011 Steffen Vogel <[email protected]>
Copyright (c) 2011, DAI-Labor, TU-Berlin
Copyright 2011 Fraunhofer ITWM
Copyright (c) 2015, 2018 Matthias Behr
Copyright (c) 2011 - 2023, The volkszaehler.org project
License: GPL-3
Copyright (c) 2011 - 2024, The volkszaehler.org project
License: GPL-3.0-or-later

Files: modules/GetGitRevisionDescription.cmake*
Copyright: Copyright Iowa State University 2009-2010.
License: BSL-1.0

Files: debian/*
Copyright: Copyright 2011 Steffen Vogel <[email protected]>
Copyright 2023 Joachim Zobel <[email protected]>
License: GPL-3
Copyright 2023 - 2024 Joachim Zobel <[email protected]>
License: GPL-3.0-or-later

License: GPL-3
License: GPL-3.0-or-later
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
Expand All @@ -34,3 +38,29 @@ License: GPL-3
License version 3 can be found in the file
`/usr/share/common-licenses/GPL-3'.

License:
Boost Software License - Version 1.0 - August 17th, 2003
.
Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:
.
The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.
.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.


4 changes: 3 additions & 1 deletion debian/vzlogger.postinst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ set -e

case "$1" in
configure)
if id vzlogger > /dev/null 2>&1 ; then
if id vzlogger > /dev/null 2>&1 \
&& dpkg --compare-versions $2 le-nl 0.8.3 \
&& dpkg --compare-versions $2 ge 0.8.2; then
# maintain compatibility with existing native installations
usermod -l _vzlogger vzlogger
groupmod --new-name _vzlogger vzlogger
Expand Down

0 comments on commit ad418c3

Please sign in to comment.