Merge branch 'packaging'

.gitattributes

@@ -0,0 +1 @@
+/debian	export-ignore

.travis.yml

@@ -0,0 +1,5 @@
+language: php
+install:
+  - sudo apt-get install dpkg-dev debhelper quilt fakeroot
+script:
+  - dpkg-buildpackage -b -us -uc

debian/changelog

@@ -1,3 +1,18 @@
+intelmq-manager (0.2~20170607) experimental; urgency=low
+
+  * Release version 0.2
+  * Include all docs in package
+  * fix preprm script in package
+  * change package format to quilt
+
+ -- Sebastian Wagner <[email protected]>  Wed, 07 Jun 2017 13:17:17 +0200
+
+intelmq-manager (20170323.2) unstable; urgency=medium
+
+  * Fixed dependencies for xenial.
+
+ -- Sascha Wilde <[email protected]>  Mon, 15 May 2017 13:06:58 +0200
+
 intelmq-manager (20160427.1~beta2) experimental; urgency=low
 
   * Moved html away from /var/www/html, added apache site config.

debian/control

@@ -2,13 +2,15 @@ Source: intelmq-manager
 Maintainer: Sascha Wilde <[email protected]>
 Section: net
 Priority: optional
-Build-Depends: debhelper (>= 9), po-debconf
+Build-Depends: debhelper (>= 9), po-debconf, quilt
 Standards-Version: 3.9.6
+Homepage: https://github.com/certtools/intelmq-manager/
 
 Package: intelmq-manager
 Architecture: all
-Depends: ${misc:Depends}, apache2, apache2-utils, libapache2-mod-php5, sudo,
-  adduser, intelmq (>= 1.0.0~dev4~beta8)
+Depends: ${misc:Depends}, apache2, apache2-utils,
+  libapache2-mod-php | libapache2-mod-php5, sudo,
+  adduser, intelmq (>= 1.0.0~dev5)
 Description: Graphical interface to manage configurations for the IntelMQ framework.
  A IntelMQ configuration is a set of config files which describe which
  bots and processing steps should be run in which order. It is similar

debian/docs

@@ -0,0 +1,5 @@
+CONTRIBUTORS.md
+LICENSE
+NOTICE
+README.md
+docs

debian/intelmq-manager.install

@@ -1,4 +1,3 @@
 intelmq-manager/* usr/share/intelmq-manager/html/
-CONTRIBUTORS.md NOTICE README.md usr/share/doc/intelmq-manager/
 debian/01_intelmq-manager etc/sudoers.d/
 debian/intelmq.conf etc/apache2/sites-available/

debian/intelmq-manager.prerm

@@ -3,7 +3,7 @@ set -e
 
 if [ "$1" = "remove" ] ; then
     . /usr/share/apache2/apache2-maintscript-helper
-    apache2_invoke ensite intelmq
+    apache2_invoke dissite intelmq
 fi
 
 #DEBHELPER#

debian/patches/fix-paths.patch

@@ -0,0 +1,30 @@
+Description: Fix paths for LSB
+Author: Sebastian Wagner <[email protected]>
+Last-Update: 2016-07-20
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/intelmq-manager/php/config.php	2017-06-07 13:06:54.215185776 +0200
++++ b/intelmq-manager/php/config2.php	2017-06-07 13:06:50.351194626 +0200
+@@ -1,15 +1,15 @@
+ <?php
+
+     $FILES = array(
+-        'bots' 		=> '/opt/intelmq/etc/BOTS',
+-        'defaults' 	=> '/opt/intelmq/etc/defaults.conf',
+-        'harmonization' => '/opt/intelmq/etc/harmonization.conf',
+-        'pipeline' 	=> '/opt/intelmq/etc/pipeline.conf',
+-        'runtime' 	=> '/opt/intelmq/etc/runtime.conf',
+-        'system' 	=> '/opt/intelmq/etc/system.conf'
++        'bots' 		=> '/etc/intelmq/BOTS',
++        'defaults' 	=> '/etc/intelmq/defaults.conf',
++        'harmonization' => '/etc/intelmq/harmonization.conf',
++        'pipeline' 	=> '/etc/intelmq/pipeline.conf',
++        'runtime' 	=> '/etc/intelmq/runtime.conf',
++        'system' 	=> '/etc/intelmq/system.conf'
+     );
+
+-    $CONTROLLER = "sudo -u intelmq /usr/local/bin/intelmqctl --type json %s";
++    $CONTROLLER = "sudo -u intelmq /usr/bin/intelmqctl --type json %s";
+
+     $BOT_CONFIGS_REJECT_REGEX = '/[^[:print:]\n\r\t]/';
+     $BOT_ID_REJECT_REGEX = '/[^A-Za-z0-9.-]/';

debian/patches/series

@@ -0,0 +1 @@
+fix-paths.patch

debian/rules

@@ -7,4 +7,3 @@ override_dh_fixperms:
 
 override_dh_install:
 	dh_install
-	sed -i 's@/usr/local/bin/@/usr/bin/@' debian/intelmq-manager/usr/share/intelmq-manager/html/php/config.php

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)