--- deejayd-0.7.2.orig/setup.py
+++ deejayd-0.7.2/setup.py
@@ -21,16 +21,50 @@
 import glob,os
 from distutils.command.build import build as distutils_build
 from distutils.core import setup,Command
+from distutils.errors import DistutilsFileError
+from distutils.dep_util import newer
+from distutils.spawn import find_executable
+
 import deejayd
 
-#
-# i18n
-#
+
+class build_manpages(Command):
+    manpages = None
+    db2man = "/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl"
+    mandir = "man/"
+    executable = find_executable('xsltproc')
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        self.manpages = glob.glob(os.path.join(self.mandir, "*.xml"))
+
+    def __get_man_section(self, filename):
+        # filename should be file.mansection.xml
+        return filename.split('.')[-2]
+
+    def run(self):
+        data_files = self.distribution.data_files
+
+        for xmlmanpage in self.manpages:
+            manpage = xmlmanpage[:-4] # remove '.xml' at the end
+            if newer(xmlmanpage, manpage):
+                cmd = (self.executable, "--nonet", "-o", self.mandir,
+                       self.db2man,
+                       xmlmanpage)
+                self.spawn(cmd)
+
+            targetpath = os.path.join("share", "man")
+            data_files.append((targetpath, (manpage, ), ))
+
+
 class build_i18n(Command):
     user_options = []
     po_package = None
     po_directory = None
     po_files = None
+    executable = find_executable('msgfmt')
 
     def initialize_options(self):
         pass
@@ -50,7 +84,7 @@
             if not os.path.exists(mo_dir):
                 os.makedirs(mo_dir)
 
-            cmd = ["msgfmt", po_file, "-o", mo_file]
+            cmd = (self.executable, po_file, "-o", mo_file)
             self.spawn(cmd)
 
             targetpath = os.path.join("share/locale", lang, "LC_MESSAGES")
@@ -59,11 +93,19 @@
 
 class deejayd_build(distutils_build):
 
+    def __has_manpages(self, command):
+        return self.distribution.cmdclass.has_key("build_manpages")\
+        and os.path.exists(build_manpages.db2man)\
+        and build_manpages.executable != None
+
+    def __has_i18n(self, command):
+        return self.distribution.cmdclass.has_key("build_i18n")\
+        and build_i18n.executable != None
+
     def finalize_options(self):
-        def has_i18n(command):
-            return self.distribution.cmdclass.has_key("build_i18n")
         distutils_build.finalize_options(self)
-        self.sub_commands.append(("build_i18n", has_i18n))
+        self.sub_commands.append(("build_i18n", self.__has_i18n))
+        self.sub_commands.append(("build_manpages", self.__has_manpages))
 
 #
 # data files
@@ -100,7 +142,9 @@
            package_data={'deejayd.ui': ['defaults.conf'],
                          'deejayd.webui': ['templates/*.xml']},
            data_files= build_data_files_list(),
-           cmdclass={"build": deejayd_build, "build_i18n": build_i18n}
+           cmdclass={"build": deejayd_build,
+                     "build_i18n": build_i18n,
+                     "build_manpages": build_manpages,}
         )
 
 # vim: ts=4 sw=4 expandtab
--- deejayd-0.7.2.orig/deejayd/sources/__init__.py
+++ deejayd-0.7.2/deejayd/sources/__init__.py
@@ -40,7 +40,7 @@
         self.sources_obj = {}
         self.current = ""
         self.db = db
-        activated_sources = config.get('general', "activated_modes").split(",")
+        activated_sources = config.getlist('general', "activated_modes")
 
         from deejayd.sources import queue
         self.sources_obj["queue"] = queue.QueueSource(db, audio_library)
--- deejayd-0.7.2.orig/deejayd/mediadb/__init__.py
+++ deejayd-0.7.2/deejayd/mediadb/__init__.py
@@ -38,7 +38,7 @@
     except library.NotFoundException,msg:
         log.err(_("Unable to init audio library : %s") % msg, fatal = True)
 
-    activated_sources = config.get('general', "activated_modes").split(",")
+    activated_sources = config.getlist('general', "activated_modes")
     if "video" in activated_sources:
         video_dir = config.get('mediadb', 'video_directory')
         try: video_library = library.VideoLibrary(db,player,video_dir,fc)
--- deejayd-0.7.2.orig/deejayd/webui/templates/playlist.xml
+++ deejayd-0.7.2/deejayd/webui/templates/playlist.xml
@@ -78,9 +78,10 @@
                 id="file-content"
                 seltype="multiple"
                 flex="1"/>
-            <groupbox>
+            <groupbox minheight="50px">
             <caption class="search-action" label="&search;"/>
             <hbox
+                flex="1"
                 id="search-box">
                 <button
                     id="search-clear"
--- deejayd-0.7.2.orig/deejayd/ui/config.py
+++ deejayd-0.7.2/deejayd/ui/config.py
@@ -46,12 +46,16 @@
     def set(self, section, variable, value):
         self.__config.set(section, variable, value)
 
+    def getlist(self, section, variable):
+        list_items = self.__config.get(section, variable).split(',')
+        return map(string.strip, list_items)
+
     def get_bind_addresses(self, service = 'net'):
-        bind_addresses = self.__config.get(service, 'bind_addresses').split(',')
-        clean_bind_addresses = map(string.strip, bind_addresses)
-        if 'all' in clean_bind_addresses:
+        bind_addresses = self.getlist(service, 'bind_addresses')
+        if 'all' in bind_addresses:
             return ['']
         else:
-            return map(string.strip, bind_addresses)
+            return bind_addresses
+
 
 # vim: ts=4 sw=4 expandtab
