diff options
| -rw-r--r-- | COPYING | 24 | ||||
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | dist/archlinux/stable/PKGBUILD | 4 | ||||
| -rw-r--r-- | src/plugins/lunar.py | 6 |
4 files changed, 32 insertions, 7 deletions
@@ -1,3 +1,9 @@ +This software is licensed partially in GNU General Public +License version 3 and partially in GNU Affero General Public +License version 3. + + + xpybar – xmobar replacement written in python Copyright © 2014 Mattias Andrée (maandree@member.fsf.org) @@ -14,3 +20,21 @@ 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, see <http://www.gnu.org/licenses/>. + + +xpybar – xmobar replacement written in python +Copyright © 2014 Mattias Andrée (maandree@member.fsf.org) + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero 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 Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. + @@ -60,7 +60,7 @@ install-command: bin/xpybar install -m755 $< -- "$(DESTDIR)$(BINDIR)/$(COMMAND)" .PHONY: install-license -install-license: COPYING LICENSE +install-license: COPYING LICENSE.gpl3 LICENSE.agpl3 install -dm755 -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)" install -m644 $^ -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)" @@ -88,7 +88,8 @@ install-plugins: $(foreach F,$(PLUGINS),src/plugins/$(F).py) uninstall: -rm -- "$(DESTDIR)$(BINDIR)/$(COMMAND)" -rm -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/COPYING" - -rm -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/LICENSE" + -rm -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/LICENSE.gpl3" + -rm -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/LICENSE.agpl3" -rmdir -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)" -rm -- $(foreach F,$(PLUGIN_EXAMPLES),"$(DESTDIR)$(DOCDIR)/$(PKGNAME)/examples/plugins/$(F)") -rmdir -- "$(DESTDIR)$(DOCDIR)/$(PKGNAME)/examples/plugins" diff --git a/dist/archlinux/stable/PKGBUILD b/dist/archlinux/stable/PKGBUILD index 8ab6e56..230e3ab 100644 --- a/dist/archlinux/stable/PKGBUILD +++ b/dist/archlinux/stable/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> pkgname=xpybar -pkgver=1.2 +pkgver=1.3 pkgrel=1 pkgdesc="A highly extensible minimalistic dock panel written in Python 3" arch=(any) url="https://github.com/maandree/xpybar" -license=('GPL3') +license=('GPL3' 'AGPL3') depends=(python3 argparser python3-xlib xorg-xrandr) optdepends=("linux: most of the monitors require Linux's procfs or sysfs") makedepends=(make coreutils sed zip) diff --git a/src/plugins/lunar.py b/src/plugins/lunar.py index 48443db..6a11efe 100644 --- a/src/plugins/lunar.py +++ b/src/plugins/lunar.py @@ -4,16 +4,16 @@ xpybar – xmobar replacement written in python Copyright © 2014 Mattias Andrée (maandree@member.fsf.org) 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 +it under the terms of the GNU Affero 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. +GNU Affero General Public License for more details. -You should have received a copy of the GNU General Public License +You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. ''' |