AzaToth has uploaded a new change for review. https://gerrit.wikimedia.org/r/68935
Change subject: Updating debian package files ...................................................................... Updating debian package files Updated license file, but generally this package cannot be used due to unlicensed files Change-Id: I470ce1c6b97d6e2319a7e77bd46b0ac27054366e --- M debian/adminbot.postinst M debian/adminbot.postrm M debian/compat M debian/control M debian/copyright A debian/docs M debian/install M debian/rules 8 files changed, 163 insertions(+), 144 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/adminbot refs/changes/35/68935/1 diff --git a/debian/adminbot.postinst b/debian/adminbot.postinst index eec579c..40fd379 100644 --- a/debian/adminbot.postinst +++ b/debian/adminbot.postinst @@ -1,38 +1,73 @@ #!/bin/sh +# postinst script for adminbot +# +# see: dh_installdeb(1) set -e -if ! getent group adminbot >/dev/null -then - echo Adding group: adminbot - addgroup --system adminbot -fi +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <postinst> `abort-remove' +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package -if ! getent passwd adminbot >/dev/null -then - echo Adding system user: adminbot - adduser --system --ingroup adminbot --home /var/lib/adminbot --shell /bin/false --no-create-home adminbot - usermod -c "Adminbot IRC logging sofware" adminbot -fi -if [ -d /var/lib/adminbot ] -then - chown -R adminbot:adminbot /var/lib/adminbot - chmod 750 /var/lib/adminbot -fi +case "$1" in + configure) + if ! getent group adminbot >/dev/null + then + echo Adding group: adminbot + addgroup --system adminbot + fi -if [ -d /etc/adminbot ] -then - chown -R root:adminbot /etc/adminbot - chmod -R 750 /etc/adminbot -fi + if ! getent passwd adminbot >/dev/null + then + echo Adding system user: adminbot + adduser --system --ingroup adminbot --home /var/lib/adminbot --shell /bin/false --no-create-home adminbot + usermod -c "Adminbot IRC logging sofware" adminbot + fi -if [ -d /usr/lib/adminbot ] -then - chown -R adminbot:adminbot /usr/lib/adminbot - chmod 755 /usr/lib/adminbot - chmod 755 /usr/lib/adminbot/adminlogbot.py - chmod 644 /usr/lib/adminbot/adminlog.py - chmod 644 /usr/lib/adminbot/statusnet.py - chmod 644 /usr/lib/adminbot/README -fi + if [ -d /var/lib/adminbot ] + then + chown -R adminbot:adminbot /var/lib/adminbot + chmod 750 /var/lib/adminbot + fi + + if [ -d /etc/adminbot ] + then + chown -R root:adminbot /etc/adminbot + chmod -R 750 /etc/adminbot + fi + + if [ -d /usr/lib/adminbot ] + then + chown -R adminbot:adminbot /usr/lib/adminbot + chmod 755 /usr/lib/adminbot + chmod 755 /usr/lib/adminbot/adminlogbot.py + chmod 644 /usr/lib/adminbot/adminlog.py + chmod 644 /usr/lib/adminbot/statusnet.py + chmod 644 /usr/lib/adminbot/README + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/adminbot.postrm b/debian/adminbot.postrm index 38af6b9..097a6c5 100644 --- a/debian/adminbot.postrm +++ b/debian/adminbot.postrm @@ -1,15 +1,48 @@ #!/bin/sh +# postrm script for adminbot +# +# see: dh_installdeb(1) -/usr/sbin/service adminbot stop +set -e -if getent passwd adminbot >/dev/null -then - echo "Removing user: adminbot" - deluser adminbot -fi +# summary of how this script can be called: +# * <postrm> `remove' +# * <postrm> `purge' +# * <old-postrm> `upgrade' <new-version> +# * <new-postrm> `failed-upgrade' <old-version> +# * <new-postrm> `abort-install' +# * <new-postrm> `abort-install' <old-version> +# * <new-postrm> `abort-upgrade' <old-version> +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package -if getent group adminbot >/dev/null -then - echo "Removing group: adminbot" - delgroup adminbot -fi + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + if getent passwd adminbot >/dev/null + then + echo "Removing user: adminbot" + deluser adminbot + fi + + if getent group adminbot >/dev/null + then + echo "Removing group: adminbot" + delgroup adminbot + fi + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/compat b/debian/compat index 1e8b314..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -6 +9 diff --git a/debian/control b/debian/control index d8c26a0..44d1b70 100644 --- a/debian/control +++ b/debian/control @@ -2,10 +2,11 @@ Section: net Priority: extra Maintainer: Ryan Lane <rl...@wikimedia.org> -Build-Depends: debhelper (>= 4) -Standards-Version: 1.0 +Build-Depends: debhelper (>= 9), python | python-all | python-dev | python-all-dev +Standards-Version: 3.9.3 Package: adminbot -Depends: python-irclib, python-mwclient +Pre-Depends: adduser +Depends: ${misc:Depends}, ${python:Depends}, python-irclib, python-mwclient, python-simplejson Architecture: all Description: Logging on command for IRC and Mediawiki Software diff --git a/debian/copyright b/debian/copyright index acca7f7..368bfce 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,24 +1,52 @@ -This package was debianized by Daniel Belin <dbe...@dbelin.net> on -Thu, 8 Dec 2011 06:53:28 +0000. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +License: GPL-3.0+ -It was downloaded from http://svn.wikimedia.org/viewvc/mediawiki/trunk/tools/ircecho +Files: * +Copyright: Andrew Bogott <abog...@wikimedia.org> + Antoine Musso <has...@free.fr> + Kunal Mehta <lego...@gmail.com> + Ori Livneh <o...@wikimedia.org> + Reedy <re...@wikimedia.org> + Ryan Lane <rl...@wikimedia.org> +License: GPL-3.0+ -Upstream Author(s): +Files: debian/* +Copyright: 2013 Carl Fürstenberg <azat...@gmail.com> + 2013 Andrew Bogott <abog...@wikimedia.org> + 2013 Reedy <re...@wikimedia.org> + 2013 Ryan Lane <rl...@wikimedia.org> +License: GPL-3.0+ - +Files: adminbot.py +Copyright: 2013 Kunal Mehta <lego...@gmail.com> + 2013 Reedy <re...@wikimedia.org> + 2012-2013 Andrew Bogott <abog...@wikimedia.org> + 2012-2013 Ryan Lane <rl...@wikimedia.org> +License: NOTNOW -Copyright: +Files: adminlog.py +Copyright: 2012-2013 Ryan Lane <rl...@wikimedia.org> + 2013 Andrew Bogott <abog...@wikimedia.org> + 2013 Ori Livneh <o...@wikimedia.org> +License: NOTNOW - Copyright (C) 2011 +License: GPL-3.0+ + 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 package 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, see <http://www.gnu.org/licenses/>. + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -License: +License: NOTNOW + Not licensed for any use for now - Unlicensed for adminlogbot.py and adminlog.py (for now) - GPL3 for statusnet.py - -The Debian packaging is: - - Copyright (C) 2011 Daniel Belin <dbe...@dbelin.net> - -and is licensed under the GPL version 2, -see `/usr/share/common-licenses/GPL-2'. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..e845566 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README diff --git a/debian/install b/debian/install index 0d88b84..5cd1147 100644 --- a/debian/install +++ b/debian/install @@ -1,5 +1,4 @@ adminlogbot.py /usr/lib/adminbot adminlog.py /usr/lib/adminbot statusnet.py /usr/lib/adminbot -README /usr/lib/adminbot config.py /etc/adminbot diff --git a/debian/rules b/debian/rules index 8d6bd51..de1bd88 100755 --- a/debian/rules +++ b/debian/rules @@ -1,86 +1,8 @@ #!/usr/bin/make -f # -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 +#export DH_VERBOSE=1 - - - - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - - # Add here commands to compile the package. - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - rm -rf build - - dh_clean - -install: build - dh_testdir - dh_testroot - #dh_prep - dh_installdirs - -# Build architecture-independent files here. -binary-indep: install - dh_testdir - dh_testroot - dh_installinit -n - -# Build architecture-dependent files here. -binary-arch: install - dh_testdir - dh_testroot -# dh_installchangelogs -# dh_installdocs -# dh_installexamples - dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo -# dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +%: + dh $@ --with python2 -- To view, visit https://gerrit.wikimedia.org/r/68935 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I470ce1c6b97d6e2319a7e77bd46b0ac27054366e Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/adminbot Gerrit-Branch: master Gerrit-Owner: AzaToth <azat...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
