[Pkg-xmpp-commits] [jabberd2] 01/01: Put systemd service files in /lib/systemd/system (lintian systemd-service-file-outside-lib).

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script.

jas pushed a commit to branch master
in repository jabberd2.

commit d128bfcab90304bda18bf5d7eaee11dc84bc2cdf
Author: Simon Josefsson <simon at josefsson.org>
Date:   Fri Jul 31 19:27:36 2015 +0200

    Put systemd service files in /lib/systemd/system (lintian systemd-service-file-outside-lib).
---
 debian/changelog            |  2 ++
 debian/patches/usr_etc.diff | 11 ++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f98f32e..510f112 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 jabberd2 (2.3.3-3) unstable; urgency=low
 
   * Replace libmysqlclient15-dev with libmysqlclient-dev.  Closes: #790452.
+  * Put systemd service files in /lib/systemd/system (lintian
+    systemd-service-file-outside-lib).
 
  -- Simon Josefsson <simon at josefsson.org>  Fri, 31 Jul 2015 17:45:16 +0200
 
diff --git a/debian/patches/usr_etc.diff b/debian/patches/usr_etc.diff
index 3269463..be098ed 100644
--- a/debian/patches/usr_etc.diff
+++ b/debian/patches/usr_etc.diff
@@ -1,14 +1,19 @@
 Description: Changes the path of the init files
-Author: Willem van den Akker <wvdakker at wilsoft.nl>
+Author: Willem van den Akker <wvdakker at wilsoft.nl>, Simon Josefsson
 
+diff --git a/etc/Makefile.am b/etc/Makefile.am
+index bb70a93..b1114cc 100644
 --- a/etc/Makefile.am
 +++ b/etc/Makefile.am
-@@ -1,7 +1,7 @@
+@@ -1,9 +1,9 @@
  LIBTOOL += --quiet
  
  sysconf_DATA = c2s.xml.dist router.xml.dist s2s.xml.dist sm.xml.dist jabberd.cfg.dist router-users.xml.dist router-filter.xml.dist
 -initdir = $(prefix)/etc/init
 +initdir = /etc/jabberd2
  init_DATA = jabberd-c2s.conf jabberd-router.conf jabberd-s2s.conf jabberd-sm.conf
- systemddir = $(prefix)/lib/systemd/system
+-systemddir = $(prefix)/lib/systemd/system
++systemddir = /lib/systemd/system
  systemd_DATA = jabberd-sm.service jabberd.service jabberd-s2s.service jabberd-router.service jabberd-c2s.service
+ configs = $(sysconf_DATA) $(init_DATA) $(systemd_DATA)
+ EXTRA_DIST = $(sysconf_DATA:%.dist=%.dist.in) $(init_DATA:%.conf=%.conf.in) $(systemd_DATA:%.service=%.service.in)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xmpp/jabberd2.git