[Pkg-irc-commits] r13 - in /packages/inspircd/trunk/debian: changelog dirs init.d inspircd.default inspircd.examples rules wrapper.sh

Sat Oct 6 23:20:44 UTC 2007

Author: mario
Date: Sat Oct  6 23:20:44 2007
New Revision: 13

URL: http://svn.debian.org/wsvn/pkg-irc/?sc=1&rev=13
Log:
[inpircd]:
Fixed wrapper.sh and install the binary in /usr/lib/inspircd
Fixed the init.d script to use now the "irc" user.
Merged the changelog
Added a .default file

[pkg-irc]:
Updated TODO list


Added:
    packages/inspircd/trunk/debian/inspircd.default
    packages/inspircd/trunk/debian/inspircd.examples
Modified:
    packages/inspircd/trunk/debian/changelog
    packages/inspircd/trunk/debian/dirs
    packages/inspircd/trunk/debian/init.d
    packages/inspircd/trunk/debian/rules
    packages/inspircd/trunk/debian/wrapper.sh

Modified: packages/inspircd/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd/trunk/debian/changelog?rev=13&op=diff
==============================================================================

--- packages/inspircd/trunk/debian/changelog (original)
+++ packages/inspircd/trunk/debian/changelog Sat Oct  6 23:20:44 2007
@@ -1,21 +1,5 @@
-inspircd (1.1.8-2) unstable; urgency=low
-
-  * Import into alioth (pkg-irc).
-  * Removed debian/changelog.inspircd as it is quite useless, also remove the
-    dh_installchangeslogs call in debian/rules.
-  * Set maintainer to the alioth team.
-  * Fix description in debian/control to conform to the policy.
-  * Removed linitan overrides as there are workarounds.
-
- -- Mario Iseli <mario at debian.org>  Sat, 06 Oct 2007 16:15:30 +0200
-
 inspircd (1.1.8-1) unstable; urgency=low
 
   * Initial release
-  * Adjusted configure script to proper location of the config file
-  * Adjusted sample config file's PID location to be in /var/run
-  * Wrote a wrapper script so the inspircd bin knows where to look for the inspircd libs
-  * Wrote an init.d and manpage
-  * Adjusted Makefile to not use RPATH
 
- -- Darren Blaber <dmbtech at gmail.com>  Fri, 15 Jun 2007 20:05:39 -0400
+ -- Mario Iseli <mario at debian.org>  Fri, 07 Oct 2007 01:16:32 +0200

Modified: packages/inspircd/trunk/debian/dirs
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd/trunk/debian/dirs?rev=13&op=diff
==============================================================================
--- packages/inspircd/trunk/debian/dirs (original)
+++ packages/inspircd/trunk/debian/dirs Sat Oct  6 23:20:44 2007
@@ -1,1 +1,2 @@
+etc/default
 usr/sbin

Modified: packages/inspircd/trunk/debian/init.d
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd/trunk/debian/init.d?rev=13&op=diff
==============================================================================
--- packages/inspircd/trunk/debian/init.d (original)
+++ packages/inspircd/trunk/debian/init.d Sat Oct  6 23:20:44 2007
@@ -16,7 +16,14 @@
 IRCDPID="/var/run/inspircd.pid"
 IRCDLOG="/var/log/inspircd.log"
 IRCDARGS="--logfile $IRCDLOG"
-USER="ircd"
+USER="irc"
+
+source /etc/default/inspircd
+
+if [ ! $INSPIRCD_ENABLED ]; then
+	echo -n "Please configure inspircd first and edit /etc/default/inspircd, otherwise inspircd won't start"
+	exit 0
+fi
 
 if [ ! -x "$IRCD" ]; then exit 0; fi
 

Added: packages/inspircd/trunk/debian/inspircd.default
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd/trunk/debian/inspircd.default?rev=13&op=file
==============================================================================
--- packages/inspircd/trunk/debian/inspircd.default (added)
+++ packages/inspircd/trunk/debian/inspircd.default Sat Oct  6 23:20:44 2007
@@ -1,0 +1,4 @@
+# Please customize the configfiles for inspircd in /etc/inspircd/ first and then
+# set INSPIRCD_ENABLE to '1'. Please note that you can find some examples of
+# advanced configurations in /usr/share/doc/inspircd/examples/.
+INSPIRCD_ENABLED=0

Added: packages/inspircd/trunk/debian/inspircd.examples
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd/trunk/debian/inspircd.examples?rev=13&op=file
==============================================================================
    (empty)

Modified: packages/inspircd/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd/trunk/debian/rules?rev=13&op=diff
==============================================================================
--- packages/inspircd/trunk/debian/rules (original)
+++ packages/inspircd/trunk/debian/rules Sat Oct  6 23:20:44 2007
@@ -44,14 +44,11 @@
 	dh_installdirs
 	# Use 755 for correct permissions
 	$(MAKE) INSTMODE=755 install
-	install -m 640 $(CURDIR)/debian/inspircd.conf $(CURDIR)/debian/inspircd/etc/inspircd.conf
-	mv debian/inspircd/usr/sbin/inspircd debian/inspircd/usr/sbin/inspircd.bin
-	cp debian/wrapper.sh debian/inspircd/usr/sbin/inspircd
-	chmod +x debian/inspircd/usr/sbin/inspircd
-	chmod -R 644 debian/inspircd/usr/lib/inspircd
-	chmod 755 debian/inspircd/usr/lib/inspircd
-	chmod 755 debian/inspircd/usr/lib/inspircd/modules
-	chmod 755 debian/inspircd/usr/lib/inspircd/inspircd
+	install -m 640 $(CURDIR)/debian/inspircd.default $(CURDIR)/debian/inspircd/etc/default/inspircd
+	rm -f $(CURDIR)/debian/inspircd/etc/inspircd/*
+	install -o irc -m 640 $(CURDIR)/debian/inspircd.conf $(CURDIR)/debian/inspircd/etc/inspircd.conf
+	install -m 755 debian/inspircd/usr/sbin/inspircd debian/inspircd/usr/lib/inspircd/inspircd.bin
+	install -m 755 debian/wrapper.sh debian/inspircd/usr/sbin/inspircd
 
 binary-indep: build install
 

Modified: packages/inspircd/trunk/debian/wrapper.sh
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd/trunk/debian/wrapper.sh?rev=13&op=diff
==============================================================================
--- packages/inspircd/trunk/debian/wrapper.sh (original)
+++ packages/inspircd/trunk/debian/wrapper.sh Sat Oct  6 23:20:44 2007
@@ -3,5 +3,4 @@
 
 LD_LIBRARY_PATH=/usr/lib/inspircd
 
-inspircd.bin $@
-
+/usr/lib/inspircd/inspircd.bin $@


