Refactored debian packaging

- Increased debian compatibility level to 11
- Use pybuild as the debian build system
- Updated build and package dependencies
- Switched from init script to systemd service
- Install README to the debian package docs
- Removed no longer used pycompat and pyversions debian files
- Removed no longer used openxcap.dirs and openxcap.install debian files
- Install the configuration sample and extra data files from setup.py

Author: danpascu

MANIFEST.in

@@ -1,12 +1,10 @@
-recursive-include debian   changelog compat control copyright
-recursive-include debian   pycompat pyversions rules
-recursive-include debian   *.dirs *.init *.postinst *.postrm *.docs *.install *.default
+recursive-include debian   changelog compat control copyright docs rules
+recursive-include debian   format lintian-overrides openxcap.service
 recursive-include opensips *.cfg
 recursive-include scripts  *.py *.sql
-recursive-include tls      .placeholder
-recursive-include xcap/appusage/xml-schemas  *.xsd
-recursive-include test *
-prune debian/tmp
+recursive-include tls      README
+recursive-include test     *
+prune debian/.debhelper
 prune debian/openxcap
-prune debian/python-module-stampdir
-include INSTALL LICENSE MANIFEST.in TODO config.ini.sample
+prune debian/tmp
+include INSTALL LICENSE MANIFEST.in TODO

debian/compat

@@ -1 +1 @@
-9
+11

debian/control

@@ -2,14 +2,12 @@ Source: openxcap
 Section: net
 Priority: optional
 Maintainer: Dan Pascu <[email protected]>
-Uploaders: Adrian Georgescu <[email protected]>
-Build-Depends: debhelper (>= 9), python(>= 2.7)
+Build-Depends: debhelper (>= 11), dh-python, python
 Standards-Version: 3.9.8
 
 Package: openxcap
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends},
-         lsb-base,
          python-application (>= 2.8.0),
          python-gnutls (>= 3.1.0),
          python-lxml,

debian/docs

@@ -0,0 +1 @@
+README

debian/lintian-overrides

@@ -0,0 +1,2 @@
+# This file may contain passwords.
+openxcap: non-standard-file-perm etc/openxcap/config.ini 0600 != 0644

debian/openxcap.default

@@ -0,0 +1,13 @@
+[Unit]
+Description=Open XCAP Server
+After=network.target nss-lookup.target mysqld.service mariadb.service thor-eventserver.service
+
+[Service]
+Type=simple
+Environment=PYTHONUNBUFFERED=yes
+ExecStart=/usr/bin/openxcap --systemd
+Restart=on-abnormal
+LimitCORE=infinity
+
+[Install]
+WantedBy=multi-user.target

debian/openxcap.dirs

@@ -3,14 +3,22 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2 --buildsystem=pybuild
 
 override_dh_clean:
 	dh_clean
 	rm -rf build dist MANIFEST
 
-override_dh_install:
-	dh_install
-	install -m 0644 config.ini.sample debian/openxcap/etc/openxcap/config.ini
+override_dh_auto_install:
+	dh_auto_install
+	mv debian/openxcap/etc/openxcap/config.ini.sample debian/openxcap/etc/openxcap/config.ini
 
-.PHONY: override_dh_clean override_dh_install
+override_dh_installsystemd:
+	dh_installsystemd --no-start
+
+override_dh_fixperms:
+	dh_fixperms
+	chmod 600 debian/openxcap/etc/openxcap/config.ini
+
+override_dh_auto_test:
+        # do not run tests as they require a configured openxcap server running

debian/openxcap.docs

@@ -1,42 +1,48 @@
 #!/usr/bin/env python
 
 import os
-import re
+import xcap
 
 from distutils.core import setup
 
-
-def get_version():
-    return re.search(r"""__version__\s+=\s+(?P<quote>['"])(?P<version>.+?)(?P=quote)""", open('xcap/__init__.py').read()).group('version')
-
-def find_packages(toplevel):
-    return [directory.replace(os.path.sep, '.') for directory, subdirs, files in os.walk(toplevel) if '__init__.py' in files]
-
-setup(name         = "openxcap",
-      version      = get_version(),
-      author       = "AG Projects",
-      author_email = "[email protected]",
-      url          = "http://openxcap.org/",
-      description  = "An open source XCAP server.",
-      long_description = """XCAP protocol allows a client to read, write, and modify application
+long_description = """XCAP protocol allows a client to read, write, and modify application
 configuration data stored in XML format on a server. XCAP maps XML document
 sub-trees and element attributes to HTTP URIs, so that these components can
 be directly accessed by HTTP. An XCAP server is used by the XCAP clients to
 store data like Presence policy in combination with a SIP Presence server
 that supports PUBLISH/SUBSCRIBE/NOTIFY methods to provide a complete
 [http://www.tech-invite.com/Ti-sip-WGs.html#wg-simple SIP SIMPLE] server
-solution.""",
-      license      = "GPL",
-      platforms    = ["Platform Independent"],
-      classifiers  = [
-        "Development Status :: 5 - Production/Stable",
-        "Intended Audience :: Service Providers",
-        "License :: OSI Approved :: GNU General Public License (GPL)",
-        "Operating System :: POSIX :: Linux",
-        "Programming Language :: Python",
-      ],
-      packages = find_packages('xcap'),
-      scripts  = ['openxcap'],
-      package_data = {'xcap.appusage': ['xml-schemas/*']},
-      )
+solution."""
+
+
+def find_packages(toplevel):
+    return [directory.replace(os.path.sep, '.') for directory, subdirs, files in os.walk(toplevel) if '__init__.py' in files]
+
+
+setup(
+    name='openxcap',
+    version=xcap.__version__,
+
+    description='XCAP server',
+    long_description=long_description,
+    url='http://openxcap.org/',
+
+    author='AG Projects',
+    author_email='[email protected]',
+
+    license='GPL',
+    platforms=['Platform Independent'],
+
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Service Providers',
+        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python',
+    ],
 
+    packages=find_packages('xcap'),
+    package_data={'xcap.appusage': ['xml-schemas/*']},
+    data_files=[('/etc/openxcap', ['config.ini.sample']), ('/etc/openxcap/tls', ['tls/README'])],
+    scripts=['openxcap']
+)

debian/openxcap.init

@@ -0,0 +1 @@
+TLS certificates used by openxcap can be added to this directory.