removed debian dir

moved source code to src/ dir

32 files changed, 6 insertions, 316 deletions

diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 2088a92..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,20 +0,0 @@
-rhdropbox (0.2.1-1) unstable; urgency=low
-
-  * ignoring SIG_CHLD and SIG_PIPE by default
-  * fixed memory error at client handling
-
- -- Christian Pointner <equinox@helsinki.at>  Mon, 4 Oct 2010 17:19:31 +0200
-
-rhdropbox (0.2-1) unstable; urgency=low
-
-  * added -d|--dir argument (initial path list at startup)
-  * added max-child capability
-
- -- Christian Pointner <equinox@helsinki.at>  Tue, 16 Feb 2010 16:10:31 +0100
-	
-rhdropbox (0.1-1) unstable; urgency=low
-
-  * Initial release
-
- -- Christian Pointner <equinox@helsinki.at>  Mon, 16 Dec 2009 13:22:45 +0100
-
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7ed6ff8..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 9f3795c..0000000
--- a/debian/control
+++ /dev/null
@@ -1,17 +0,0 @@
-Source: rhdropbox
-Section: misc
-Priority: extra
-Maintainer: Christian Pointner <equinox@helsinki.at>
-Build-Depends: debhelper (>= 5)
-Standards-Version: 3.8.3
-Homepage: http://www.helsinki.at/
-
-Package: rhdropbox
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Description: Radio Helsinki dropbox daemon using inotify
- rhdropbox is a small daemon which can be used to watch one or more 
- directories for new files. When a new file is detected a external program. 
- Aditional directories can be added to the damons watch list using a simple
- unix socket based command interface.
-
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 505b039..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,28 +0,0 @@
-This package was debianized by Christian Pointner <equinox@helsinki.at> on
-Fri, 29 May 2009 11:23:42 +0200.
-
-Upstream Author: Christian Pointner <equinox@helsinki.at>
-
-Copyright: 2009-2010 Christian Pointner
-
-License:
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-3'.
-
-The Debian packaging is © 2009, Christian Pointner <equinox@helsinki.at> and
-is licensed under the GPL, see above.
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100755
index 672dae8..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# postinst script for rhdropbox
-
-set -e
-
-if [ -x "/etc/init.d/rhdropbox" ]; then
-  update-rc.d rhdropbox defaults >/dev/null
-fi
-
-
diff --git a/debian/postrm b/debian/postrm
deleted file mode 100755
index dc16a9d..0000000
--- a/debian/postrm
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# postrm script for rhdropbox
-
-set -e
-
-if [ "$1" = "purge" ] ; then
-   update-rc.d rhdropbox remove >/dev/null || exit $?
-fi
-
diff --git a/debian/prerm b/debian/prerm
deleted file mode 100755
index 9ddebb7..0000000
--- a/debian/prerm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# prerm script for rhdropbox
-
-set -e
-
-if [ -x "/etc/init.d/rhdropbox" ] && [ "$1" = remove ]; then
-  if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-    invoke-rc.d rhdropbox stop || true
-  else
-    /etc/init.d/rhdropbox stop || true
-  fi
-fi
diff --git a/debian/rhdropbox.default b/debian/rhdropbox.default
deleted file mode 100644
index c32d348..0000000
--- a/debian/rhdropbox.default
+++ /dev/null
@@ -1,5 +0,0 @@
-# Defaults for rhdropbox initscript
-# sourced by /etc/init.d/rhdropbox
-
-# Additional options that are passed to the Daemon.
-DAEMONOPTS=""
diff --git a/debian/rhdropbox.init b/debian/rhdropbox.init
deleted file mode 100755
index 429c682..0000000
--- a/debian/rhdropbox.init
+++ /dev/null
@@ -1,139 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          rhdropbox
-# Required-Start:    $syslog
-# Required-Stop:     
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start radio helsinki dropbox daemon at boot time
-# Description:       Enables dropboxes
-### END INIT INFO
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/rhdropbox
-CONFIG_DIR=/etc/rhdropbox
-NAME=rhdropbox
-DESC=rhdropbox
-VARRUN_DIR=/var/run/$NAME
-
-test -x $DAEMON || exit 0
-
-# Include rhdropbox defaults if available
-if [ -f /etc/default/rhdropbox ] ; then
-  . /etc/default/rhdropbox
-fi
-
-start_db () {
-  STATUS="OK"
-  if [ -f $CONFIG_DIR/$DBNAME/config ] ; then
-    NEWFILE=''
-    test -f  $CONFIG_DIR/$DBNAME/newfile.sh && NEWFILE="-x $CONFIG_DIR/$DBNAME/newfile.sh"
-    CHROOTDIR=`grep '^chroot' < $CONFIG_DIR/$DBNAME/config | sed 's/chroot\s*//'`
-    if [ -n "$CHROOTDIR" ] ; then
-      test -d $CHROOTDIR || mkdir -p $CHROOTDIR
-    fi
-    test -d $VARRUN_DIR || mkdir -p $VARRUN_DIR
-    chmod 777 $VARRUN_DIR
-    DAEMONARG=`sed 's/#.*//' < $CONFIG_DIR/$DBNAME/config | grep -e '\w' | sed  's/^/--/' | tr '\n' ' '`
-    $DAEMON --write-pid $VARRUN_DIR/$DBNAME.pid $NEWFILE $DAEMONOPTS $DAEMONARG || STATUS="FAILED"
-  else
-    STATUS="no config found"
-  fi
-  echo -n "($STATUS)"
-}
-
-stop_db () {
-  kill `cat $PIDFILE` || true
-  rm $PIDFILE
-}
-
-set -e
-case "$1" in
-  start)
-  echo -n "Starting $DESC:"
-  if test -z "$2" ; then
-    if [ -f $CONFIG_DIR/autostart ] ; then
-      for DBNAME in `sed 's/#.*//'  <  $CONFIG_DIR/autostart | grep -e '\w'`; do
-        echo -n " $DBNAME"
-        start_db
-      done
-    else
-      echo " no config found"
-      exit 1;
-    fi
-  else
-    while shift ; do
-      [ -z "$1" ] && break
-      DBNAME=$1
-      echo -n " $DBNAME"
-      start_db
-    done
-  fi
-  echo "."
-  ;;
-  stop)
-  echo -n "Stoping $DESC:"
-  if test -z "$2" ; then
-    for PIDFILE in `ls $VARRUN_DIR/*.pid 2> /dev/null`; do
-      DBNAME=`echo $PIDFILE | cut -c20-`
-      DBNAME=${DBNAME%%.pid}
-      echo -n " $DBNAME"
-      stop_db
-    done
-  else
-    while shift ; do
-      [ -z "$1" ] && break
-      if test -e $VARRUN_DIR/$1.pid ; then
-        PIDFILE=`ls $VARRUN_DIR/$1.pid 2> /dev/null`
-        DBNAME=`echo $PIDFILE | cut -c20-`
-        DBNAME=${DBNAME%%.pid}
-        echo -n " $DBNAME"
-        stop_db
-      else
-        echo -n " (failure: No such tunnel is running: $1)"
-      fi
-    done
-  fi
-  echo "."
-  ;;
-  reload)
-  echo -n "Reloading $DESC:"
-  if test -z "$2" ; then
-    for PIDFILE in `ls $VARRUN_DIR/*.pid 2> /dev/null`; do
-      DBNAME=`echo $PIDFILE | cut -c20-`
-      DBNAME=${DBNAME%%.pid}
-      echo -n " $DBNAME"
-      stop_db
-      start_db
-    done
-  else
-    while shift ; do
-      [ -z "$1" ] && break
-      if test -e $VARRUN_DIR/$1.pid ; then
-        PIDFILE=`ls $VARRUN_DIR/$1.pid 2> /dev/null`
-        DBNAME=`echo $PIDFILE | cut -c20-`
-        DBNAME=${DBNAME%%.pid}
-        echo -n " $DBNAME"
-        stop_db
-        start_db
-      else
-        echo -n " (failure: No such tunnel is running: $1)"
-      fi
-    done
-  fi
-  echo "."
-  ;;
-  restart)
-    SCRIPT=$0
-    shift
-    $SCRIPT stop $*
-    sleep 1
-    $SCRIPT start $*
-  ;;
-  *)
-  N=/etc/init.d/$NAME
-  echo "Usage: $N {start|stop|restart|reload}" >&2
-  exit 1
-  ;;
-esac
-
-exit 0
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index b0480fc..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	./configure --prefix=/usr --sysconfdir=/etc --no-manpage --examplesdir=/usr/share/rhdropbox/examples
-	touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp
-	dh_testdir
-
-	$(MAKE)
-
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	$(MAKE) --directory=$(CURDIR) distclean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_installdirs
-
-	# Add here commands to install the package into debian/rhdropbox.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/rhdropbox install
-	# Fix unusual path:
-	mv debian/rhdropbox/usr/share/rhdropbox/examples/rhdropbox debian/rhdropbox/usr/share/rhdropbox/examples/config
-	echo "example configurations can be found at /usr/share/rhdropbox/examples/config" > debian/rhdropbox/etc/rhdropbox/README
-
-# Build architecture-independent files here.
-binary-indep: install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installinit 
-	dh_installman doc/rhdropbox.8
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/Makefile b/src/Makefile
index 02dc4a1..15670ce 100644
--- a/Makefile
+++ b/src/Makefile
@@ -35,7 +35,7 @@ OBJ := log.o \
        sysexec.o \
        rhdropbox.o
 