--- deejayd-0.7.2.orig/debian/changelog
+++ deejayd-0.7.2/debian/changelog
@@ -0,0 +1,176 @@
+deejayd (0.7.2-2) unstable; urgency=low
+
+  * Update to policy 3.8.0 (nothing to do).
+  * Add a README.Debian files for configuration information.
+  * Allow whitespace characters in activated_modes configuration variable.
+  * Upstream provided fixes for Firefox 3 in the XUL webui (search box and
+    others).
+  * Remove Debian specific manpages which have been included upstream (and
+    backport build system into this version).
+  * Some cleanups in debian/rules clean target.
+
+ -- Alexandre Rossi <alexandre.rossi@gmail.com>  Wed, 23 Jul 2008 00:06:48 +0200
+
+deejayd (0.7.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added replaygain scanning script to installed files (in docs).
+
+ -- Alexandre Rossi <alexandre.rossi@gmail.com>  Thu, 15 May 2008 21:20:56 +0200
+
+deejayd (0.7.1-3) unstable; urgency=low
+
+  * Fix medialist sql request.
+
+ -- Alexandre Rossi <alexandre.rossi@gmail.com>  Mon, 05 May 2008 20:17:38 +0200
+
+deejayd (0.7.1-2) unstable; urgency=low
+
+  * Handle permission denied on rdf dir for webui.
+  * Put back bind_adresses comment in config file.
+  * Ensure that what is out of the sqlite db is utf-8, which prevents crashing
+    of at least the add-to-playlist command when used with non-ascii characters.
+
+ -- Alexandre Rossi <alexandre.rossi@gmail.com>  Sat, 03 May 2008 11:35:17 +0200
+
+deejayd (0.7.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add missing build indep dep on gettext.
+  * Ensure binary packages versions consistency.
+  * Minor fix to short description.
+  * Make deps compatible with python (>= 2.5) with celementtree and ctypes in
+    the standard library.
+
+ -- Alexandre Rossi <alexandre.rossi@gmail.com>  Wed, 16 Apr 2008 21:59:42 +0200
+
+deejayd (0.7.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Do not declare a useless virtual package deejayd-mediabackend
+    (Closes: #472451).
+  * Fix log rotation using new log reopen on SIGHUP feature.
+  * Add upstream NEWS to docs.
+  * Fix watch file.
+
+ -- Alexandre Rossi <alexandre.rossi@gmail.com>  Sat, 29 Mar 2008 19:22:16 +0100
+
+deejayd (0.6.3-6) unstable; urgency=low
+
+  * Initial upload to Debian (Closes: #463973).
+  * Fix debian/copyright to state that some uptream files are GPL v2 only.
+  * pycentral Bug 452227 is fixed so removed related workaround in
+    debian/rules.
+
+ -- Alexandre Rossi <alexandre.rossi@gmail.com>  Tue, 18 Mar 2008 07:55:11 +0100
+
+deejayd (0.6.3-5) unstable; urgency=low
+
+  * Remove useless mediadb dir in default config.
+  * Make audio/video drivers default to auto.
+  * Logrotate support.
+  * Listen on localhost by default.
+
+ -- Alexandre Rossi <alexandre.rossi@gmail.com>  Mon, 10 Mar 2008 23:13:40 +0100
+
+deejayd (0.6.3-4) unstable; urgency=low
+
+  * Backported upstream patches :
+    - [webui] do not make tagless media files crash the javascript
+    - [mediadb] asf support
+    - do not fail to start if webui is not installed
+    - [webui] fix title
+    - [djc] fix audio_search args order to be consistent with doc
+    - [deejayd] add Flac support
+  * Remove useless tests.py file in debian diff.
+  * Point VCS browser link directly to src/ dir.
+
+ -- Alexandre Rossi <alexandre.rossi@gmail.com>  Sat, 08 Mar 2008 12:54:21 +0100
+
+deejayd (0.6.3-3) unstable; urgency=low
+
+  * Fixes thanks to comments from Steve Greenland :
+    - Remove duplicate debian/debian content.
+    - Use a GNU Make pattern rule to build manpages in debian/rules.
+
+ -- Alexandre Rossi <alexandre.rossi@gmail.com>  Thu, 06 Mar 2008 07:35:18 +0100
+
+deejayd (0.6.3-2) unstable; urgency=low
+
+  * Fixes thanks to comments from nijel@d.o (LSB, Build-Depends-Indep).
+
+ -- Alexandre Rossi <alexandre.rossi@gmail.com>  Thu, 28 Feb 2008 19:01:14 +0100
+
+deejayd (0.6.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Alexandre Rossi <alexandre.rossi@gmail.com>  Sun, 10 Feb 2008 22:12:45 +0100
+
+deejayd (0.6.2-1) UNRELEASED; urgency=low
+
+  * 0.6.2 Release.
+  * Changes since 0.6.1
+    * fix in xine backend
+      * correctly hide cursor
+      * fix xine event callback
+    * fix in mediadb (skip file with bad caracter)
+
+ -- Mickael Royer <mickael.royer@gmail.com>  Sun, 03 Feb 2008 09:47:15 +0100
+
+deejayd (0.6.1-1) UNRELEASED; urgency=low
+
+  * 0.6.1 Release.
+  * Changes since 0.6.0
+    * fix important bug in xine backend
+    * fix symlinks support in audio/video library
+
+ -- Mickael Royer <mickael.royer@gmail.com>  Mon, 28 Jan 2008 23:08:19 +0100
+
+deejayd (0.6.0-1) UNRELEASED; urgency=low
+
+  * 0.6.0 Release.
+  * Changes since 0.5.0
+      * rewrite xine backend to use ctypes
+      * xine : add gapless support
+      * improve video mode
+      * add signaling support
+      * add inotify support to update audio/video library
+      * improve webui performance
+      * add i18n support (only french translation is available for now)
+      * A lot of cleanups and bugfixes
+
+ -- Mickael Royer <mickael.royer@gmail.com>  Sat, 26 Jan 2008 17:22:49 +0100
+
+deejayd (0.5.0-1) UNRELEASED; urgency=low
+
+  * 0.5.0 Release.
+  * Changes since 0.4.1
+    * xine backend : close stream when no media has been played
+    * integrate webui in deejayd. Ajaxdj is useless now
+    * support all commands in library client and djc
+    * A lot of cleanups and bugfixes
+
+ -- Mickael Royer <mickael.royer@gmail.com>  Wed, 26 Dec 2007 10:42:18 +0100
+
+deejayd (0.4.1-1) UNRELEASED; urgency=low
+
+  * 0.4.1 Release.
+  * Changes since 0.4
+    * Fix bugs in mediadb and video source
+    * Fix documentation generation and update it
+
+ -- Mickael Royer <mickael.royer@gmail.com>  Sat, 10 Nov 2007 23:57:08 +0100
+
+deejayd (0.4-1) UNRELEASED; urgency=low
+
+  * 0.4 Release.
+  * Changes since 0.2
+    * Add dvd support
+    * Add a python library client
+    * Add a command line client : djc
+    * Improve performance and memory usage with the use of celementtree module
+    * A lot of cleanups and bugfixes
+
+ -- Mickael Royer <mickael.royer@gmail.com>  Sun, 4 Nov 2007 18:32:31 +0100
+
--- deejayd-0.7.2.orig/debian/deejayd-xine.install
+++ deejayd-0.7.2/debian/deejayd-xine.install
@@ -0,0 +1,3 @@
+usr/lib/python*/site-packages/deejayd/player/xine.py
+usr/lib/python*/site-packages/deejayd/player/_xine.py
+usr/lib/python*/site-packages/deejayd/player/display/*.py
--- deejayd-0.7.2.orig/debian/deejayd.defaults
+++ deejayd-0.7.2/debian/deejayd.defaults
@@ -0,0 +1,4 @@
+# Defaults for deejayd initscript
+
+# Additional options that are passed to the Daemon.
+DAEMON_OPTS=""
--- deejayd-0.7.2.orig/debian/README.Debian
+++ deejayd-0.7.2/debian/README.Debian
@@ -0,0 +1,41 @@
+= Deejayd for Debian =
+
+== Daemon Configuration ==
+
+All of the configuration for the daemon is kept in /etc/deejayd.conf . As for
+many daemons, for the changes in the configuration file to be taken into
+account, the daemon must be restarted.
+$ sudo invoke-rc.d deejayd restart
+
+The default configuration for deejayd is pretty minimal and you'll probably
+want to change the following items from their default value :
+- in the 'general' section, maybe enable more modes using the activated_modes
+  variable. The default does not enable video related modes.
+  activated_modes =  playlist,webradio,video,dvd
+  (this is new in version 0.7.0)
+- in the 'webui' section, enable it using the 'enabled' configuration variable.
+- you may want the daemon to be controllable from machines other than the one it
+  is running on. In the 'net' and 'webui' sections, you may want to change the
+  'bind_adresses' configuration variable to something other than 'localhost'.
+  'all' or the IP addresses of an interface you want to listen on should do the
+  trick.
+- in the 'mediadb' section, you want to change the 'music_directory' and the
+  'video_directory' configuration variables to point to where those are on your
+  machine, though symlinks in the default directories would also work.
+
+== Connection to an X server for video support ==
+
+Deejayd supports video. But it will not try to establish a connection to a
+X server until it is asked to play a video and if the 'video' mode is enabled.
+
+Connection to an existing user launched X server should be doable if deejayd
+is not launched using its initscript. On the contrary, if it is, the daemon
+must know both the display number (which does not change on most setups) and,
+and this is where the problems begin, the XAUTHORITY file, which is, on debian
+systems, generated whenever the X server is started with startx. When using a
+display manager, the same seams to happen.
+
+Some people use an initscript to launch the X server on a machine dedicated to
+deejayd. This method will be integrated in the deejayd packaging in the near
+future. More info here :
+http://sousmonlit.dyndns.org/~niol/playa/oss:debhowto:display-server
--- deejayd-0.7.2.orig/debian/rules
+++ deejayd-0.7.2/debian/rules
@@ -0,0 +1,67 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+PYVERS=$(shell pyversions -vr)
+
+build: $(PYVERS:%=build-python%)
+
+build-python%:
+	touch $@
+
+install: build $(PYVERS:%=install-python%)
+
+install-python%:
+	dh_clean -k -i
+	dh_clean -k -s
+	python$* setup.py install --no-compile\
+	         --root $(CURDIR)/debian/tmp
+
+	# Fixing example conffile location
+	mkdir $(CURDIR)/debian/tmp/etc
+	mv $(CURDIR)/debian/tmp/usr/share/doc/deejayd/deejayd.conf.example\
+	   $(CURDIR)/debian/tmp/etc/deejayd.conf
+
+	dh_install --sourcedir=$(CURDIR)/debian/tmp
+	dh_installdirs
+
+clean:
+	dh_testdir
+	dh_testroot
+
+	rm -f build-python*
+	rm -rf $(CURDIR)/build/mo
+	python setup.py clean --all
+	rm -f $(CURDIR)/deejayd/__init__.pyc
+	rm -f $(CURDIR)/MANIFEST
+	rm -f $(CURDIR)/man/*.{1,5}
+
+	dh_clean
+
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_pycentral
+	dh_installlogrotate
+	# Inspired by mpd packaging, so that ALSA scripts can run first
+	dh_installinit -u"defaults 30 15"
+	dh_installman
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary-arch: build install
+
+binary: binary-arch binary-indep
+
+.PHONY: build clean binary-indep binary-arch binary install
--- deejayd-0.7.2.orig/debian/deejayd.docs
+++ deejayd-0.7.2/debian/deejayd.docs
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/deejayd/*
--- deejayd-0.7.2.orig/debian/deejayd-gstreamer.install
+++ deejayd-0.7.2/debian/deejayd-gstreamer.install
@@ -0,0 +1 @@
+usr/lib/python*/site-packages/deejayd/player/gstreamer.py
--- deejayd-0.7.2.orig/debian/dirs
+++ deejayd-0.7.2/debian/dirs
@@ -0,0 +1 @@
+usr/bin
--- deejayd-0.7.2.orig/debian/deejayd.logrotate
+++ deejayd-0.7.2/debian/deejayd.logrotate
@@ -0,0 +1,14 @@
+/var/log/deejayd.log /var/log/deejayd.*.log {
+    rotate 4
+    weekly
+    compress
+    copytruncate
+    missingok
+    notifempty
+    sharedscripts
+    postrotate
+        if invoke-rc.d --quiet deejayd status > /dev/null; then
+            invoke-rc.d --quiet deejayd reload > /dev/null
+        fi
+    endscript
+}
--- deejayd-0.7.2.orig/debian/deejayd.init
+++ deejayd-0.7.2/debian/deejayd.init
@@ -0,0 +1,193 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          deejayd
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Should-Start:      alsa-utils
+# Should-Stop:       alsa-utils
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Launch deejayd media player daemon.
+# Description:       Prepare environement and launch the deejayd music player
+#                    daemon.
+### END INIT INFO
+
+# Author: Alexandre Rossi <alexandre.rossi@gmail.com>
+
+# Do NOT "set -e"
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Deejayd media player daemon"
+NAME=deejayd
+DAEMON=/usr/bin/$NAME
+DAEMON_USER=$NAME
+HOME=/var/lib/$DAEMON_USER
+PIDFILE=/var/run/$NAME.pid
+LOGFILE=/var/log/$NAME.log
+WEBUI_LOGFILE=/var/log/$NAME-webui.log
+DAEMON_ARGS="-u $DAEMON_USER -g audio,cdrom -p $PIDFILE -l $LOGFILE -w $WEBUI_LOGFILE $DAEMON_OPTS"
+SCRIPTNAME=/etc/init.d/$NAME
+
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Create logfiles if they do not exist
+for FILE in "$LOGFILE" "$WEBUI_LOGFILE"
+do
+    if [ ! -r "$FILE" ]
+    then
+        touch $FILE
+        chown deejayd:adm $FILE
+    fi
+done
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+	# Return
+	#   0 if daemon has been started
+	#   1 if daemon was already running
+	#   2 if daemon could not be started
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --pidfile $PIDFILE --exec $DAEMON -- \
+		$DAEMON_ARGS \
+		|| return 2
+	# Add code here, if necessary, that waits for the process to be ready
+	# to handle requests from services started subsequently which depend
+	# on this one.  As a last resort, sleep for some time.
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+	# Return
+	#   0 if daemon has been stopped
+	#   1 if daemon was already stopped
+	#   2 if daemon could not be stopped
+	#   other if a failure occurred
+	start-stop-daemon --user $DAEMON_USER --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+	RETVAL="$?"
+	[ "$RETVAL" = 2 ] && return 2
+	# Wait for children to finish too if this is a daemon that forks
+	# and if the daemon is only ever run from this initscript.
+	# If the above conditions are not satisfied then add some other code
+	# that waits for the process to drop all resources that could be
+	# needed by services started subsequently.  A last resort is to
+	# sleep for some time.
+	start-stop-daemon --user $DAEMON_USER --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
+	[ "$?" = 2 ] && return 2
+	# Many daemons don't delete their pidfiles when they exit.
+	rm -f $PIDFILE
+	return "$RETVAL"
+}
+
+#
+# Function that sends a SIGHUP to the daemon/service
+#
+do_reload() {
+	#
+	# If the daemon can reload its configuration without
+	# restarting (for example, when it is sent a SIGHUP),
+	# then implement that here.
+	#
+	start-stop-daemon --user $DAEMON_USER --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
+	return 0
+}
+
+#
+# Function used to determine if the program is alive
+#
+is_alive () {
+    ret=1
+    if [ -r $PIDFILE ] ; then
+        pid=`cat $PIDFILE`
+        if [ -e /proc/$pid ] ; then
+            procname=`/bin/ps h -p $pid -C $NAME`
+            [ -n "$procname" ] && ret=0
+        fi
+    fi
+    return $ret
+}
+
+
+case "$1" in
+  start)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  stop)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  reload|force-reload)
+	#
+	# If do_reload() is not implemented then leave this commented out
+	# and leave 'force-reload' as an alias for 'restart'.
+	#
+	log_daemon_msg "Reloading $DESC" "$NAME"
+	do_reload
+	log_end_msg $?
+	;;
+  restart|force-reload)
+	#
+	# If the "reload" option is implemented then remove the
+	# 'force-reload' alias
+	#
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0|1)
+		do_start
+		case "$?" in
+			0) log_end_msg 0 ;;
+			1) log_end_msg 1 ;; # Old process is still running
+			*) log_end_msg 1 ;; # Failed to start
+		esac
+		;;
+	  *)
+	  	# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
+  status)
+    echo -n "Status of $DESC: "
+    if is_alive ; then
+        echo "alive."
+    else
+        echo "dead."
+        exit 1
+    fi
+    ;;
+  *)
+	echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload|status}" >&2
+	exit 3
+	;;
+esac
+
+:
--- deejayd-0.7.2.orig/debian/deejayd.postinst
+++ deejayd-0.7.2/debian/deejayd.postinst
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+DEEJAYD_USER=deejayd
+
+if ! getent passwd $DEEJAYD_USER >/dev/null; then
+    adduser --quiet --ingroup audio --system --no-create-home \
+            --home /var/lib/deejayd $DEEJAYD_USER
+    adduser $DEEJAYD_USER cdrom
+fi
+
+for i in /var/log/deejayd.log /var/lib/deejayd;
+do
+    if ! dpkg-statoverride --list --quiet "$i" >/dev/null; then
+        dpkg-statoverride --force --quiet --update \
+                          --add deejayd audio 0755 "$i"
+    fi
+done
+
+#DEBHELPER#
--- deejayd-0.7.2.orig/debian/compat
+++ deejayd-0.7.2/debian/compat
@@ -0,0 +1 @@
+5
--- deejayd-0.7.2.orig/debian/deejayd.install
+++ deejayd-0.7.2/debian/deejayd.install
@@ -0,0 +1,15 @@
+usr/bin/deejayd
+usr/lib/python*/site-packages/deejayd/core.py
+usr/lib/python*/site-packages/deejayd/component.py
+usr/lib/python*/site-packages/deejayd/net/commandsXML.py
+usr/lib/python*/site-packages/deejayd/net/deejaydProtocol.py
+usr/lib/python*/site-packages/deejayd/mediadb/*.py
+usr/lib/python*/site-packages/deejayd/mediadb/formats/*.py
+usr/lib/python*/site-packages/deejayd/player/__init__.py
+usr/lib/python*/site-packages/deejayd/player/_base.py
+usr/lib/python*/site-packages/deejayd/sources/*.py
+usr/lib/python*/site-packages/deejayd/ui/*
+usr/lib/python*/site-packages/deejayd/database/*
+usr/lib/python*/site-packages/deejayd/database/upgrade/*
+usr/share/locale/*/LC_MESSAGES/deejayd.mo
+etc/deejayd.conf
--- deejayd-0.7.2.orig/debian/deejayd.manpages
+++ deejayd-0.7.2/debian/deejayd.manpages
@@ -0,0 +1,2 @@
+man/deejayd.1
+man/deejayd.conf.5
--- deejayd-0.7.2.orig/debian/deejayd-webui.logrotate
+++ deejayd-0.7.2/debian/deejayd-webui.logrotate
@@ -0,0 +1,14 @@
+/var/log/deejayd-webui.log /var/log/deejayd-webui.*.log {
+    rotate 4
+    weekly
+    compress
+    copytruncate
+    missingok
+    notifempty
+    sharedscripts
+    postrotate
+        if invoke-rc.d --quiet deejayd status > /dev/null; then
+            invoke-rc.d --quiet deejayd reload > /dev/null
+        fi
+    endscript
+}
--- deejayd-0.7.2.orig/debian/deejayd-webui.install
+++ deejayd-0.7.2/debian/deejayd-webui.install
@@ -0,0 +1,7 @@
+usr/lib/python*/site-packages/deejayd/webui/*.py
+usr/lib/python*/site-packages/deejayd/webui/templates/*.xml
+usr/share/deejayd/htdocs/js/*.js
+usr/share/deejayd/htdocs/xul/scripts/*.js
+usr/share/deejayd/htdocs/xul/bindings/*.*
+usr/share/deejayd/htdocs/themes/default/*.css
+usr/share/deejayd/htdocs/themes/default/images/*.png
--- deejayd-0.7.2.orig/debian/control
+++ deejayd-0.7.2/debian/control
@@ -0,0 +1,72 @@
+Source: deejayd
+Section: sound
+Priority: extra
+Maintainer: Alexandre Rossi <alexandre.rossi@gmail.com>
+Build-Depends: debhelper (>= 5.0.38), python
+Build-Depends-Indep: python-central (>= 0.5.6), gettext, xsltproc, docbook-xsl
+Standards-Version: 3.8.0
+XS-Python-Version: current, >= 2.4
+Homepage: http://mroy31.dyndns.org/~roy/projects/deejayd
+Vcs-Darcs: http://mroy31.dyndns.org/~roy/repository/deejayd
+Vcs-Browser: http://mroy31.dyndns.org/~roy/darcsweb/darcsweb.cgi?r=deejayd;a=tree;f=/src
+
+Package: deejayd
+Architecture: all
+Depends: ${python:Depends}, lsb-base (>= 3.0-6), logrotate, adduser,
+         deejayd-client (= ${binary:Version}),
+         deejayd-xine (= ${binary:Version}) | deejayd-gstreamer (= ${binary:Version}),
+         python-twisted,
+         python-pysqlite2 | python-mysqldb,
+         python-mutagen
+Recommends: python-pyinotify (>= 0.6.0)
+Suggests: deejayd-webui, djc
+XB-Python-Version: ${python:Versions}
+Description: Network controllable media player daemon
+ Deejayd is a multi purpose media player that can be completely controlled
+ through the network using XML messages.
+ It suppports playlists, searching, many media tags. It can playback many
+ music and video formats using either its xine (recommended) or its GStreamer
+ backend.
+
+Package: deejayd-webui
+Architecture: all
+Depends: ${python:Depends}, deejayd (= ${binary:Version}), logrotate, python-twisted-web
+XB-Python-Version: ${python:Versions}
+Description: Web interface for deejayd
+ This package provides a XUL web interface to control your deejayd server. The
+ required webserver is embedded in the deejayd daemon.
+
+Package: deejayd-client
+Architecture: all
+Depends: ${python:Depends}, python-celementtree | python (>= 2.5)
+XB-Python-Version: ${python:Versions}
+Description: Client library to access the deejayd server
+ This package provides easy to use classes to manipulate the deejayd server,
+ abstracting XML message processing and network operations. It fully implements
+ the set of features exploitable from the server.
+
+Package: djc
+Architecture: all
+Depends: ${python:Depends}, deejayd-client (= ${binary:Version})
+XB-Python-Version: ${python:Versions}
+Description: Command line basic client to the deejayd server
+ djc provides a subset of deejayd commands for your deejayd server to be
+ reachable from the command line.
+
+Package: deejayd-xine
+Architecture: all
+Depends: ${python:Depends},
+         python-ctypes (>= 1.0.0) | python (>= 2.5),
+         libxine1, libx11-6, libxext6
+Recommends: lsdvd
+XB-Python-Version: ${python:Versions}
+Description: Deejayd XINE backend
+ The deejayd media backend using the XINE library.
+
+Package: deejayd-gstreamer
+Architecture: all
+Depends: ${python:Depends}, gstreamer0.10-plugins-base, python-gst0.10
+Recommends: gstreamer0.10-gnomevfs, lsdvd
+XB-Python-Version: ${python:Versions}
+Description: Deejayd GStreamer backend
+ The deejayd media backend using the GStreamer library.
--- deejayd-0.7.2.orig/debian/djc.manpages
+++ deejayd-0.7.2/debian/djc.manpages
@@ -0,0 +1 @@
+man/djc.1
--- deejayd-0.7.2.orig/debian/deejayd.dirs
+++ deejayd-0.7.2/debian/deejayd.dirs
@@ -0,0 +1 @@
+var/lib/deejayd
--- deejayd-0.7.2.orig/debian/deejayd-client.install
+++ deejayd-0.7.2/debian/deejayd-client.install
@@ -0,0 +1,5 @@
+usr/lib/python*/site-packages/deejayd/__init__.py
+usr/lib/python*/site-packages/deejayd/interfaces.py
+usr/lib/python*/site-packages/deejayd/net/xmlbuilders.py
+usr/lib/python*/site-packages/deejayd/net/client.py
+usr/lib/python*/site-packages/deejayd/net/__init__.py
--- deejayd-0.7.2.orig/debian/copyright
+++ deejayd-0.7.2/debian/copyright
@@ -0,0 +1,40 @@
+This package was debianized by Alexandre Rossi <alexandre.rossi@gmail.com>.
+
+It was downloaded from <http://mroy31.dyndns.org/~roy/projects/deejayd>
+
+Upstream Authors:
+
+    Mickaël Royer <mickael.royer@gmail.com>
+    Alexandre Rossi <alexandre.rossi@gmail.com>
+
+Copyright:
+
+    Copyright (C) 2006-2008 Mickaël Royer
+
+License:
+
+    This package 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 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 package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2007-2008,
+Alexandre Rossi <alexandre.rossi@gmail.com> and is licensed under the GPL,
+see above.
+
+The Gentoo packaging, which is part of the upstream tarball, is licensed under
+the GPL v2. This consists of the files located under the gentoo/ directory.
+On Debian systems, the complete text of the GNU General Public
+License can be found in `/usr/share/common-licenses/GPL-2'.
--- deejayd-0.7.2.orig/debian/watch
+++ deejayd-0.7.2/debian/watch
@@ -0,0 +1,4 @@
+# Compulsory line, this is a version 3 file
+version=3
+
+http://mroy31.dyndns.org/~roy/archives/deejayd/ deejayd-([\d\.]*)\.tar\.gz
--- deejayd-0.7.2.orig/debian/djc.install
+++ deejayd-0.7.2/debian/djc.install
@@ -0,0 +1 @@
+usr/bin/djc
--- deejayd-0.7.2.orig/data/htdocs/xul/scripts/player.js
+++ deejayd-0.7.2/data/htdocs/xul/scripts/player.js
@@ -59,7 +59,8 @@
             removeNode(media_info.firstChild);
         // hide option block
         var rows = Array("audio-row", "subtitle-row", "av_offset-row",
-            "sub_offset-row", "player-seekbar", "current-media");
+            "sub_offset-row", "player-seekbar", "current-media",
+            "playeroption-button");
         for (ix in rows) {
             $(rows[ix]).style.visibility = "collapse";
             }
--- deejayd-0.7.2.orig/data/htdocs/xul/scripts/commonTree.js
+++ deejayd-0.7.2/data/htdocs/xul/scripts/commonTree.js
@@ -91,8 +91,13 @@
 
         var context_x = evt.clientX + 5;
         var context_y = evt.clientY;
-        menu.showPopup(this.tree,context_x,context_y,"context",
-            null,null,null);
+        try { // Firefox 3
+            menu.openPopup(null , "",context_x,context_y,true,false);
+            }
+        catch (ex) { // Firefox 2
+            menu.showPopup(this.tree,context_x,context_y,"context",
+                null,null,null);
+            }
     };
 
     this.setPlaying = function(pos, id, state)
--- deejayd-0.7.2.orig/scripts/deejayd
+++ deejayd-0.7.2/scripts/deejayd
@@ -169,7 +169,7 @@
     ##################
     config = DeejaydConfig()
     media_backend = config.get("general", "media_backend")
-    modes = config.get("general", "activated_modes").split(",")
+    modes = config.getlist("general", "activated_modes")
     video_support = "video" in modes or "dvd" in modes
     if media_backend == "gstreamer":
         if video_support:
--- deejayd-0.7.2.orig/man/deejayd.conf.5.xml
+++ deejayd-0.7.2/man/deejayd.conf.5.xml
@@ -0,0 +1,484 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % deejaydent SYSTEM "deejayd.ent">
+%deejaydent;
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Alexandre</firstname>">
+  <!ENTITY dhsurname   "<surname>Rossi</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>June, 30th 2008</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>5</manvolnum>">
+  <!ENTITY dhemail     "<email>alexandre.rossi@gmail.com</email>">
+  <!ENTITY dhusername  "Alexandre Rossi">
+  <!ENTITY dhucpackage "<refentrytitle>DEEJAYD.CONF</refentrytitle>">
+  <!ENTITY dhpackage   "deejayd.conf">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <copyright>
+      <year>2008</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+    <refpurpose>Site-wide configuration file for deejayd,
+                a media player daemon.</refpurpose>
+  </refnamediv>
+
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>The file <filename>/etc/deejayd.conf</filename> is an INI like file
+    which configures <literal>deejayd</literal>. The format looks like this :
+    </para>
+
+<informalexample><programlisting>
+[sectionname]
+variable = value
+othervariable = othervalue
+
+[othersection]
+foo = bar
+</programlisting></informalexample>
+
+  </refsect1>
+  <refsect1>
+    <title>general section</title>
+
+    <para>This section defines the <parameter>general</parameter> section
+    configuration values for all of deejayd components.</para>
+
+    <variablelist>
+
+      <varlistentry>
+        <term>log</term>
+        <listitem>
+          <para>Log level. Possible values are
+            <parameter>error</parameter> to log only errors,
+            <parameter>info</parameter> to be more verbose and
+            <parameter>debug</parameter> to log all messages.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>activated_modes</term>
+        <listitem>
+          <para>Modes enabled. Available modes are :
+            <parameter>playlist</parameter> for audio playlists,
+            <parameter>webradio</parameter> for streamed webradios,
+            <parameter>video</parameter> for video directories playback,
+            <parameter>dvd</parameter> for DVD playback.
+            As an example :
+          </para>
+<informalexample><programlisting>
+activated_modes = playlist, webradio, video
+</programlisting></informalexample>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>fullscreen</term>
+        <listitem>
+          <para>Fullscreen video. This is mainly a debugging configuration
+          value and you want this to be set to <parameter>yes</parameter> if
+          you use the video mode. Set this to <parameter>no</parameter> if you
+          want to be able to control deejayd using some graphical client on
+          the same display.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>replaygain</term>
+        <listitem>
+          <para>Replaygain support, <parameter>yes</parameter> or
+           <parameter>no</parameter>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>media_backend</term>
+        <listitem>
+          <para>The chosen media backend. Possible values are :
+            <parameter>auto</parameter> for whichever works, trying first with
+            Xine,
+            <parameter>xine</parameter> for the Xine backend,
+            <parameter>gstreamer</parameter> for the GStreamer backend.
+          </para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </refsect1>
+
+  <refsect1>
+    <title>net section</title>
+
+    <para>This section defines the <parameter>net</parameter> section
+    configuration values. This defines all that relates to the TCP XML
+    messaging interface to deejayd.</para>
+
+    <variablelist>
+
+      <varlistentry>
+        <term>enabled</term>
+        <listitem>
+          <para>Remote control using XML messages, <parameter>yes</parameter>
+          or <parameter>no</parameter>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>port</term>
+        <listitem>
+          <para>The numerical TCP port number to listen on for XML messages,
+          <parameter>yes</parameter> or <parameter>no</parameter>.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>bind_addresses</term>
+        <listitem>
+          <para>The hostname(s), the IP address(es) of the network ipv4
+          interface to listen on for XML messages, or
+          <parameter>all</parameter> to listen on all available interfaces.
+          </para>
+<informalexample><programlisting>
+bind_addresses = localhost, 192.168.51.1, 10.2.3.4
+</programlisting></informalexample>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>webui section</title>
+
+    <para>This section defines the <parameter>webui</parameter> section
+    configuration values. This defines all that relates to the HTTP web user
+    interface to deejayd.</para>
+
+    <variablelist>
+
+      <varlistentry>
+        <term>enabled</term>
+        <listitem>
+          <para>Remote control using the HTTP web ui, <parameter>yes</parameter>
+          or <parameter>no</parameter>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>port</term>
+        <listitem>
+          <para>The numerical TCP port number to listen on for HTTP request.
+          <parameter>yes</parameter> or <parameter>no</parameter>. You can then
+          access the web ui by pointing your browser to
+          <filename>http://deejayd-host:port/</filename>.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>bind_addresses</term>
+        <listitem>
+          <para>The hostname(s), the IP address(es) of the network ipv4
+          interface to listen on for HTTP requests, or
+          <parameter>all</parameter> to listen on all available interfaces.
+          </para>
+<informalexample><programlisting>
+bind_addresses = 192.168.51.2, 10.0.0.3
+</programlisting></informalexample>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>htdocs_dir</term>
+        <listitem>
+          <para>The path to the directory which contains the static files
+          used by the webui. You obviously do not want to change this as those
+          files should have come with your distribution. But these should be
+          changed for a local (i.e. without appropriate packaging)
+          installation. This should probably be autodetected.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>rdf_dir</term>
+        <listitem>
+          <para>This is a temporary directory used by the deejayd webui for
+          caching. It should probably be located in <filename>/tmp</filename>.
+          The only use case which would involve changing this would be for
+          running multiple deejayd daemons running on the same host (with both
+          webuis enabled).
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>refresh</term>
+        <listitem>
+          <para>Automatic refreshing time for the webui (in seconds). This is
+          the delay after which your browser will be asked to reload the web ui
+          state (song position, current song, etc). Set to
+          <parameter>0</parameter> to disable this automatic reloading.
+          </para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>database section</title>
+
+    <para>This section defines the <parameter>database</parameter> section
+    configuration values. This defines all that relates to the internal media
+    database used by deejayd.</para>
+
+    <variablelist>
+
+      <varlistentry>
+        <term>db_type</term>
+        <listitem>
+          <para>Database backend used, among <parameter>sqlite</parameter>
+          and <parameter>mysql</parameter>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>db_name</term>
+        <listitem>
+          <para>(SQLite only) The full path to the sqlite database file.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>db_user</term>
+        <listitem>
+          <para>(MySQL only) The username to use to connect to the database.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>db_password</term>
+        <listitem>
+          <para>(MySQL only) The password to use to connect to the database.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>db_host</term>
+        <listitem>
+          <para>(MySQL only) The host to try to connect to to reach the
+          database.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>db_port</term>
+        <listitem>
+          <para>(MySQL only) The port to try to connect to to reach the
+          database. Usually <parameter>3306</parameter>.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>mediadb section</title>
+
+    <para>This section defines the <parameter>mediadb</parameter> section
+    configuration values. This defines all that relates to the relationship
+    between you media files and deejayd and its database.</para>
+
+    <para>Symlinked directories in both audio and video locations will be
+    followed and watched if <literal>inotify</literal> is supported.</para>
+
+    <variablelist>
+
+      <varlistentry>
+        <term>music_directory</term>
+        <listitem>
+          <para>The full path to the directory holding you music files.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>video_directory</term>
+        <listitem>
+          <para>The full path to the directory holding you video files.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>filesystem_charset</term>
+        <listitem>
+          <para>The character set to use to decode your filenames. This should
+          probably be autodetected.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>gstreamer section</title>
+
+    <para>This section defines the <parameter>gstreamer</parameter> section
+    configuration values. Those options are specific to the GStreamer backend.
+    </para>
+
+    <variablelist>
+
+      <varlistentry>
+        <term>audio_output</term>
+        <listitem>
+          <para>The output device to use. This is usually one among
+            <parameter>auto</parameter>,
+            <parameter>alsa</parameter>,
+            <parameter>oss</parameter>,
+            <parameter>esd</parameter>, etc.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>alsa_card</term>
+        <listitem>
+          <para>Optionnaly, the alsa card to output to,
+          e.g. <parameter>hw:2</parameter>.
+          This is usefull if you have more than one soundcard.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>video_output</term>
+        <listitem>
+          <para>The video driver to use. This is usually one among
+            <parameter>auto</parameter>,
+            <parameter>xv</parameter>,
+            <parameter>x</parameter>, etc.
+          </para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>xine section</title>
+
+    <para>This section defines the <parameter>xine</parameter> section
+    configuration values. Those options are specific to the Xine backend.
+    </para>
+
+    <para>The Xine backend may be customised even more using de Xine
+    configuration file used by deejayd. This is usually
+    <filename>~/.xine/config</filename>, <parameter>~</parameter> being
+    to home directory of the user running deejayd. This should change to be
+    <filename>/etc</filename>.
+    </para>
+
+    <variablelist>
+
+      <varlistentry>
+        <term>audio_output</term>
+        <listitem>
+          <para>The output device to use. This is usually one among
+            <parameter>auto</parameter>,
+            <parameter>alsa</parameter>,
+            <parameter>oss</parameter>, etc.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>video_output</term>
+        <listitem>
+          <para>The video driver to use. This is usually one among
+            <parameter>auto</parameter>,
+            <parameter>xv</parameter>,
+            <parameter>x</parameter>, etc.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>video_display</term>
+        <listitem>
+          <para>The X display to play the video to.
+          Usually <parameter>:0.0</parameter>.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>osd_support</term>
+        <listitem>
+          <para>On-screen display enabled <parameter>yes</parameter> or
+          <parameter>no</parameter>.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>osd_font_size</term>
+        <listitem>
+          <para>The On-screen display font size, an integer.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>&deejayd;.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &dhemail; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the &gnu; General Public License, Version 2 any
+	  later version published by the Free Software Foundation.
+    </para>
+	<para>
+	  On Debian systems, the complete text of the GNU General Public
+	  License can be found in /usr/share/common-licenses/GPL.
+	</para>
+
+  </refsect1>
+</refentry>
--- deejayd-0.7.2.orig/man/djc.1.xml
+++ deejayd-0.7.2/man/djc.1.xml
@@ -0,0 +1,126 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % deejaydent SYSTEM "deejayd.ent">
+%deejaydent;
+
+<!--
+
+Process this file with an XSLT processor: `xsltproc \
+-''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl manpage.dbk'.  A manual page
+<package>.<section> will be generated.  You may view the
+manual page with: nroff -man <package>.<section> | less'.  A
+typical entry in a Makefile or Makefile.am is:
+
+DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl
+XP=xsltproc -''-nonet
+
+manpage.1: manpage.dbk
+        $(XP) $(DB2MAN) $<
+
+The xsltproc binary is found in the xsltproc package.  The
+XSL files are in docbook-xsl.  Please remember that if you
+create the nroff version in one of the debian/rules file
+targets (such as build), you will need to include xsltproc
+and docbook-xsl in your Build-Depends control field.
+
+-->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Alexandre</firstname>">
+  <!ENTITY dhsurname   "<surname>Rossi</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>February, 3rd 2008</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>alexandre.rossi@gmail.com</email>">
+  <!ENTITY dhusername  "Alexandre Rossi">
+  <!ENTITY dhucpackage "<refentrytitle>DEEJAYD</refentrytitle>">
+  <!ENTITY dhpackage   "djc">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <copyright>
+      <year>2008</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>A command line client to the the Deejayd media player daemon.</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+      <arg><option>-h | <replaceable>options</replaceable></option></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command>.</para>
+
+    <para>This manual page was written for the &debian; distribution
+      because the original program does not have a manual page.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <para>These programs follow the usual &gnu; command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.  For a complete description, see the
+      <option>-h</option> switch.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>-h</option>
+          <option>--help</option>
+        </term>
+        <listitem>
+          <para>Show summary of options.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>&deejayd;.</para>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &dhemail; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the &gnu; General Public License, Version 2 any
+	  later version published by the Free Software Foundation.
+    </para>
+	<para>
+	  On Debian systems, the complete text of the GNU General Public
+	  License can be found in /usr/share/common-licenses/GPL.
+	</para>
+
+  </refsect1>
+</refentry>
--- deejayd-0.7.2.orig/man/deejayd.1.xml
+++ deejayd-0.7.2/man/deejayd.1.xml
@@ -0,0 +1,134 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % deejaydent SYSTEM "deejayd.ent">
+%deejaydent;
+
+<!--
+
+Process this file with an XSLT processor: `xsltproc \
+-''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl manpage.dbk'.  A manual page
+<package>.<section> will be generated.  You may view the
+manual page with: nroff -man <package>.<section> | less'.  A
+typical entry in a Makefile or Makefile.am is:
+
+DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl
+XP=xsltproc -''-nonet
+
+manpage.1: manpage.dbk
+        $(XP) $(DB2MAN) $<
+
+The xsltproc binary is found in the xsltproc package.  The
+XSL files are in docbook-xsl.  Please remember that if you
+create the nroff version in one of the debian/rules file
+targets (such as build), you will need to include xsltproc
+and docbook-xsl in your Build-Depends control field.
+
+-->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Alexandre</firstname>">
+  <!ENTITY dhsurname   "<surname>Rossi</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>February, 3rd 2008</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>alexandre.rossi@gmail.com</email>">
+  <!ENTITY dhusername  "Alexandre Rossi">
+  <!ENTITY dhucpackage "<refentrytitle>DEEJAYD</refentrytitle>">
+  <!ENTITY dhpackage   "deejayd">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <copyright>
+      <year>2008</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+    <refpurpose>A media player daemon.</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+      <arg><option>-h | <replaceable>options</replaceable></option></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para>This manual page was written for the &debian; distribution
+      because the original program does not have a manual page.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <para>These programs follow the usual &gnu; command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.  For a complete description, see the
+      <option>-h</option> switch.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>-h</option>
+          <option>--help</option>
+        </term>
+        <listitem>
+          <para>Show summary of options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>
+          <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version of program.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>&deejayd-conf;, &djc;.</para>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &dhemail; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the &gnu; General Public License, Version 2 any
+	  later version published by the Free Software Foundation.
+    </para>
+	<para>
+	  On Debian systems, the complete text of the GNU General Public
+	  License can be found in /usr/share/common-licenses/GPL.
+	</para>
+
+  </refsect1>
+</refentry>
+
--- deejayd-0.7.2.orig/man/deejayd.ent
+++ deejayd-0.7.2/man/deejayd.ent
@@ -0,0 +1,18 @@
+<!-- Cross references to other man pages -->
+<!ENTITY deejayd "<citerefentry>
+    <refentrytitle><command>deejayd</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY deejayd-conf "<citerefentry>
+    <refentrytitle><filename>deejayd.conf</filename></refentrytitle>
+    <manvolnum>5</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY djc "<citerefentry>
+    <refentrytitle><command>djc</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>