diff -u jabber-irc-0.4cvs20080505/debian/postinst jabber-irc-0.4cvs20080505/debian/postinst --- jabber-irc-0.4cvs20080505/debian/postinst +++ jabber-irc-0.4cvs20080505/debian/postinst @@ -41,7 +41,7 @@ chown jabber:adm /etc/pyirct.conf.xml /var/lib/jabber-irc chmod 0640 /etc/pyirct.conf.xml # start the service - /etc/jabber/jabber.d/jabber-irc restart + /etc/init.d/jabber-irc restart ;; reverted: --- jabber-irc-0.4cvs20080505/debian/prerm +++ jabber-irc-0.4cvs20080505.orig/debian/prerm @@ -1,39 +0,0 @@ -#! /bin/sh -# prerm script for jabber-irc -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `upgrade' -# * `failed-upgrade' -# * `remove' `in-favour' -# * `deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - remove|upgrade|deconfigure) -# install-info --quiet --remove /usr/info/jabber-irc.info.gz - # stop the service - /etc/jabber/jabber.d/jabber-irc stop - ;; - failed-upgrade) - ;; - *) - echo "prerm 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 -u jabber-irc-0.4cvs20080505/debian/dirs jabber-irc-0.4cvs20080505/debian/dirs --- jabber-irc-0.4cvs20080505/debian/dirs +++ jabber-irc-0.4cvs20080505/debian/dirs @@ -2,5 +2,5 @@ -etc/jabber/jabber.d usr/lib/jabber-irc usr/sbin var/lib/jabber-irc var/log/jabber +etc/init.d diff -u jabber-irc-0.4cvs20080505/debian/changelog jabber-irc-0.4cvs20080505/debian/changelog --- jabber-irc-0.4cvs20080505/debian/changelog +++ jabber-irc-0.4cvs20080505/debian/changelog @@ -1,17 +1,24 @@ -jabber-irc (0.4cvs20080505-1ubuntu1) karmic; urgency=low +jabber-irc (0.4cvs20080505-1.1) unstable; urgency=low - [ Miguel Landaeta ] - * debian/control: Depend on lsb-base instead of jabber-common. (LP: #419427) - * debian/init.d: Updated to take into account the substitution of - jabber-common with lsb-base - - [ Ilya Barygin ] - * debian/postinst, debian/postrm: Use "jabber" user creation/deletion code - from jabber-common. - * debian/control: added Depend on adduser. - * debian/dirs: added creation of var/log/jabber + * Non-maintainer upload. + * Applied patch from Ubuntu (Closes: #516349). Thanks to Miguel Landaeta and + Ilya Barygin. + - debian/control: depend on adduser and on lsb-base (instead of + jabber-common) + - debian/init.d: take into account the substitution of jabber-common with + lsb-base + - debian/postinst, debian/postrm: use "jabber" user creation/deletion + code from jabber-common + - debian/dirs: add var/log/jabber + * Fix binary-arch-rules-but-pkg-is-arch-indep lintian warning + * Depend on ${misc:Depends} for debhelper + * Set debian/compat to 7, update minimum debhelper version, and replace + deprecated ``dh_clean -k'' with dh_prep + * Move init.d script to /etc/init.d/ + * Remove debian/prerm and let dh_installinit generate it instead + * Invoke start-stop-deamon with --make-pidfile - -- Ilya Barygin Wed, 26 Aug 2009 23:09:44 +0400 + -- Serafeim Zanikolas Fri, 06 Aug 2010 03:41:27 +0200 jabber-irc (0.4cvs20080505-1) unstable; urgency=low diff -u jabber-irc-0.4cvs20080505/debian/init.d jabber-irc-0.4cvs20080505/debian/init.d --- jabber-irc-0.4cvs20080505/debian/init.d +++ jabber-irc-0.4cvs20080505/debian/init.d @@ -12,9 +12,10 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/jabberd-irc +CMDLINE=/usr/bin/python/usr/sbin/jabberd-irc NAME=jabber-irc DESC=jabber-irc -CMDLINE='' +ARGS='' PID=/var/run/jabber/$NAME.pid ENABLED='0' @@ -39,11 +40,11 @@ start) if [ -e $PID ]; then PIDDIR=/proc/$(cat $PID) - if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then - log_success_msg "$DESC already started; not starting." + if [ -d ${PIDDIR} -a "$(cat ${PIDDIR}/cmdline)" = "$CMDLINE" ]; then + log_success_msg "$DESC already started; not starting" exit else - log_success_msg "Removing stale PID file $PID." + log_success_msg "Removing stale PID file $PID" rm -f $PID fi fi @@ -51,7 +52,7 @@ log_daemon_msg "Starting $DESC: " export PID start-stop-daemon -b -c jabber:adm --start --quiet --pidfile $PID\ - --exec $DAEMON -- $CMDLINE + --make-pidfile --exec $DAEMON -- $ARGS echo "$NAME." ;; stop) diff -u jabber-irc-0.4cvs20080505/debian/compat jabber-irc-0.4cvs20080505/debian/compat --- jabber-irc-0.4cvs20080505/debian/compat +++ jabber-irc-0.4cvs20080505/debian/compat @@ -1 +1 @@ -4 +7 diff -u jabber-irc-0.4cvs20080505/debian/postrm jabber-irc-0.4cvs20080505/debian/postrm --- jabber-irc-0.4cvs20080505/debian/postrm +++ jabber-irc-0.4cvs20080505/debian/postrm @@ -21,7 +21,7 @@ case "$1" in purge) # remove potentially empty directories if they exist - DIRS="/etc/jabber/jabber.d /etc/jabber /var/run/jabber" + DIRS="/etc/jabber /var/run/jabber" for DIR in $DIRS; do if [ -d $DIR ]; then rmdir --ignore-fail-on-non-empty $DIR diff -u jabber-irc-0.4cvs20080505/debian/default jabber-irc-0.4cvs20080505/debian/default --- jabber-irc-0.4cvs20080505/debian/default +++ jabber-irc-0.4cvs20080505/debian/default @@ -1,5 +1,5 @@ # Default settings for jabber-irc. This file is sourced by /bin/sh -# from /etc/jabber/jabber.d/jabber-irc. +# from /etc/init.d/jabber-irc. # Change the following to 1 to enable the service ENABLED='0' diff -u jabber-irc-0.4cvs20080505/debian/rules jabber-irc-0.4cvs20080505/debian/rules --- jabber-irc-0.4cvs20080505/debian/rules +++ jabber-irc-0.4cvs20080505/debian/rules @@ -31,26 +31,26 @@ # Add here commands to clean up after the build process. - dh_clean + dh_clean install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs # Add here commands to install the package into debian/jabber-irc. - install -o root -g root -m 755 $(CURDIR)/debian/init.d $(CURDIR)/debian/jabber-irc/etc/jabber/jabber.d/jabber-irc + install -o root -g root -m 755 $(CURDIR)/debian/init.d $(CURDIR)/debian/jabber-irc/etc/init.d/jabber-irc install -o root -g root -m 644 $(CURDIR)/debian/default $(CURDIR)/debian/jabber-irc/etc/default/jabber-irc install -o root -g root -m 644 $(CURDIR)/config_example.xml $(CURDIR)/debian/jabber-irc/etc/pyirct.conf.xml install -o root -g root -m 644 $(CURDIR)/????*.py $(CURDIR)/debian/jabber-irc/usr/lib/jabber-irc -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - # Build architecture-dependent files here. binary-arch: build install +# We have nothing to do by default. + +# Build architecture-independent files here. +binary-indep: build install dh_testdir dh_testroot dh_installchangelogs @@ -63,7 +63,7 @@ # dh_installemacsen # dh_installpam # dh_installmime -# dh_installinit + dh_installinit # dh_installcron # dh_installinfo dh_installman diff -u jabber-irc-0.4cvs20080505/debian/control jabber-irc-0.4cvs20080505/debian/control --- jabber-irc-0.4cvs20080505/debian/control +++ jabber-irc-0.4cvs20080505/debian/control @@ -1,15 +1,14 @@ Source: jabber-irc Section: net Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Alexey Nezhdanov -Build-Depends: debhelper (>= 4.0.0) +Maintainer: Alexey Nezhdanov +Build-Depends: debhelper (>= 7.0.0) Standards-Version: 3.8.0 Uploaders: Cosimo Alfarano , Jamin W. Collins Package: jabber-irc Architecture: all -Depends: python-irclib, python-xmpp (>=0.4.1), lsb-base, python, adduser +Depends: ${misc:Depends}, python-irclib, python-xmpp (>=0.4.1), lsb-base, python, adduser Suggests: jabber Description: IRC transport for jabber Provides jabber server with gateway to IRC messaging system.