Commit Diff


commit - a5695e7ef8e6cb076cb2b0a2731593f45b587f86
commit + 606cdb69bfd65a41bfcef6c909e289ff6a38baf2
blob - de6a5676b9aa161fb00a810ab00f5d94d25184e0
blob + 924b0d1b5706f46e34262dca2c1e3b0ef2586347
--- contrib/ngircd.spec
+++ contrib/ngircd.spec
@@ -3,7 +3,7 @@
 %define release 1
 %define prefix  %{_prefix}
 
-Summary:      Next Generation Internet Relay Chat Daemon
+Summary:      A lightweight daemon for the Internet Relay Chat (IRC)
 Name:         %{name}
 Version:      %{version}
 Release:      %{release}
@@ -15,17 +15,18 @@ Packager:     Sean Reifschneider <jafo-rpms@tummy.com>
 BuildRoot:    /var/tmp/%{name}-root
 
 %description
-ngIRCd is a free open source daemon for Internet Relay Chat (IRC),
+ngIRCd is a free open source daemon for the Internet Relay Chat (IRC),
 developed under the GNU General Public License (GPL). It's written from
 scratch and is not based upon the original IRCd like many others.
 
-Why should you use ngIRCd? Because ...
+Advantages:
+ - no problems with servers using changing/non-static IP addresses.
+ - small and lean configuration file.
+ - free, modern and open source C code.
+ - still under active development.
 
-   * ... there are no problems with servers on changing or non-static IP
-         addresses.
-   * ... there is a small and lean configuration file.
-   * ... there is a free, modern and open source C source code.
-   * ... it is still under active development. 
+ngIRCd is compatible to the "original" ircd 2.10.3p3, so you can run
+mixed networks.
 
 %prep
 %setup
blob - 4d8a70eaf0633b4dc4ed78baf6fc32c70a537812
blob + a84fb4e8efd2fcf96a6f955ac06244c3a11aef34
--- debian/changelog
+++ debian/changelog
@@ -1,3 +1,9 @@
+ngircd (0.7.5-0.2ab) unstable; urgency=low
+
+  * Updated RPM and Debian package description and configuration.
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Sat, 29 Nov 2003 21:24:32 +0100
+
 ngircd (0.7.5-0.1ab) unstable; urgency=low
 
   * New upstream version.
blob - 46903c750794006f6c4fa0a158b16a6cacf9bd58
blob + ec557bccb9a1450a1b303f4102655ee3bc15dadb
--- debian/control
+++ debian/control
@@ -9,14 +9,14 @@ Package: ngircd
 Architecture: any
 Depends: ${shlibs:Depends} ${misc:Depends}
 Description: A lightweight daemon for the Internet Relay Chat (IRC)
- The ngIRCd is a free open source daemon for Internet Relay Chat (IRC),
- developed under the GNU General Public License (GPL). It's written from
- scratch and is not based upon the original IRCd like many others.
+ ngIRCd is a free open source daemon for the Internet Relay Chat (IRC)
+ network. It is written from scratch and is not based upon the original
+ IRCd like many others.
  .
  Advantages:
-  - no problems with servers on changing or non-static IP addresses.
+  - no problems with servers using changing/non-static IP addresses.
   - small and lean configuration file.
-  - free, modern and open source C source code.
+  - free, modern and open source C code.
   - still under active development.
  .
  ngIRCd is compatible to the "original" ircd 2.10.3p3, so you can run
blob - 380c194ed526c98b6301afc5238d7f6a2d415153
blob + 3c92f7c4d19073eab6ef0ae8bfab2526461c6388
--- debian/copyright
+++ debian/copyright
@@ -3,7 +3,7 @@ Tue, 20 May 2003 15:47:40 +0200.
 
 It was downloaded from ftp://Arthur.Ath.CX/pub/Users/alex/ngircd/
 
-Upstream Author(s): Alexander Barton <alex@barton.de>
+Upstream Author: Alexander Barton <alex@barton.de>
 
 This software is copyright (c) 1999-2003 by Alexander Barton.
 
blob - c92740d616d409d63b2f2f0452ded88956f81cf5
blob + b8d4fb642cff055d8e9643b8f78deabd064b1b79
--- debian/ngircd.postinst
+++ debian/ngircd.postinst
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # Debian post-installation script
-# $Id: ngircd.postinst,v 1.2 2003/07/12 23:27:37 alex Exp $
+# $Id: ngircd.postinst,v 1.3 2003/11/29 20:29:09 alex Exp $
 #
 
 if [ -f /etc/ngircd/ngircd.conf ]; then
@@ -9,14 +9,6 @@ if [ -f /etc/ngircd/ngircd.conf ]; then
 	chmod o= /etc/ngircd/ngircd.conf
 fi
 
-if [ -x "/etc/init.d/ngircd" ]; then
-	# setup init scripts and startup ngircd
-	update-rc.d ngircd defaults >/dev/null
-	if [ -x /usr/sbin/invoke-rc.d ]; then
-		invoke-rc.d ngircd start
-	else
-		/etc/init.d/ngircd start
-	fi
-fi
+#DEBHELPER#
 
 # -eof-
blob - a1a21165b446c2449f3394467d28375b7d52e136
blob + f411a377bbd03cc4d3bae886139b923061e9ed1d
--- debian/rules
+++ debian/rules
@@ -1,7 +1,17 @@
 #!/usr/bin/make -f
+#
+# ngIRCd -- The Next Generation IRC Daemon
+# Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# Please read the file COPYING, README and AUTHORS for more information.
+#
 # debian/rules for ngIRCd
 #
-# $Id: rules,v 1.1 2003/07/09 20:23:35 alex Exp $
+# $Id: rules,v 1.2 2003/11/29 20:29:09 alex Exp $
 #
 # Based on the sample debian/rules that uses debhelper,
 # GNU copyright 1997 to 1999 by Joey Hess.
@@ -12,8 +22,8 @@
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 CFLAGS = -Wall -g
 
@@ -28,14 +38,17 @@ endif
 
 config.status: configure
 	dh_testdir
+
 	# Add here commands to configure the package.
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-	  --prefix=/usr --sysconfdir=/etc/ngircd --mandir=\$${prefix}/share/man \
+	  --prefix=/usr \
+	  --sysconfdir=/etc/ngircd \
+	  --mandir=\$${prefix}/share/man \
 	  --with-syslog --with-zlib
 
 build: build-stamp
 
-build-stamp:  config.status
+build-stamp: config.status
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -50,6 +63,7 @@ clean:
 
 	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
+
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -66,11 +80,12 @@ install: build
 
 	# Add here commands to install the package into debian/ngircd.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd
+	rm -f $(CURDIR)/debian/ngircd/usr/share/doc/ngircd/INSTALL*
+	rm -f $(CURDIR)/debian/ngircd/usr/share/doc/ngircd/COPYING*
 
-
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
+	# We have nothing to do by default.
 
 # Build architecture-dependent files here.
 binary-arch: build install
@@ -81,7 +96,7 @@ binary-arch: build install
 	dh_installinit
 	dh_strip
 	dh_compress
-	dh_fixperms -Xetc/ngircd.conf
+	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
@@ -89,6 +104,7 @@ binary-arch: build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
+
 .PHONY: build clean binary-indep binary-arch binary install 
 
 # -eof-