[Python-apps-commits] r12689 - in packages/irker/trunk (27 files)

drnlmza-guest at users.alioth.debian.org drnlmza-guest at users.alioth.debian.org
Mon Jan 11 15:15:58 UTC 2016


    Date: Monday, January 11, 2016 @ 15:15:57
  Author: drnlmza-guest
Revision: 12689

[svn-inject] Applying Debian modifications (2.12+dfsg-1) to trunk

Added:
  packages/irker/trunk/debian/
  packages/irker/trunk/debian/TODO
  packages/irker/trunk/debian/changelog
  packages/irker/trunk/debian/compat
  packages/irker/trunk/debian/control
  packages/irker/trunk/debian/copyright
  packages/irker/trunk/debian/irker.docs
  packages/irker/trunk/debian/irker.examples
  packages/irker/trunk/debian/irker.init
  packages/irker/trunk/debian/irker.install
  packages/irker/trunk/debian/irker.links
  packages/irker/trunk/debian/irker.postinst
  packages/irker/trunk/debian/irker.postrm
  packages/irker/trunk/debian/local/
  packages/irker/trunk/debian/local/irkerhook-debian
  packages/irker/trunk/debian/local/irkerhook-git
  packages/irker/trunk/debian/patches/
  packages/irker/trunk/debian/patches/0001-dfsg.patch
  packages/irker/trunk/debian/patches/0002-abbrev-commit.patch
  packages/irker/trunk/debian/patches/0003-abbrev-gitweb.patch
  packages/irker/trunk/debian/patches/0004-webview.patch
  packages/irker/trunk/debian/patches/0005-author-name.patch
  packages/irker/trunk/debian/patches/series
  packages/irker/trunk/debian/rules
  packages/irker/trunk/debian/source/
  packages/irker/trunk/debian/source/format
  packages/irker/trunk/debian/source/options


Property changes on: packages/irker/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Added: packages/irker/trunk/debian/TODO
===================================================================
--- packages/irker/trunk/debian/TODO	                        (rev 0)
+++ packages/irker/trunk/debian/TODO	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1,3 @@
+* extend initscript that:
+  - has an option to join channels (via empty messages) on start
+  - takes nick and nickpassword from /etc/default/irker

