[Pkg-irc-commits] r303 - in /packages/inspircd2/trunk/debian: changelog inspircd.postrm inspircd.service inspircd.tmpfile rules

[kcd-guest at users.alioth.debian.org]

Author: kcd-guest
Date: Thu Jul 17 13:27:00 2014
New Revision: 303

URL: http://svn.debian.org/wsvn/pkg-irc/?sc=1&rev=303
Log:

systemd issue was a more bit complicated: thanks Andreas Metzler
mimic init-file trickery inspircd.tmpfile and so remove /var/log/inspircd.log
and /var/run/inspircd.pid.
Upstream change location of examples files installed under /etc at build time;
change the path accordingly in debian/rules.

Modified:
    packages/inspircd2/trunk/debian/changelog
    packages/inspircd2/trunk/debian/inspircd.postrm
    packages/inspircd2/trunk/debian/inspircd.service
    packages/inspircd2/trunk/debian/inspircd.tmpfile
    packages/inspircd2/trunk/debian/rules

Modified: packages/inspircd2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/changelog?rev=303&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/changelog	(original)
+++ packages/inspircd2/trunk/debian/changelog	Thu Jul 17 13:27:00 2014
@@ -37,8 +37,16 @@
     690c372f6ef246b43b477e3685c8e716431427ad to get rid of the dependency on
     libgcrypt.
   * Build against gnutls v3. Closes: #745948
-
- -- Guillaume Delacour <gui at iroqwa.org>  Sun, 13 Jul 2014 15:13:53 +0200
+  * Show compiler commandline when building. As a nice side effect this
+    actually lets ccache speed up the build.
+  * Drop PIDFile entry from systemd service file, it should not be necessary
+    for the non-forking case.
+  * Mimic init-file trickery in inspircd.tmpfile. Pre-generate both pidfile
+    and logfile with correct user/permissions. The daemon cannot do so, since
+    it is lacking write permissions in /var/run and /var/log. Remove pidfile
+    in postrm purge.
+
+ -- Guillaume Delacour <gui at iroqwa.org>  Wed, 16 Jul 2014 21:49:08 +0200
 
 inspircd (2.0.5-1) unstable; urgency=low
 

Modified: packages/inspircd2/trunk/debian/inspircd.postrm
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/inspircd.postrm?rev=303&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/inspircd.postrm	(original)
+++ packages/inspircd2/trunk/debian/inspircd.postrm	Thu Jul 17 13:27:00 2014
@@ -1,24 +1,12 @@
 #! /bin/sh
 
 set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
 
 case "$1" in
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade)
        ;;
     purge|disappear)
-       rm -rf /var/log/inspircd.log*
+       rm -rf /var/log/inspircd.log* /var/run/inspircd.pid
        ;;
     *)
        echo "postrm called with unknown argument \`$1'" >&2

Modified: packages/inspircd2/trunk/debian/inspircd.service
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/inspircd.service?rev=303&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/inspircd.service	(original)
+++ packages/inspircd2/trunk/debian/inspircd.service	Thu Jul 17 13:27:00 2014
@@ -3,7 +3,6 @@
 
 [Service]
 User=irc
-PIDFile=/var/run/inspircd/inspircd.pid
 ExecStart=/usr/sbin/inspircd --logfile /var/log/inspircd.log --config /etc/inspircd/inspircd.conf --nofork
 
 [Install]

Modified: packages/inspircd2/trunk/debian/inspircd.tmpfile
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/inspircd.tmpfile?rev=303&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/inspircd.tmpfile	(original)
+++ packages/inspircd2/trunk/debian/inspircd.tmpfile	Thu Jul 17 13:27:00 2014
@@ -1 +1,2 @@
-d /run/inspircd 0755 irc irc -
+f /var/run/inspircd.pid 0644 irc irc
+f /var/log/inspircd.log 0640 irc adm

Modified: packages/inspircd2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/rules?rev=303&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/rules	(original)
+++ packages/inspircd2/trunk/debian/rules	Thu Jul 17 13:27:00 2014
@@ -35,14 +35,16 @@
 	# compile binary with debuginfo and optimization (make D=2 all) as upstream
 	# don't generate symbols by default. dh_strip generate a -dbg package
 	# (see below)
-	dh_auto_build --parallel -- D=2 all
+	# show compiler commandline when building,
+	# ccache can use it to speed the build (V=1)
+	dh_auto_build --parallel -- D=2 V=1 all
 
 # install
 override_dh_auto_install:
 	dh_auto_install -- install DESTDIR=$(CURDIR)/debian/inspircd
 
 	# Delete example files (already in /usr/share/doc/inspircd/examples)
-	rm -f $(CURDIR)/debian/inspircd/etc/inspircd/*.example
+	rm -rf $(CURDIR)/debian/inspircd/etc/inspircd/examples
 
 	# delete empty data and log dir
 	rmdir $(CURDIR)/debian/inspircd/usr/lib/inspircd/data \