diff options
| -rw-r--r-- | TODO | 1 | ||||
| -rwxr-xr-x | bin/housekeeping.sh | 2 | ||||
| -rw-r--r-- | debian/control | 10 | ||||
| -rw-r--r-- | debian/copyright | 68 | ||||
| -rw-r--r-- | debian/jenkins.debian.net-bin.docs | 1 | ||||
| -rw-r--r-- | debian/jenkins.debian.net.cron.d.ex | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | etc/cron.daily/jenkins | 0 | ||||
| -rwxr-xr-x | etc/cron.daily/visitors | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | etc/sudoers.d/jenkins | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | procmailrc | 0 |
10 files changed, 47 insertions, 47 deletions
@@ -26,6 +26,7 @@ See link:http://jenkins.debian.net/userContent/about.html["about jenkins.debian. * /usr/sbin/jenkins.debian.net-setup needs to be written * what update-j.d.n.sh does, needs to be put elsewhere... +* debian/copyright is incorrect about some licenses, ie the profitbricks+debian logos... and the preseeding files as well. === jenkins-job-builder related diff --git a/bin/housekeeping.sh b/bin/housekeeping.sh index 87bf204b..158c174d 100755 --- a/bin/housekeeping.sh +++ b/bin/housekeeping.sh @@ -1,4 +1,4 @@ -#/bin/bash +#!/bin/bash # Copyright 2012 Holger Levsen <holger@layer-acht.org> # released under the GPLv=2 diff --git a/debian/control b/debian/control index 299f223b..f7484f68 100644 --- a/debian/control +++ b/debian/control @@ -3,15 +3,15 @@ Section: devel Priority: extra Maintainer: Holger Levsen <holger@debian.org> Build-Depends: debhelper (>= 9.20120419~) -Standards-Version: 3.8.4 +Standards-Version: 3.9.4 Homepage: http://jenkins.debian.net/userContent/about.html -#Vcs-Git: git://git.debian.org/collab-maint/jenkins.debian.net.git -#Vcs-Browser: http://git.debian.org/?p=collab-maint/jenkins.debian.net.git;a=summary +Vcs-Git: git://git.debian.org/git/users/holger/jenkins.debian.net.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/holger/jenkins.debian.net.git Package: jenkins.debian.net-setup Architecture: all Depends: ${misc:Depends}, jenkins.debian.net-bin, - vim, screen, less, etckeeper, moreutils, curl, mtr-tiny, dstat, devscripts, bash-completion, shorewall, shorewall6, cron-apt, apt-listchanges, munin, calamaris, visitors, procmail, libjson-rpc-perl, libfile-touch-perl, zutils, ip2host, + vim, screen, less, etckeeper, moreutils, curl, mtr-tiny, dstat, devscripts, bash-completion, shorewall, shorewall6, cron-apt, apt-listchanges, munin, calamaris, visitors, procmail, libjson-rpc-perl, libfile-touch-perl, zutils, ip2host, apache2, python-yaml, python-pip, build-essential, python-setuptools Recommends: jenkins-job-builder Description: Stuff to setup a jenkins.debian.net instance @@ -23,7 +23,7 @@ Description: Stuff to setup a jenkins.debian.net instance Package: jenkins.debian.net-bin Architecture: all -Depends:, ${misc:Depends},, debootstrap, sudo, figlet, graphviz, apache2, python-yaml, python-pip, mr, subversion, subversion-tools, vnstat, webcheck, poxml, qemu, vncsnapshot, imagemagick, ffmpeg2theora, python-twisted, python-imaging, gocr +Depends:, ${misc:Depends}, debootstrap, sudo, figlet, graphviz, mr, subversion, subversion-tools, vnstat, webcheck, poxml, qemu, vncsnapshot, imagemagick, ffmpeg2theora, python-twisted, python-imaging, gocr Description: Stuff to make jenkins.debian.net run and debug Scripts and configuration files for running and debugging jobs run on jenkins.debian.net. diff --git a/debian/copyright b/debian/copyright index b5529ab6..e018ed6b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,37 +1,33 @@ -This work was packaged for Debian by: +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: jenkins.debian.net +Upstream-Contact: Holger Levsen <holger@debian.org> +Source: git://git.debian.org/git/users/holger/jenkins.debian.net.git +Copyright: 2012 Holger Levsen +Comment: Original author is Holger Levsen <holger@layer-acht.org> + Upstream is bunch of lunatics who don't make release tarballs publicly + available. The Debian .orig.tar.gz is what would be released, though. + +Files: * +Copyright: 2012 Holger Levsen <holger@debian.org> +License: GPL-2+ + 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 2 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. + . + You should have received a copy of the GNU General Public + License along with this package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + '/usr/share/common-licenses/GPL-2'. - Holger Levsen <holger@debian.org> on Tue, 27 Nov 2012 23:54:51 +0100 - -It was downloaded from: - - <url://example.com> - -Upstream Author(s): - - <put author's name and email here> - <likewise for another author> - -Copyright: - - <Copyright (C) YYYY Firstname Lastname> - <likewise for another author> - -License: - - <Put the license of the package here indented by 4 spaces> - -The Debian packaging is: - - Copyright (C) 2012 Holger Levsen <holger@debian.org> - -# Please chose a license for your packaging work. If the program you package -# uses a mainstream license, using the same license is the safest choice. -# Please avoid to pick license terms that are more restrictive than the -# packaged work, as it may make Debian's contributions unacceptable upstream. -# If you just want it to be GPL version 3, leave the following lines in. - -and is licensed under the GPL version 3, -see "/usr/share/common-licenses/GPL-3". - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. diff --git a/debian/jenkins.debian.net-bin.docs b/debian/jenkins.debian.net-bin.docs index 57455abc..16636bd9 100644 --- a/debian/jenkins.debian.net-bin.docs +++ b/debian/jenkins.debian.net-bin.docs @@ -1,4 +1,3 @@ INSTALL -LICENSE README TODO diff --git a/debian/jenkins.debian.net.cron.d.ex b/debian/jenkins.debian.net.cron.d.ex deleted file mode 100644 index 594f26c0..00000000 --- a/debian/jenkins.debian.net.cron.d.ex +++ /dev/null @@ -1,4 +0,0 @@ -# -# Regular cron jobs for the jenkins.debian.net package -# -0 4 * * * root [ -x /usr/bin/jenkins.debian.net_maintenance ] && /usr/bin/jenkins.debian.net_maintenance diff --git a/etc/cron.daily/jenkins b/etc/cron.daily/jenkins index 8100995e..8100995e 100644..100755 --- a/etc/cron.daily/jenkins +++ b/etc/cron.daily/jenkins diff --git a/etc/cron.daily/visitors b/etc/cron.daily/visitors index e310dde7..ef011d65 100755 --- a/etc/cron.daily/visitors +++ b/etc/cron.daily/visitors @@ -3,6 +3,14 @@ # Copyright 2012 Holger Levsen <holger@layer-acht.org> # released under the GPLv=2 +[ -x /usr/bin/visitors ] || exit 0 +[ -x /usr/bin/ip2host ] || exit 0 + +if [ ! -f /usr/share/doc/zutils/copyright ] ; then + echo package zutils needs to be installed too + exit 1 +fi + LOGS=$(mktemp) DOT=$(mktemp) # FIXME: provide monthly stats and don't run this daily diff --git a/etc/sudoers.d/jenkins b/etc/sudoers.d/jenkins index 05cdcf84..05cdcf84 100755..100644 --- a/etc/sudoers.d/jenkins +++ b/etc/sudoers.d/jenkins diff --git a/procmailrc b/procmailrc index 2e60d090..2e60d090 100755..100644 --- a/procmailrc +++ b/procmailrc |