Browse Source

Drop dpatch support

The patches were not used at all.
Christoph Biedl 13 years ago
parent
commit
d318097b47

+ 1 - 1
debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian IRC Team <pkg-irc-maintainers@lists.alioth.debian.org>
 Uploaders: Mario Iseli <mario@debian.org>, Matt Arnold <mattarnold5@gmail.com>,
  Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, dpatch, libgnutls-dev
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, libgnutls-dev
 Vcs-Svn: svn://svn.debian.org/pkg-irc/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-irc
 Standards-Version: 3.8.0

+ 0 - 36
debian/patches/01-manuals.dpatch

@@ -1,36 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-manuals.dpatch by Mario Iseli <admin@marioiseli.com>
-##
-## DP: Fixes the paths in the manuals.
-
-@DPATCH@
-
-diff -Naur ngircd-0.8.2-orig/man/ngircd.8 ngircd-0.8.2/man/ngircd.8
---- ngircd-0.8.2-orig/man/ngircd.8	2004-04-05 12:59:10.000000000 +0200
-+++ ngircd-0.8.2/man/ngircd.8	2005-11-07 23:14:08.000000000 +0100
-@@ -58,11 +58,11 @@
- \fB\-\-help\fR
- Display a brief help text and exit.
- .SH FILES
--.I /usr/local/etc/ngircd.conf
-+.I /etc/ngircd/ngircd.conf
- .RS
- The system wide default configuration file.
- .RE
--.I /usr/local/etc/ngircd.motd
-+.I /etc/ngircd/ngircd.motd
- .RS
- Default "message of the day" (MOTD).
- .RE
-diff -Naur ngircd-0.8.2-orig/man/ngircd.conf.5 ngircd-0.8.2/man/ngircd.conf.5
---- ngircd-0.8.2-orig/man/ngircd.conf.5	2004-05-07 13:24:18.000000000 +0200
-+++ ngircd-0.8.2/man/ngircd.conf.5	2005-11-07 23:14:27.000000000 +0100
-@@ -5,7 +5,7 @@
- .SH NAME
- ngircd.conf \- configuration file of ngIRCd
- .SH SYNOPSIS
--.B /usr/local/etc/ngircd.conf
-+.B /etc/ngircd/ngircd.conf
- .SH DESCRIPTION
- .BR ngircd.conf
- is the configuration file for

+ 0 - 45
debian/patches/02-manuals.dpatch

@@ -1,45 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02-manuals.dpatch by Mario Iseli <admin@marioiseli.com>
-##
-## DP: Fixes the paths in the manuals.
-
-@DPATCH@
-
-diff -Naur ngircd-0.9.2-orig/man/ngircd.8 ngircd-0.9.2/man/ngircd.8
---- ngircd-0.9.2-orig/man/ngircd.8	2005-06-04 15:39:20.000000000 +0200
-+++ ngircd-0.9.2/man/ngircd.8	2005-11-15 23:39:41.000000000 +0100
-@@ -55,11 +55,11 @@
- \fB\-\-help\fR
- Display a brief help text and exit.
- .SH FILES
--.I /usr/local/etc/ngircd.conf
-+.I /etc/ngircd/ngircd.conf
- .RS
- The system wide default configuration file.
- .RE
--.I /usr/local/etc/ngircd.motd
-+.I /etc/ngircd/ngircd.motd
- .RS
- Default "message of the day" (MOTD).
- .RE
-@@ -74,7 +74,6 @@
- http://arthur.ath.cx/~alex/ngircd/
- .UE
- .SH "SEE ALSO"
--.BR ngircd.conf (5),
--.BR ircd (8)
-+.BR ngircd.conf (5)
- .\"
- .\" -eof-
-diff -Naur ngircd-0.9.2-orig/man/ngircd.conf.5 ngircd-0.9.2/man/ngircd.conf.5
---- ngircd-0.9.2-orig/man/ngircd.conf.5	2005-06-04 15:39:20.000000000 +0200
-+++ ngircd-0.9.2/man/ngircd.conf.5	2005-11-15 23:40:41.000000000 +0100
-@@ -5,7 +5,7 @@
- .SH NAME
- ngircd.conf \- configuration file of ngIRCd
- .SH SYNOPSIS
--.B /usr/local/etc/ngircd.conf
-+.B /etc/ngircd/ngircd.conf
- .SH DESCRIPTION
- .BR ngircd.conf
- is the configuration file for