Added: packages/irker/trunk/debian/changelog
===================================================================
--- packages/irker/trunk/debian/changelog	                        (rev 0)
+++ packages/irker/trunk/debian/changelog	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1,322 @@
+irker (2.12+dfsg-1) unstable; urgency=medium
+
+  * QA upload.
+  * Update to upstream version 2.12 (Closes: #775027)
+
+ -- Jonathan Wiltshire <jmw at debian.org>  Sat, 17 Jan 2015 14:25:09 +0000
+
+irker (2.11+dfsg-2) unstable; urgency=low
+
+  * I don't care anymore, not worth it.. orphaning.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Fri, 25 Jul 2014 20:46:42 +0200
+
+irker (2.11+dfsg-1) unstable; urgency=low
+
+  * Merging upstream version 2.11+dfsg:
+    - irk works with ircs URLs (Closes: #749818).
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Tue, 24 Jun 2014 16:30:06 +0200
+
+irker (2.9+dfsg-1) unstable; urgency=low
+
+  * Merging upstream version 2.9+dfsg.
+  * Refreshing webview.patch.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Tue, 10 Jun 2014 19:56:49 +0200
+
+irker (2.8+dfsg-1) unstable; urgency=low
+
+  * Merging upstream version 2.8+dfsg.
+  * Dripping irk-manpage.patch, included upstream.
+  * Adding patch to use author_name instead of author in Git
+    notifications.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Sat, 31 May 2014 11:54:17 +0200
+
+irker (2.7+dfsg-2) unstable; urgency=low
+
+  * Adding manpage for irk from Antoine Beaupre <anarcat at debian.org>
+    (Closes: 746535).
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Sat, 03 May 2014 12:28:08 +0200
+
+irker (2.7+dfsg-1) unstable; urgency=low
+
+  * Dropping debconf handling (Closes: #743472).
+  * Merging upstream version 2.7+dfsg.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Sat, 05 Apr 2014 11:21:21 +0200
+
+irker (2.6+dfsg-2) unstable; urgency=low
+
+  * Building with dh --parallel.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Mon, 31 Mar 2014 21:00:17 +0200
+
+irker (2.6+dfsg-1) experimental; urgency=low
+
+  * Merging upstream version 2.6+dfgs.
+  * Updating year in copyright file.
+  * Dropping daemon user debconf support, there's no practical need to run
+    irker under a different unprivileged user anyway.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Wed, 05 Feb 2014 20:41:13 +0100
+
+irker (2.5+dfsg-5) experimental; urgency=low
+
+  * Adding support for multiple channels in irkerhook-debian.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Sun, 19 Jan 2014 08:38:40 +0100
+
+irker (2.5+dfsg-4) experimental; urgency=low
+
+  * Running git hook with set -e.
+  * Adding generic irkerhook for random debian purposes (such as lxc).
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Fri, 17 Jan 2014 16:17:28 +0100
+
+irker (2.5+dfsg-3) experimental; urgency=low
+
+  * Disabling url check in irkerhook.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Thu, 16 Jan 2014 14:43:37 +0100
+
+irker (2.5+dfsg-2) experimental; urgency=low
+
+  * Updating local git hook for newer irker and git versions.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Mon, 13 Jan 2014 13:31:56 +0100
+
+irker (2.5+dfsg-1) experimental; urgency=low
+
+  * Merging upstream version 2.5+dfsg.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Fri, 27 Dec 2013 15:51:30 +0100
+
+irker (2.4+dfsg-1) experimental; urgency=low
+
+  * Merging upstream version 2.4+dfsg.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Thu, 05 Dec 2013 19:22:40 +0100
+
+irker (2.3+dfsg-1) experimental; urgency=low
+
+  * Merging upstream version 2.3+dfsg.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Sun, 01 Dec 2013 09:20:51 +0100
+
+irker (2.2+dfsg-1) experimental; urgency=low
+
+  * Merging upstream version 2.2+dfsg.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Sun, 01 Dec 2013 09:19:21 +0100
+
+irker (2.1+dfsg-1) experimental; urgency=low
+
+  * Merging upstream version 2.1+dfsg.
+  * Adding patch to avoid rcopying removed logo file.
+  * Renumbering patches.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Wed, 27 Nov 2013 07:04:08 +0100
+
+irker (2.0+dfsg-1) experimental; urgency=low
+
+  * Rewrapping init script.
+  * Updating to standards version 3.9.5.
+  * Merging upstream version 2.0+dfsg.
+  * Dropping python-irc from depends, not required anymore.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Sat, 16 Nov 2013 14:29:36 +0100
+
+irker (1.20+dfsg-5) experimental; urgency=low
+
+  * Adding explicit depends to adduser (Closes: #722466).
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Wed, 11 Sep 2013 15:45:58 +0200
+
+irker (1.20+dfsg-4) experimental; urgency=low
+
+  * Updating vcs fields.
+  * Adding initscript.
+  * Updating todo file.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Mon, 09 Sep 2013 11:30:26 +0200
+
+irker (1.20+dfsg-3) experimental; urgency=low
+
+  * Adding vcs fields.
+  * Wrapping control fields.
+  * Adding manpage symlinks.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Wed, 17 Jul 2013 13:17:05 +0200
+
+irker (1.20+dfsg-2) experimental; urgency=low
+
+  [ Michael Stapelberg ]
+  * Using dh-systemd for proper systemd-related maintscripts (Closes: #715252).
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Fri, 12 Jul 2013 15:30:26 +0200
+
+irker (1.20+dfsg-1) experimental; urgency=low
+
+  * Merging upstream version 1.20+dfsg.
+  * Rediffing abbrev-commit.patch.
+  * Rediffing abbrev-gitweb.patch.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Tue, 28 May 2013 15:07:01 +0200
+
+irker (1.19+dfsg-1) experimental; urgency=low
+
+  * Merging upstream version 1.19+dfsg.
+  * Sorting targets in rules.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Thu, 16 May 2013 10:46:00 +0200
+
+irker (1.18+dfsg-1) experimental; urgency=low
+
+  * Merging upstream version 1.18+dfsg.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Thu, 18 Apr 2013 06:16:13 +0200
+
+irker (1.17+dfsg-3) unstable; urgency=low
+
+  * Removing all references to my old email address.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Sun, 10 Mar 2013 20:52:36 +0100
+
+irker (1.17+dfsg-2) unstable; urgency=low
+
+  * Make irkerhook-git more usable by checking for irker.project value in
+    repository config.
+  * Renumbering patches with four leading digits.
+  * Trimming diff headers in patches.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Sun, 10 Mar 2013 20:51:10 +0100
+
+irker (1.17+dfsg-1) unstable; urgency=low
+
+  * Merging upstream version 1.17+dfsg.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Thu, 07 Feb 2013 12:26:45 +0100
+
+irker (1.16+dfsg-1) unstable; urgency=low
+
+  * Merging upstream version 1.16+dfsg.
+  * Updating year in copyright file.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Sat, 26 Jan 2013 20:54:31 +0100
+
+irker (1.15+dfsg-2) unstable; urgency=low
+
+  * Updating year in copyright file.
+  * Adding dpkg-source local-options.
+  * Dropping dpkg-source compression levels.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Thu, 24 Jan 2013 16:10:06 +0100
+
+irker (1.15+dfsg-1) unstable; urgency=low
+
+  * Merging upstream version 1.15+dfsg.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Mon, 10 Dec 2012 11:54:36 +0100
+
+irker (1.14+dfsg-1) unstable; urgency=low
+
+  * Merging upstream version 1.14+dfsg.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Wed, 28 Nov 2012 14:08:48 +0100
+
+irker (1.13+dfsg-2) unstable; urgency=low
+
+  * Dropping alternate depends on python-irclib.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Sun, 11 Nov 2012 19:54:16 +0100
+
+irker (1.13+dfsg-1) experimental; urgency=low
+
+  * Merging upstream version 1.13+dfsg.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Thu, 08 Nov 2012 11:51:26 +0100
+
+irker (1.12+dfsg-1) experimental; urgency=low
+
+  * Merging upstream version 1.12+dfsg.
+  * Bumping versioned build-depends on python-irclib.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Fri, 12 Oct 2012 07:00:04 +0200
+
+irker (1.11+dfsg-1) experimental; urgency=low
+
+  * Merging upstream version 1.11+dfsg.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Thu, 11 Oct 2012 07:22:58 +0200
+
+irker (1.10+dfsg-1) experimental; urgency=low
+
+  * Merging upstream version 1.10+dfsg.
+  * Removing python-eventlet recommends, upstream dropped support for
+    it.
+  * Updating python irc depends.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Wed, 10 Oct 2012 09:51:02 +0200
+
+irker (1.9+dfsg-1) experimental; urgency=low
+
+  * Merging upstream version 1.9+dfsg.
+  * Adding systemd and pkg-config to build-depends to automatically
+    guess systemd unit directory.
+  * Adding todo file.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Tue, 09 Oct 2012 07:44:39 +0200
+
+irker (1.8+dfsg-1) experimental; urgency=low
+
+  * Merging upstream version 1.8+dfsg.
+  * Removing tinyifier-config.patch, included upstream.
+  * Removing irk-netcat.patch, not applicable anymore.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Sun, 07 Oct 2012 09:58:51 +0200
+
+irker (1.7+dfsg-3) experimental; urgency=low
+
+  * Adding patch for irk test tool to let netcat terminate in order to
+    send the request.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Sat, 06 Oct 2012 15:21:02 +0200
+
+irker (1.7+dfsg-2) experimental; urgency=low
+
+  * Adding patch to show commit IDs shortened by default to 7 characters
+    (in line with default git --abbrev-commit) rather than the unusual
+    12.
+  * Adding patch to show commit IDs shortened by default to 7 characters
+    (in line with default git --abbrev-commit) rather than the unusual
+    12 also in gitweb.
+  * Adding patch from upstream to get tinyfier from the config.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Sat, 06 Oct 2012 14:08:38 +0200
+
+irker (1.7+dfsg-1) experimental; urgency=low
+
+  * Merging upstream version 1.7+dfsg.
+  * Adding irkerhook-git to be symlinked in git repositories.
+  * Adding debhelper install file to install irk.
+  * Adding debhelper examples file to install filter examples.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Fri, 05 Oct 2012 20:39:46 +0200
+
+irker (1.6+dfsg-1) experimental; urgency=low
+
+  * Merging upstream version 1.6+dfsg.
+  * Removing vanished bugs file from debhelper docs.
+  * Making comment about removing irker-logo.png in source more precise.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Thu, 04 Oct 2012 20:59:35 +0200
+
+irker (1.5+dfsg-1) experimental; urgency=low
+
+  * Initial release (Closes: #689011).
+  * Rebuild upstream tarball without sourceless irker logo.
+
+ -- Daniel Baumann <mail at daniel-baumann.ch>  Wed, 03 Oct 2012 12:35:32 +0200

Added: packages/irker/trunk/debian/compat
===================================================================
--- packages/irker/trunk/debian/compat	                        (rev 0)
+++ packages/irker/trunk/debian/compat	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1 @@
+9

Added: packages/irker/trunk/debian/control
===================================================================
--- packages/irker/trunk/debian/control	                        (rev 0)
+++ packages/irker/trunk/debian/control	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1,26 @@
+Source: irker
+Section: utils
+Priority: optional
+Maintainer: Debian QA Group <packages at qa.debian.org>
+Build-Depends:
+ debhelper (>= 9),
+ dh-systemd,
+ pkg-config,
+ python,
+ systemd,
+ xmlto,
+Standards-Version: 3.9.5
+Homepage: http://www.catb.org/esr/irker/
+Vcs-Browser: http://daniel-baumann.ch/gitweb/?p=debian/packages/irker.git
+Vcs-Git: git://daniel-baumann.ch/git/debian/packages/irker.git
+
+Package: irker
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${python:Depends},
+ adduser,
+Description: submission tools for IRC notifications
+ irkerd is a specialized IRC client that runs as a daemon, allowing other
+ programs to ship IRC notifications by sending JSON objects to a listening
+ socket.

Added: packages/irker/trunk/debian/copyright
===================================================================
--- packages/irker/trunk/debian/copyright	                        (rev 0)
+++ packages/irker/trunk/debian/copyright	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1,40 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: irker
+Upstream-Contact: Eric S. Raymond <esr at thyrsus.com>
+Source: http://www.catb.org/esr/irker/
+
+Files: *
+Copyright: 2012-2014 Eric S. Raymond <esr at thyrsus.com>
+License: BSD
+
+Files: debian/*
+Copyright: 2012-2014 Daniel Baumann <mail at daniel-baumann.ch>
+License: BSD
+
+License: BSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ Neither name of the this project nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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.

Added: packages/irker/trunk/debian/irker.docs
===================================================================
--- packages/irker/trunk/debian/irker.docs	                        (rev 0)
+++ packages/irker/trunk/debian/irker.docs	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1,2 @@
+README
+*.txt

Added: packages/irker/trunk/debian/irker.examples
===================================================================
--- packages/irker/trunk/debian/irker.examples	                        (rev 0)
+++ packages/irker/trunk/debian/irker.examples	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1 @@
+filter*.py

Added: packages/irker/trunk/debian/irker.init
===================================================================
--- packages/irker/trunk/debian/irker.init	                        (rev 0)
+++ packages/irker/trunk/debian/irker.init	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:		irker
+# Required-Start:	$local_fs $remote_fs $syslog $network
+# Required-Stop:	$local_fs $remote_fs $syslog $network
+# Default-Start:	2 3 4 5
+# Default-Stop:		1
+# Short-Description:	submission tools for IRC notifications
+# Description:		irkerd is a specialized IRC client that runs as a
+#			daemon, allowing other programs to ship IRC
+#			notifications by sending JSON objects to a listening
+#			socket.
+### END INIT INFO
+
+PATH="/sbin:/bin:/usr/sbin:/usr/bin"
+DAEMON="/usr/bin/irkerd"
+
+test -x "${DAEMON}" || exit 0
+
+NAME="irkerd"
+DESC="IRC notifications"
+PIDFILE="/var/run/irker.pid"
+DEFAULTS="/etc/default/irker"
+
+for _FILE in "${DEFAULTS}" "${DEFAULTS}".d/*
+do
+	if [ -e "${_FILE}" ]
+	then
+		. "${_FILE}"
+	fi
+done
+
+set -e
+
+. /lib/lsb/init-functions
+
+do_start()
+{
+	start-stop-daemon --start --background --quiet --oknodo --exec ${DAEMON} --chuid irker -- -l /var/log/irker/irker.log ${IRKER_OPTIONS}
+}
+
+do_stop ()
+{
+	start-stop-daemon --stop --quiet --oknodo --name ${NAME}
+}
+
+do_reload ()
+{
+	start-stop-daemon --stop --quiet --oknodo --name ${NAME} --signal 1
+}
+
+case "${1}" in
+	start)
+		log_daemon_msg "Starting ${DESC}" "${NAME}"
+		do_start
+		log_end_msg ${?}
+		;;
+
+	stop)
+		log_daemon_msg "Stopping ${DESC}" "${NAME}"
+		do_stop
+		log_end_msg ${?}
+		;;
+
+	restart|force-reload)
+		log_daemon_msg "Restarting ${DESC}" "${NAME}"
+		do_stop
+		sleep 1
+		do_start
+		log_end_msg ${?}
+		;;
+
+	status)
+		status_of_proc ${DAEMON} ${NAME}
+		;;
+
+	*)
+		echo "Usage: ${0} {start|stop|restart|force-reload|status}" >&2
+		exit 1
+		;;
+esac
+
+exit 0

Added: packages/irker/trunk/debian/irker.install
===================================================================
--- packages/irker/trunk/debian/irker.install	                        (rev 0)
+++ packages/irker/trunk/debian/irker.install	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1,3 @@
+irk		/usr/bin
+
+debian/local/*	/usr/bin

Added: packages/irker/trunk/debian/irker.links
===================================================================
--- packages/irker/trunk/debian/irker.links	                        (rev 0)
+++ packages/irker/trunk/debian/irker.links	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1,2 @@
+/usr/share/man/man8/irkerd.8.gz		/usr/share/man/man8/irk.8.gz
+/usr/share/man/man1/irkerhook.1.gz	/usr/share/man/man1/irkerhook-git.1.gz

Added: packages/irker/trunk/debian/irker.postinst
===================================================================
--- packages/irker/trunk/debian/irker.postinst	                        (rev 0)
+++ packages/irker/trunk/debian/irker.postinst	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+	configure)
+		if ! getent passwd irker > /dev/null 2>&1
+		then
+			adduser --system --no-create-home --quiet --gecos 'irker daemon' --group irker
+		else
+			echo "irker user already exists, doing nothing."
+		fi
+
+		mkdir -p /var/log/irker
+		chown irker:irker /var/log/irker -R
+		;;
+
+	abort-upgrade|abort-remove|abort-deconfigure)
+
+		;;
+
+	*)
+		echo "postinst called with unknown argument \`${1}'" >&2
+		exit 1
+		;;
+esac
+
+#DEBHELPER#
+
+exit 0

Added: packages/irker/trunk/debian/irker.postrm
===================================================================
--- packages/irker/trunk/debian/irker.postrm	                        (rev 0)
+++ packages/irker/trunk/debian/irker.postrm	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+	remove)
+		if [ -x /usr/sbin/deluser ]
+		then
+			deluser --quiet --system irker
+		fi
+
+		rmdir /var/log/irker > /dev/null 2>&1 || true
+		;;
+
+	purge)
+		rm -f /etc/default/irker
+		;;
+
+	upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+		;;
+
+	*)
+		echo "postrm called with unknown argument \`${1}'" >&2
+		exit 1
+		;;
+esac
+
+#DEBHELPER#
+
+exit 0

Added: packages/irker/trunk/debian/local/irkerhook-debian
===================================================================
--- packages/irker/trunk/debian/local/irkerhook-debian	                        (rev 0)
+++ packages/irker/trunk/debian/local/irkerhook-debian	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -e
+
+_MESSAGE="${@}"
+
+_PROGRAM="$(basename ${0})"
+
+for _FILE in "/etc/default/${_PROGRAM}" "/etc/default/${_PROGRAM}.d"/*
+do
+	if [ -e "${_FILE}" ]
+	then
+		. "${_FILE}" || true
+	fi
+done
+
+if [ "${IRK_ENABLED}" != "true" ]
+then
+	exit 0
+fi
+
+echo "sending IRC notification"
+
+for IRC_CHANNEL in ${IRC_CHANNELS}
+do
+	irk ${IRC_CHANNEL} "${_MESSAGE}"
+done


Property changes on: packages/irker/trunk/debian/local/irkerhook-debian
___________________________________________________________________
Added: svn:executable
   + *

Added: packages/irker/trunk/debian/local/irkerhook-git
===================================================================
--- packages/irker/trunk/debian/local/irkerhook-git	                        (rev 0)
+++ packages/irker/trunk/debian/local/irkerhook-git	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ -z "$(git config --get irker.project)" ]
+then
+	exit 0
+fi
+
+echo "sending IRC notification"
+
+while read old new refname
+do
+	irkerhook --refname=${refname} $(git rev-list --reverse ${old}..${new})
+done


Property changes on: packages/irker/trunk/debian/local/irkerhook-git
___________________________________________________________________
Added: svn:executable
   + *

Added: packages/irker/trunk/debian/patches/0001-dfsg.patch
===================================================================
--- packages/irker/trunk/debian/patches/0001-dfsg.patch	                        (rev 0)
+++ packages/irker/trunk/debian/patches/0001-dfsg.patch	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1,16 @@
+Author: Daniel Baumann <mail at daniel-baumann.ch>
+Description: Removing logo (no origin known and no source available)
+
+diff -Naurp irker.orig/Makefile irker/Makefile
+--- irker.orig/Makefile
++++ irker/Makefile
+@@ -81,8 +81,7 @@ SOURCES = \
+ 
+ EXTRA_DIST = \
+ 	org.catb.irkerd.plist \
+-	irkerd.service \
+-	irker-logo.png
++	irkerd.service
+ 
+ version:
+ 	@echo $(VERS)

Added: packages/irker/trunk/debian/patches/0002-abbrev-commit.patch
===================================================================
--- packages/irker/trunk/debian/patches/0002-abbrev-commit.patch	                        (rev 0)
+++ packages/irker/trunk/debian/patches/0002-abbrev-commit.patch	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1,29 @@
+Author: Daniel Baumann <mail at daniel-baumann.ch>
+Description:
+ Showing commit IDs shortened by default to 7 characters (in line with default
+ git --abbrev-commit) rather than the unusual 12.
+
+diff -Naurp irker.orig/irkerhook.py irker/irkerhook.py
+--- irker.orig/irkerhook.py
++++ irker/irkerhook.py
+@@ -262,7 +262,7 @@ class GitExtractor(GenericExtractor):
+         else: # self.revformat == 'describe'
+             commit.rev = do("git describe %s 2>/dev/null" % shellquote(commit.commit))
+         if not commit.rev:
+-            commit.rev = commit.commit[:12]
++            commit.rev = commit.commit[:7]
+         # Extract the meta-information for the commit
+         commit.files = do("git diff-tree -r --name-only " + shellquote(commit.commit))
+         commit.files = " ".join(commit.files.strip().split("\n")[1:])
+diff -Naurp irker.orig/irkerhook.xml irker/irkerhook.xml
+--- irker.orig/irkerhook.xml
++++ irker/irkerhook.xml
+@@ -216,7 +216,7 @@ may have the following values:</para>
+ </varlistentry>
+ <varlistentry>
+ <term>short</term>
+-<listitem><para>first 12 chars of hex ID</para></listitem>
++<listitem><para>first 7 chars of hex ID</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>describe</term>

Added: packages/irker/trunk/debian/patches/0003-abbrev-gitweb.patch
===================================================================
--- packages/irker/trunk/debian/patches/0003-abbrev-gitweb.patch	                        (rev 0)
+++ packages/irker/trunk/debian/patches/0003-abbrev-gitweb.patch	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1,16 @@
+Author: Daniel Baumann <mail at daniel-baumann.ch>
+Description:
+ Showing commit IDs shortened by default to 7 characters (in line with default
+ git --abbrev-commit) rather than the unusual 12 also for gitweb.
+
+diff -Naurp irker.orig/irkerhook.py irker/irkerhook.py
+--- irker.orig/irkerhook.py
++++ irker/irkerhook.py
+@@ -263,6 +263,7 @@ class GitExtractor(GenericExtractor):
+             commit.rev = do("git describe %s 2>/dev/null" % shellquote(commit.commit))
+         if not commit.rev:
+             commit.rev = commit.commit[:7]
++            commit.commit = commit.commit[:7]
+         # Extract the meta-information for the commit
+         commit.files = do("git diff-tree -r --name-only " + shellquote(commit.commit))
+         commit.files = " ".join(commit.files.strip().split("\n")[1:])

Added: packages/irker/trunk/debian/patches/0004-webview.patch
===================================================================
--- packages/irker/trunk/debian/patches/0004-webview.patch	                        (rev 0)
+++ packages/irker/trunk/debian/patches/0004-webview.patch	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1,37 @@
+Author: Daniel Baumann <mail at daniel-baumann.ch>
+Description: Disable URL check.
+ If a gitweb URL is configured, the irkerhook only sends a notification if
+ the URL is reachable.
+ .
+ If the URL needs authentication, the hook fails. This is undesirable,
+ hence we switch off the URL check entirely.
+
+diff -Naurp irker.orig/irkerhook.py irker/irkerhook.py
+--- irker.orig/irkerhook.py
++++ irker/irkerhook.py
+@@ -70,24 +70,7 @@ class Commit:
+         else:
+             urlprefix = urlprefixmap.get(self.urlprefix, self.urlprefix)
+             webview = (urlprefix % self.__dict__) + self.commit
+-            try:
+-                if urllib.urlopen(webview).getcode() == 404:
+-                    raise IOError
+-                if self.tinyifier and self.tinyifier.lower() != "none":
+-                    try:
+-                        # Didn't get a retrieval error or 404 on the web
+-                        # view, so try to tinyify a reference to it.
+-                        self.url = open(urllib.urlretrieve(self.tinyifier + webview)[0]).read()
+-                        try:
+-                            self.url = self.url.decode('UTF-8')
+-                        except UnicodeError:
+-                            pass
+-                    except IOError:
+-                        self.url = webview
+-                else:
+-                    self.url = webview
+-            except IOError:
+-                self.url = ""
++            self.url = webview
+         res = self.template % self.__dict__
+         return unicode(res, 'UTF-8') if not isinstance(res, unicode) else res
+ 

Added: packages/irker/trunk/debian/patches/0005-author-name.patch
===================================================================
--- packages/irker/trunk/debian/patches/0005-author-name.patch	                        (rev 0)
+++ packages/irker/trunk/debian/patches/0005-author-name.patch	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1,15 @@
+Author: Daniel Baumann <mail at daniel-baumann.ch>
+Description: Use author_name instead of author in Git notifications.
+
+diff -Naurp irker.orig/irkerhook.py irker/irkerhook.py
+--- irker.orig/irkerhook.py
++++ irker/irkerhook.py
+@@ -281,7 +281,7 @@ class GitExtractor(GenericExtractor):
+         # Might be be nice to ship the full email address, if not
+         # for spammers' address harvesters - getting this wrong
+         # would make the freenode #commits channel into harvester heaven.
+-        commit.author = commit.mail.split("@")[0]
++        commit.author = commit.author_name
+         commit.author_date, commit.commit_date = \
+             do("git log -1 '--pretty=format:%ai|%ci' " + shellquote(commit.commit)).split("|")
+         return commit

Added: packages/irker/trunk/debian/patches/series
===================================================================
--- packages/irker/trunk/debian/patches/series	                        (rev 0)
+++ packages/irker/trunk/debian/patches/series	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1,5 @@
+0001-dfsg.patch
+0002-abbrev-commit.patch
+0003-abbrev-gitweb.patch
+0004-webview.patch
+0005-author-name.patch

Added: packages/irker/trunk/debian/rules
===================================================================
--- packages/irker/trunk/debian/rules	                        (rev 0)
+++ packages/irker/trunk/debian/rules	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+
+dfsg:
+	# no origin known and no source available
+	rm -f irker-logo.png
+
+%:
+	dh ${@} --parallel --with python2,systemd
+
+override_dh_auto_build:
+	DESTDIR="$(CURDIR)/debian/irker" dh_auto_build
+
+override_dh_auto_install:
+	DESTDIR="$(CURDIR)/debian/irker" dh_auto_install
+
+	cp irkerhook.py debian/irker/usr/bin/irkerhook
+
+override_dh_builddeb:
+	dh_builddeb -- -Zxz
+
+override_dh_installchangelogs:
+	dh_installchangelogs NEWS


Property changes on: packages/irker/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
   + *

Added: packages/irker/trunk/debian/source/format
===================================================================
--- packages/irker/trunk/debian/source/format	                        (rev 0)
+++ packages/irker/trunk/debian/source/format	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1 @@
+3.0 (quilt)

Added: packages/irker/trunk/debian/source/options
===================================================================
--- packages/irker/trunk/debian/source/options	                        (rev 0)
+++ packages/irker/trunk/debian/source/options	2016-01-11 15:15:57 UTC (rev 12689)
@@ -0,0 +1 @@
+compression = xz




More information about the Python-apps-commits mailing list