-SRC := $(OBJ:%.o=%.c) 
+SRC := $(OBJ:%.o=%.c)
 
 .PHONY: clean distclean
 
@@ -70,10 +70,10 @@ clean:
 	rm -f $(EXECUTABLE)
 
 cleanall: clean
-	$(MAKE) --directory="doc/" clean
+	$(MAKE) --directory="../doc/" clean
 
 manpage:
-	$(MAKE) --directory="doc/" manpage
+	$(MAKE) --directory="../doc/" manpage
 
 
 INSTALL_TARGETS := install-bin install-etc
@@ -101,7 +101,7 @@ install-etc:
 
 install-man: manpage
 	$(INSTALL) -d $(DESTDIR)$(MANDIR)/man8/
-	$(INSTALL) -m 644 doc/rhdropbox.8 $(DESTDIR)$(MANDIR)/man8/$(EXECUTABLE).8
+	$(INSTALL) -m 644 ../doc/rhdropbox.8 $(DESTDIR)$(MANDIR)/man8/$(EXECUTABLE).8
 
 install-examples:
 	$(INSTALL) -d $(DESTDIR)$(EXAMPLESDIR)/$(EXECUTABLE)
diff --git a/client_list.c b/src/client_list.c
index 8379dd9..8379dd9 100644
--- a/client_list.c
+++ b/src/client_list.c
diff --git a/client_list.h b/src/client_list.h
index 5cc34ae..5cc34ae 100644
--- a/client_list.h
+++ b/src/client_list.h
diff --git a/configure b/src/configure
index 1020c35..4b93d79 100755
--- a/configure
+++ b/src/configure
@@ -98,7 +98,7 @@ if [ -n "$ERRORS" ] && [ $EBUILD_COMPAT -ne 1 ]; then
 fi
 
 rm -f include.mk