+ 0 - 17
debian/patches/03-ping.dpatch

@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03-unnamed.dpatch by Mario Iseli <admin@marioiseli.com>
-##
-## DP: Fixes the problem with the ping answer.
-
-@DPATCH@
-
-diff -Naur ngircd-0.9.2.orig/src/ngircd/irc-login.c ngircd-0.9.2/src/ngircd/irc-login.c
---- ngircd-0.9.2.orig/src/ngircd/irc-login.c	2005-06-04 14:32:09.000000000 +0200
-+++ ngircd-0.9.2/src/ngircd/irc-login.c	2005-12-14 22:49:28.000000000 +0100
-@@ -456,7 +456,7 @@
- 	}
- 
- 	Log( LOG_DEBUG, "Connection %d: got PING, sending PONG ...", Client_Conn( Client ));
--	return IRC_WriteStrClient( Client, "PONG %s :%s", Client_ID( Client_ThisServer( )), Client_ID( Client ));
-+	return IRC_WriteStrClient(Client, "PONG %s :%s", Client_ID( Client_ThisServer( )), Req->argv[0]);
- } /* IRC_PING */

+ 0 - 32
debian/patches/04-nicklength.dpatch

@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99-unnamed.dpatch by  <mario@localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-
-diff --context -r ngircd-0.9.2/src/ngircd/defines.h ngircd-0.9.2-new/src/ngircd/defines.h
-*** ngircd-0.9.2/src/ngircd/defines.h	2005-07-05 23:58:25.000000000 +0100
---- ngircd-0.9.2-new/src/ngircd/defines.h	2006-03-05 00:45:35.000000000 +0000
-***************
-*** 41,49 ****
-  #define CONNECTION_POOL 100		/* size of default connection pool */
-  
-  #define CLIENT_ID_LEN 64		/* max. length of an IRC ID; see RFC 2812, 1.1 and 1.2.1 */
-! #define CLIENT_NICK_LEN 10		/* max. nick length; see. RFC 2812, 1.2.1 */
-  #define CLIENT_PASS_LEN 21		/* max. password length */
-! #define CLIENT_USER_LEN 10		/* Max. length of user name ("login")
-   					   see RFC 2812, section 1.2.1 */
-  #define CLIENT_NAME_LEN 32		/* max. length of "real names" */
-  #define CLIENT_HOST_LEN 64		/* max. host name length */
---- 41,49 ----
-  #define CONNECTION_POOL 100		/* size of default connection pool */
-  
-  #define CLIENT_ID_LEN 64		/* max. length of an IRC ID; see RFC 2812, 1.1 and 1.2.1 */
-! #define CLIENT_NICK_LEN 16		/* max. nick length; see. RFC 2812, 1.2.1 */
-  #define CLIENT_PASS_LEN 21		/* max. password length */
-! #define CLIENT_USER_LEN 16		/* Max. length of user name ("login")
-   					   see RFC 2812, section 1.2.1 */
-  #define CLIENT_NAME_LEN 32		/* max. length of "real names" */
-  #define CLIENT_HOST_LEN 64		/* max. host name length */

+ 2 - 4
debian/rules

@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/dpatch/dpatch.make
-
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -13,7 +11,7 @@ else
         CFLAGS += -O2
 endif
 
-config.status: patch configure
+config.status: configure
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc/ngircd --without-epoll --with-gnutls --enable-ipv6
 
@@ -25,7 +23,7 @@ build-stamp: config.status
 	$(MAKE)
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp