prepare for stretch

18 files changed, 117 insertions, 126 deletions

diff --git a/debian/changelog b/debian/changelog
index 11c602c..2adf0ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,59 @@
+exilog (0.5.1-4~unki.7) stretch; urgency=medium
+
+  * add the .js and .css files too
+
+ -- Andreas Unterkircher <unki@netshadow.net>  Tue, 17 Oct 2017 17:39:25 +0200
+
+exilog (0.5.1-4~unki.6) stretch; urgency=medium
+
+  * update /var/www to /var/www/html
+
+ -- Andreas Unterkircher <unki@netshadow.net>  Tue, 17 Oct 2017 17:36:27 +0200
+
+exilog (0.5.1-4~unki.5) stretch; urgency=medium
+
+  * exilog-cgi: /usr/lib/cgi-bin/exilog/exilog_cgi.pl needs to be executable
+
+ -- Andreas Unterkircher <unki@netshadow.net>  Tue, 17 Oct 2017 17:26:39 +0200
+
+exilog (0.5.1-4~unki.4) stretch; urgency=medium
+
+  * forget some files for exilog-cgi
+
+ -- Andreas Unterkircher <unki@netshadow.net>  Tue, 17 Oct 2017 17:24:04 +0200
+
+exilog (0.5.1-4~unki.3) stretch; urgency=medium
+
+  * update agent init script
+
+ -- Andreas Unterkircher <unki@netshadow.net>  Tue, 17 Oct 2017 17:17:18 +0200
+
+exilog (0.5.1-4~unki.2) stretch; urgency=medium
+
+  * add virtual package exilog
+
+ -- Andreas Unterkircher <unki@netshadow.net>  Tue, 17 Oct 2017 17:08:39 +0200
+
+exilog (0.5.1-4~unki.1) stretch; urgency=medium
+
+  * split package into exilog-common, -agent and -cgi
+
+ -- Andreas Unterkircher <unki@netshadow.net>  Tue, 17 Oct 2017 16:53:38 +0200
+
+exilog (0.5.1-3~unki.1) stretch; urgency=medium
+
+  * Non-maintainer upload.
+  * nowdays libcgi-perl is called libcgi-pm-perl
+
+ -- Andreas Unterkircher <unki@netshadow.net>  Tue, 17 Oct 2017 10:23:17 +0200
+
+exilog (0.5.1-2~unki) stretch; urgency=medium
+
+  * Non-maintainer upload.
+  * rebuild for stretch
+
+ -- Andreas Unterkircher <unki@netshadow.net>  Tue, 17 Oct 2017 10:15:31 +0200
+
 exilog (0.5.1-2) etch; urgency=low
 
   * avoid perl warning message, when looking for missing trailing slash in
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/conffiles b/debian/conffiles
deleted file mode 100644
index f85cd6f..0000000
--- a/debian/conffiles
+++ /dev/null
@@ -1,3 +0,0 @@
-etc/exilog/exilog.conf.dist
-etc/default/exilog
-etc/cron.d/exilog
diff --git a/debian/control b/debian/control
index 40a408d..7d81646 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,25 @@ Source: exilog
 Section: misc
 Priority: extra
 Maintainer: Andreas Unterkircher <unki@netshadow.at>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 9)
 Standards-Version: 3.7.2
 
-Package: exilog
-Architecture: any
-Depends: perl, libdbi-perl, libdbd-mysql-perl | libdbd-pg-perl, libnet-netmask-perl, libcgi-perl, libdata-dump-perl
+Package: exilog-common
+Replaces: exilog (<< 0.5.1-4~unki.2)
+Conflicts: exilog (<< 0.5.1-4~unki.2)
+Architecture: all
+Depends: ${misc:Depends}, ${perl:Depends}, libdbi-perl, libdbd-mysql-perl | libdbd-pg-perl, libnet-netmask-perl, libdata-dump-perl
+Description: exilog to centralize exim log files
+ into a MySQL database.
+
+Package: exilog-agent
+Depends: exilog-common
+Architecture: all
+Description: exilog to centralize exim log files
+ into a MySQL database.
+
+Package: exilog-cgi
+Architecture: all
+Depends: exilog-common, libcgi-pm-perl | libcgi-perl
 Description: exilog to centralize exim log files
  into a MySQL database.
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index eeae25d..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,7 +0,0 @@
-etc/exilog
-etc/cron.d
-usr/lib/cgi-bin/exilog
-usr/lib/exilog
-usr/sbin
-var/www/exilog
-var/www/exilog/icons
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index e69de29..0000000
--- a/debian/docs
+++ /dev/null
diff --git a/debian/exilog.cron.d b/debian/exilog-agent.cron.d
index 2d222da..2d222da 100644
--- a/debian/exilog.cron.d
+++ b/debian/exilog-agent.cron.d
diff --git a/debian/exilog.default b/debian/exilog-agent.default
index a0896a9..f82e8dd 100644
--- a/debian/exilog.default
+++ b/debian/exilog-agent.default
@@ -1,5 +1,7 @@
 # Defaults for exilog initscript
-# sourced by /etc/init.d/exilog
+
+# sourced by /etc/init.d/exilog-agent
+
 # installed at /etc/default/exilog by the maintainer scripts
 
 #
diff --git a/debian/exilog.init b/debian/exilog-agent.init
index 9e4adbd..b056b89 100644
--- a/debian/exilog.init
+++ b/debian/exilog-agent.init
@@ -18,8 +18,8 @@ DESC="exilog log monitoring agent"
 test -x $DAEMON || exit 0
 
 # Include exilog defaults if available
-if [ -f /etc/default/exilog ] ; then
-  . /etc/default/exilog
+if [ -f /etc/default/exilog-agent ] ; then
+  . /etc/default/exilog-agent
 fi
 
 if [ ! -f /etc/exilog/exilog.conf ] ; then
@@ -38,11 +38,11 @@ set -e
 
 case "$1" in
   start)
-    test ! -d /var/run/exilog && mkdir /var/run/exilog
+    test ! -d /run/exilog && mkdir /run/exilog
     log_daemon_msg "Starting $DESC" $NAME
     start-stop-daemon \
       --start \
-      --quiet --pidfile /var/run/exilog/agent.pid \
+      --quiet --pidfile /run/exilog/agent.pid \
       --exec $DAEMON -- $DAEMON_OPTS
     log_end_msg $?
     ;;
@@ -53,7 +53,7 @@ case "$1" in
       --oknodo \
       --quiet \
       --retry 5 \
-      --pidfile /var/run/exilog/agent.pid
+      --pidfile /run/exilog/agent.pid
     log_end_msg $?
     ;;
   force-reload)
@@ -68,17 +68,17 @@ case "$1" in
       --test \
       --quiet \
       --pidfile \
-      /var/run/exilog/agent.pid \
+      /run/exilog/agent.pid \
       && $0 restart \
       || exit 0
     ;;
   restart)
     log_daemon_msg "Restarting $DESC" $NAME
     start-stop-daemon --stop --oknodo --retry 5 --quiet --pidfile \
-      /var/run/exilog/agent.pid
+      /run/exilog/agent.pid
     sleep 1
     start-stop-daemon --start --quiet --pidfile \
-      /var/run/exilog/agent.pid --exec $DAEMON -- $DAEMON_OPTS
+      /run/exilog/agent.pid --exec $DAEMON -- $DAEMON_OPTS
     log_end_msg $?
     ;;
   *)
diff --git a/debian/exilog-agent.install b/debian/exilog-agent.install
new file mode 100644
index 0000000..1d38161
--- /dev/null
+++ b/debian/exilog-agent.install
@@ -0,0 +1,3 @@
+# agent
+agent/exilog_agent.pl usr/sbin/
+agent/exilog_cleanup.pl usr/sbin/
diff --git a/debian/exilog-cgi.install b/debian/exilog-cgi.install
new file mode 100644
index 0000000..b98ffc4
--- /dev/null
+++ b/debian/exilog-cgi.install
@@ -0,0 +1,9 @@
+cgi/exilog_cgi_html.pm usr/lib/cgi-bin/exilog/
+cgi/exilog_cgi_messages.pm usr/lib/cgi-bin/exilog/
+cgi/exilog_cgi_param.pm usr/lib/cgi-bin/exilog/
+cgi/exilog_cgi_queues.pm usr/lib/cgi-bin/exilog
+cgi/exilog_cgi_servers.pm usr/lib/cgi-bin/exilog
+cgi/exilog_cgi.pl usr/lib/cgi-bin/exilog
+htdocs/icons var/www/html/exilog/
+htdocs/exilog_jscript.js var/www/html/exilog/
+htdocs/exilog_stylesheet.css var/www/html/exilog/
diff --git a/debian/exilog-common.conffiles b/debian/exilog-common.conffiles
new file mode 100644
index 0000000..0a2dcb5
--- /dev/null
+++ b/debian/exilog-common.conffiles
@@ -0,0 +1 @@
+etc/exilog/exilog.conf
diff --git a/debian/exilog-common.dirs b/debian/exilog-common.dirs
new file mode 100644
index 0000000..b063ff2
--- /dev/null
+++ b/debian/exilog-common.dirs
@@ -0,0 +1 @@
+etc/exilog
diff --git a/debian/exilog.docs b/debian/exilog-common.docs
index ef1156c..ef1156c 100644
--- a/debian/exilog.docs
+++ b/debian/exilog-common.docs
diff --git a/debian/exilog-common.install b/debian/exilog-common.install
new file mode 100644
index 0000000..e3ba076
--- /dev/null
+++ b/debian/exilog-common.install
@@ -0,0 +1,4 @@
+lib/exilog_config.pm usr/lib/exilog/
+lib/exilog_parse.pm usr/lib/exilog/
+lib/exilog_sql.pm usr/lib/exilog/
+lib/exilog_util.pm usr/lib/exilog/
diff --git a/debian/rules b/debian/rules
index 2b4b266..3c7ab96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,92 +1,24 @@
 #!/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.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
 
 # 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
+#export DH_OPTIONS
 
-DESTDIR=`pwd`/debian/exilog
+#DESTDIR=`pwd`/debian/exilog
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
+override_dh_auto_install:
+	dh_auto_install $@
+	cp conf/exilog.conf-example $(CURDIR)/debian/exilog-common/etc/exilog/exilog.conf
 
-build: build-stamp
+override_dh_install:
+	dh_install
+	chmod +x $(CURDIR)/debian/exilog-cgi/usr/lib/cgi-bin/exilog/exilog_cgi.pl
 
-build-stamp: configure-stamp
-	dh_testdir
-
-clean:
-	dh_testdir
-	dh_testroot
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean
-	dh_installdirs -i
-	# directories
-	install -d ${DESTDIR}/usr/sbin
-	install -d ${DESTDIR}/usr/lib/exilog
-	install -d ${DESTDIR}/usr/lib/cgi-bin/exilog
-	install -d ${DESTDIR}/var/www/exilog
-	install -d ${DESTDIR}/var/www/exilog/icons
-	install -d ${DESTDIR}/etc/exilog
-	install -d ${DESTDIR}/etc/cron.d
-	install -d ${DESTDIR}/var/run/exilog
-	# lib stuff
-	install -m644 lib/exilog_config.pm ${DESTDIR}/usr/lib/exilog
-	install -m644 lib/exilog_parse.pm ${DESTDIR}/usr/lib/exilog
-	install -m644 lib/exilog_sql.pm ${DESTDIR}/usr/lib/exilog
-	install -m644 lib/exilog_util.pm ${DESTDIR}/usr/lib/exilog
-	# cgi stuff
-	install -m644 cgi/exilog_cgi_html.pm ${DESTDIR}/usr/lib/cgi-bin/exilog
-	install -m644 cgi/exilog_cgi_messages.pm ${DESTDIR}/usr/lib/cgi-bin/exilog
-	install -m644 cgi/exilog_cgi_param.pm ${DESTDIR}/usr/lib/cgi-bin/exilog
-	install -m644 cgi/exilog_cgi_queues.pm ${DESTDIR}/usr/lib/cgi-bin/exilog
-	install -m644 cgi/exilog_cgi_servers.pm ${DESTDIR}/usr/lib/cgi-bin/exilog
-	install -m755 cgi/exilog_cgi.pl ${DESTDIR}/usr/lib/cgi-bin/exilog
-	# htdocs
-	install -m644 htdocs/exilog_jscript.js ${DESTDIR}/var/www/exilog
-	install -m644 htdocs/exilog_stylesheet.css ${DESTDIR}/var/www/exilog
-	install -m644 htdocs/icons/* ${DESTDIR}/var/www/exilog/icons
-	# agent
-	install -m755 agent/exilog_agent.pl ${DESTDIR}/usr/sbin
-	install -m755 agent/exilog_cleanup.pl ${DESTDIR}/usr/sbin
-	# config
-	install -m640 conf/exilog.conf-example ${DESTDIR}/etc/exilog/exilog.conf.dist
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
+override_dh_installdocs:
 	dh_installdocs
-	dh_installexamples
-	dh_installinit
-	dh_installcron
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
+	cp conf/exilog.conf-example $(CURDIR)/debian/exilog-common/usr/share/doc/exilog-common/exilog.conf.dist
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary install configure
+%:
+	dh $@
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch.ex b/debian/watch.ex
deleted file mode 100644
index b0bae02..0000000
--- a/debian/watch.ex
+++ /dev/null
@@ -1,22 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
-# Uncomment to examine a Webpage 
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php exilog-(.*)\.tar\.gz
-
-# Uncomment to examine a Webserver directory
-#http://www.example.com/pub/exilog-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/exilog-(.*)\.tar\.gz debian uupdate
-
-# Uncomment to find new files on sourceforge, for debscripts >= 2.9
-# http://sf.net/exilog/exilog-(.*)\.tar\.gz
-
-