-case $TARGET in 
+case $TARGET in
   Linux)
     echo "Linux specific build options"
   ;;
@@ -131,7 +131,7 @@ fi
 
 cat >> include.mk <<EOF
 # this file was created automatically
-# do not edit this file directly 
+# do not edit this file directly
 # use ./configure instead
 
 TARGET := $TARGET
diff --git a/daemon.h b/src/daemon.h
index 22e0ac0..22e0ac0 100644
--- a/daemon.h
+++ b/src/daemon.h
diff --git a/datatypes.h b/src/datatypes.h
index 1168ec6..1168ec6 100644
--- a/datatypes.h
+++ b/src/datatypes.h
diff --git a/log.c b/src/log.c
index 43a0a5a..43a0a5a 100644
--- a/log.c
+++ b/src/log.c
diff --git a/log.h b/src/log.h
index 2717622..2717622 100644
--- a/log.h
+++ b/src/log.h
diff --git a/log_targets.h b/src/log_targets.h
index 8db3812..8db3812 100644
--- a/log_targets.h
+++ b/src/log_targets.h
diff --git a/options.c b/src/options.c
index 6298f9d..6298f9d 100644
--- a/options.c
+++ b/src/options.c
diff --git a/options.h b/src/options.h
index e98655b..e98655b 100644
--- a/options.h
+++ b/src/options.h
diff --git a/rhdropbox.c b/src/rhdropbox.c
index 3503fd2..3503fd2 100644
--- a/rhdropbox.c
+++ b/src/rhdropbox.c
diff --git a/sig_handler.c b/src/sig_handler.c
index efb6ee6..efb6ee6 100644
--- a/sig_handler.c
+++ b/src/sig_handler.c
diff --git a/sig_handler.h b/src/sig_handler.h
index 1995e1a..1995e1a 100644
--- a/sig_handler.h
+++ b/src/sig_handler.h
diff --git a/string_list.c b/src/string_list.c
index a4f4ab8..a4f4ab8 100644
--- a/string_list.c
+++ b/src/string_list.c
diff --git a/string_list.h b/src/string_list.h
index cd054cb..cd054cb 100644
--- a/string_list.h
+++ b/src/string_list.h
diff --git a/sysexec.c b/src/sysexec.c
index 79f4e74..79f4e74 100644
--- a/sysexec.c
+++ b/src/sysexec.c
diff --git a/sysexec.h b/src/sysexec.h
index 8954622..8954622 100644
--- a/sysexec.h
+++ b/src/sysexec.h
diff --git a/utils.c b/src/utils.c
index a61ca1c..a61ca1c 100644
--- a/utils.c
+++ b/src/utils.c
diff --git a/utils.h b/src/utils.h
index b3cebc1..b3cebc1 100644
--- a/utils.h
+++ b/src/utils.h
diff --git a/watch_list.c b/src/watch_list.c
index 39c61f2..39c61f2 100644
--- a/watch_list.c
+++ b/src/watch_list.c
diff --git a/watch_list.h b/src/watch_list.h
index bd428ab..bd428ab 100644
--- a/watch_list.h
+++ b/src/watch_list.h