Tags: patch Hi,
I've packaged mu-conference 0.7-RC1. Attached you'll find a patch to the debian/ directory. If you want to check out the packages, they can be found here: http://debian.unheit.net/pool/main/j/jabber-muc/ I'm not aware of any issues with this package, except that the man page for mu-conference is missing. Regards, harry diff --git a/debian/README.Debian b/debian/README.Debian index 415e741..0109075 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -2,49 +2,21 @@ jabber-muc Multi-User Conference for Debian ------------------------------------------- To enable this service, you need to edit /etc/default/jabber-muc and -set ENABLED to 1. However before this, you need to edit your main -Jabber server's configuration. +set ENABLED to 1. However before this, you need to edit the +configuration file for jabber-muc. Main Jabber server configuration files -In order to have your main Jabber server accept connections from the -Multi-User Conference service, you have to configure it accordingly. +Copy /usr/share/doc/jabber-muc/examples/muc-default.xml to +/etc/jabber-muc.xml and edit it to your needs. -For jabberd server, add the following to the <service> section of its -configuration file. +See README for instructions. - <service id="muclinker"> - <host>conference.localhost</host> - <accept> - <ip>127.0.0.1</ip> - <port>31518</port> - <secret>secret</secret> - </accept> - </service> - -Be sure to replace "localhost" with the full host name of your server -if you want users of other Jabber servers to be able to use this -service. Also, the host name of the service has to be resolveable -via DNS then. - -In order to advertise the service to the Jabber clients, add the -following to the <browse> section of the main jabberd configuration -file. - -<item category="conference" type="public" jid="conference.localhost" - name="Public Conferencing" version="0.5.2"> - <ns>jabber:iq:register</ns> - <ns>gc-1.0</ns> - <ns>http://jabber.org/protocol/muc</ns> -</item> - -Once the above has been done you will need to restart your Jabber server -for it to use the new configuration. Upon restart the the new service -(if ENABLED) will start also. +Once the above has been done you will need to restart jabber-muc. Note: if you change any of the above settings such as any host (localhost), -port, or secret settings, you will also need to make the same change in -/etc/jabber/jabber-muc.xml +port, or secret settings in your Jabber server configuration, you will also +need to make the same change in /etc/jabber-muc.xml -- Jamin W. Collins <[EMAIL PROTECTED]> Fri, 30 May 2003 16:29:48 -0600 - + -- Harald Braumann <[EMAIL PROTECTED]> Tue, 23 Oct 2007 16:54:33 +0200 diff --git a/debian/changelog b/debian/changelog index df03333..b63a3fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +jabber-muc (0.7-RC1-1.1) unstable; urgency=low + + * NMU + * New Upstream Version. Closes bug#341499. + * Don't depend on jabber + - remove debian-makefile.dpatch + - remove dependencies on jabber + - add build deps to libexpat1-dev and libidn11-dev + * Fix package installation + - jabber-muc.dirs: changed to usr/bin + - jabber-muc.docs: added README.sql and XEP0045_SUPPORT + - install mu-conference to /usr/bin + - fixed installation in rules file + - install upstream's muc-default.xml as example and remove jabber-muc.xml + - install default and init.d files to /etc/default and /etc/init.d, resp. + * Depend on jabber-common + * New init.d script + * Instal style.css as example + * Update package maintainer scripts + * Reflect all the changes in README.Debian + + -- Harald Braumann <[EMAIL PROTECTED]> Tue, 23 Oct 2007 13:18:42 +0200 + jabber-muc (0.6.0-2) unstable; urgency=low * added needed build depends on libglib2.0-dev (Closes: #228877) diff --git a/debian/control b/debian/control index 285755e..a31c4b4 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,12 @@ Source: jabber-muc Section: net Priority: optional Maintainer: Jamin W. Collins <[EMAIL PROTECTED]> -Build-Depends: dpatch, debhelper (>> 4.0.0), jabber-dev (>= 1.4.2a-11), libglib2.0-dev +Build-Depends: dpatch, debhelper, libglib2.0-dev, libexpat1-dev, libidn11-dev Standards-Version: 3.6.1.0 Package: jabber-muc Architecture: any -Depends: ${shlibs:Depends}, jabber (>= 1.4.2a-13) +Depends: ${shlibs:Depends} jabber-common (>= 0.5) Description: Multi User Chat module for the Jabber IM Server Jabber is a Free Instant Messaging System . diff --git a/debian/jabber-muc.dirs b/debian/jabber-muc.dirs index c1e014f..526c3a7 100644 --- a/debian/jabber-muc.dirs +++ b/debian/jabber-muc.dirs @@ -1,3 +1,2 @@ -usr/lib/jabber/mu-conference -etc/jabber/jabber.d +usr/bin etc/default diff --git a/debian/jabber-muc.docs b/debian/jabber-muc.docs index 623fe2d..ff50e2d 100644 --- a/debian/jabber-muc.docs +++ b/debian/jabber-muc.docs @@ -1,3 +1,5 @@ FAQ README TODO +README.sql +XEP0045_SUPPORT diff --git a/debian/jabber-muc.examples b/debian/jabber-muc.examples new file mode 100644 index 0000000..b43871f --- /dev/null +++ b/debian/jabber-muc.examples @@ -0,0 +1,2 @@ +muc-default.xml +style.css diff --git a/debian/jabber-muc.init b/debian/jabber-muc.init new file mode 100644 index 0000000..4088709 --- /dev/null +++ b/debian/jabber-muc.init @@ -0,0 +1,80 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: jabber-muc +# Required-Start: $local_fs $remote_fs $network +# Required-Stop: $local_fs $remote_fs $network +# Should-Start: +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: mu-conference +# Description: Multi user conference component for Jabber. +### END INIT INFO + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/bin/mu-conference +NAME=jabber-muc +DESC=jabber-muc +DEFFILE=/etc/default/jabber-muc +RCFILE=/etc/jabber-muc.xml + +PID=/var/run/jabber/$NAME.pid +ENABLED='0' + +if [ -f "$DEFFILE" ]; then + . "$DEFFILE" +fi + +test -x $DAEMON -a -f $RCFILE || exit 0 + +set -e + +case "$1" in + start) + if [ "$ENABLED" != "1" ]; then + echo "Not starting $DESC (Disabled in $DEFFILE)." + exit 0; + fi + + echo -n "Starting $DESC: " + start-stop-daemon --background --chuid jabber:adm --start --quiet --pidfile $PID \ + --exec $DAEMON -- -c "$RCFILE" + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon -oknodo --stop --quiet --retry 3 \ + --pidfile $PID --exec $DAEMON + echo "$NAME." + ;; + #reload) + # + # If the daemon can reload its config files on the fly + # for example by sending it SIGHUP, do it here. + # + # If the daemon responds to changes in its config file + # directly anyway, make this a do-nothing entry. + # + # echo "Reloading $DESC configuration files." + # start-stop-daemon --stop --signal 1 --quiet --pidfile \ + # /var/run/jabber/$NAME.pid --exec $DAEMON + #;; + restart|force-reload) + # + # If the "reload" option is implemented, move the "force-reload" + # option to the "reload" entry above. If not, "force-reload" is + # just the same as "restart". + # + $0 stop + sleep 3 + $0 start + ;; + *) + N=/etc/init.d/$NAME + # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/debian/jabber-muc.init.d b/debian/jabber-muc.init.d deleted file mode 100644 index 34ab144..0000000 --- a/debian/jabber-muc.init.d +++ /dev/null @@ -1,76 +0,0 @@ -#! /bin/sh -# -# skeleton example file to build /etc/init.d/ scripts. -# This file should be used to construct scripts for /etc/init.d. -# -# Written by Miquel van Smoorenburg <[EMAIL PROTECTED]>. -# Modified for Debian -# by Ian Murdock <[EMAIL PROTECTED]>. -# -# Version: @(#)skeleton 1.9 26-Feb-2001 [EMAIL PROTECTED] -# - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/sbin/jabberd -NAME=jabber-muc -DESC=jabber-muc -CMDLINE='-c /etc/jabber/jabber-muc.xml' -PID=/var/run/jabber/$NAME.pid -ENABLED='0' -MODULE=/usr/lib/jabber/mu-conference/mu-conference.so - -if [ -f /etc/default/jabber-muc ]; then - . /etc/default/jabber-muc -fi - -. /etc/jabber/functions - -test -x $DAEMON -a -f $MODULE -a "$ENABLED" -eq "1" || exit 0 - -set -e - -case "$1" in - start) - check_pid - echo -n "Starting $DESC: " - start-stop-daemon -b -c jabber:adm --start --quiet --pidfile $PID \ - --exec $DAEMON -- $CMDLINE - echo "$NAME." - ;; - stop) - echo -n "Stopping $DESC: " - start-stop-daemon -o --stop --quiet --retry 3 \ - --pidfile $PID --exec $DAEMON - echo "$NAME." - ;; - #reload) - # - # If the daemon can reload its config files on the fly - # for example by sending it SIGHUP, do it here. - # - # If the daemon responds to changes in its config file - # directly anyway, make this a do-nothing entry. - # - # echo "Reloading $DESC configuration files." - # start-stop-daemon --stop --signal 1 --quiet --pidfile \ - # /var/run/jabber/$NAME.pid --exec $DAEMON - #;; - restart|force-reload) - # - # If the "reload" option is implemented, move the "force-reload" - # option to the "reload" entry above. If not, "force-reload" is - # just the same as "restart". - # - $0 stop - sleep 3 - $0 start - ;; - *) - N=/etc/init.d/$NAME - # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $N {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/jabber-muc.install b/debian/jabber-muc.install index dd7af0d..df31c6b 100644 --- a/debian/jabber-muc.install +++ b/debian/jabber-muc.install @@ -1,2 +1 @@ -src/mu-conference.so usr/lib/jabber/mu-conference -debian/jabber-muc.xml etc/jabber +src/mu-conference usr/bin diff --git a/debian/jabber-muc.postinst b/debian/jabber-muc.postinst index 690c76a..9225c7e 100644 --- a/debian/jabber-muc.postinst +++ b/debian/jabber-muc.postinst @@ -25,10 +25,9 @@ set -e case "$1" in configure) - chown jabber:adm /etc/jabber/jabber-muc.xml - chmod 0640 /etc/jabber/jabber-muc.xml + # start the service - /etc/jabber/jabber.d/jabber-muc restart + /etc/init.d/jabber-muc restart ;; diff --git a/debian/jabber-muc.postrm b/debian/jabber-muc.postrm index d7c07e5..da89e01 100644 --- a/debian/jabber-muc.postrm +++ b/debian/jabber-muc.postrm @@ -20,7 +20,7 @@ set -e case "$1" in purge) # remove potentially empty directories if they exist - DIRS="/etc/jabber/jabber.d /etc/jabber /var/run/jabber" + DIRS="/var/run/jabber" for DIR in $DIRS; do if [ -d $DIR ]; then rmdir --ignore-fail-on-non-empty $DIR diff --git a/debian/jabber-muc.prerm b/debian/jabber-muc.prerm index 4b6404c..57f0c06 100644 --- a/debian/jabber-muc.prerm +++ b/debian/jabber-muc.prerm @@ -21,7 +21,7 @@ case "$1" in remove|upgrade|deconfigure) # install-info --quiet --remove /usr/info/jabber-muc.info.gz # stop the service - /etc/jabber/jabber.d/jabber-muc stop + /etc/init.d/jabber-muc stop ;; failed-upgrade) diff --git a/debian/jabber-muc.xml b/debian/jabber-muc.xml deleted file mode 100644 index 58e2e61..0000000 --- a/debian/jabber-muc.xml +++ /dev/null @@ -1,38 +0,0 @@ -<jabber> - - <service id="muclinker"> - <uplink/> - <connect> - <ip>127.0.0.1</ip> - <port>31518</port> - <secret>secret</secret> - </connect> - </service> - - <service id="conference.localhost"> - <load> - <conference>/usr/lib/jabber/mu-conference/mu-conference.so</conference> - </load> - <conference xmlns="jabber:config:conference"> - <public/> - <vCard> - <FN>Public Chatrooms</FN> - <DESC>This service is for public chatrooms.</DESC> - <URL>http://conference.localhost/logs/</URL> - </vCard> - <history>20</history> - <logdir>./logs/muc/</logdir> - <sadmin> - <user>[EMAIL PROTECTED]</user> - </sadmin> - <notice> - <join>has become available</join> - <leave>has left</leave> - <rename>is now known as</rename> - </notice> - </conference> - </service> - - <pidfile>/var/run/jabber/jabber-muc.pid</pidfile> - -</jabber> diff --git a/debian/patches/00list b/debian/patches/00list index 26778ae..e69de29 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1 +0,0 @@ -debian-makefile diff --git a/debian/patches/debian-makefile.dpatch b/debian/patches/debian-makefile.dpatch deleted file mode 100644 index 7fa0b58..0000000 --- a/debian/patches/debian-makefile.dpatch +++ /dev/null @@ -1,33 +0,0 @@ -#! /bin/sh -e -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch}" - -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 [EMAIL PROTECTED]@ -diff -Naur mu-conference-0.6.0.orig/src/Makefile mu-conference-0.6.0/src/Makefile ---- mu-conference-0.6.0.orig/src/Makefile 2003-11-14 21:19:44.000000000 -0700 -+++ mu-conference-0.6.0/src/Makefile 2004-01-16 15:43:14.000000000 -0700 -@@ -1,6 +1,6 @@ --include ../../platform-settings -+include /usr/lib/jabber/jabber-config - --CFLAGS:=$(CFLAGS) -I../../jabberd -I../include `pkg-config --cflags glib-2.0` -+CFLAGS:=$(CFLAGS) -I/usr/include/jabber -I../include `pkg-config --cflags glib-2.0` - LIBS:=$(LIBS) `pkg-config --libs glib-2.0` - - # Debug/Experimental diff --git a/debian/rules b/debian/rules index 70ab7b4..81f29b0 100755 --- a/debian/rules +++ b/debian/rules @@ -55,9 +55,7 @@ install: build dh_installdirs # Add here commands to install the package into debian/jabber-muc. - install -o root -g root -m 755 $(CURDIR)/debian/jabber-muc.init.d $(CURDIR)/debian/jabber-muc/etc/jabber/jabber.d/jabber-muc - install -o root -g root -m 644 $(CURDIR)/debian/jabber-muc.default $(CURDIR)/debian/jabber-muc/etc/default/jabber-muc - + # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. @@ -76,13 +74,13 @@ binary-arch: build install # dh_installemacsen # dh_installpam # dh_installmime -# dh_installinit + dh_installinit # dh_installcron # dh_installinfo dh_installman dh_link dh_strip - dh_compress + dh_compress -X.xml dh_fixperms # dh_perl # dh_python -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
