[Pkg-irc-commits] r14 - in /packages/inspircd/trunk: configure debian/control debian/inspircd.examples debian/patches/00list debian/patches/01_rpath.dpatch debian/postinst debian/rules

mario at users.alioth.debian.org mario at users.alioth.debian.org
Sat Oct 6 23:50:30 UTC 2007


Author: mario
Date: Sat Oct  6 23:50:30 2007
New Revision: 14

URL: http://svn.debian.org/wsvn/pkg-irc/?sc=1&rev=14
Log:
Added a patch to fix -Wl,--rpath issue (lintian)

Added:
    packages/inspircd/trunk/debian/patches/00list
    packages/inspircd/trunk/debian/patches/01_rpath.dpatch
Removed:
    packages/inspircd/trunk/configure
    packages/inspircd/trunk/debian/postinst
Modified:
    packages/inspircd/trunk/debian/control
    packages/inspircd/trunk/debian/inspircd.examples
    packages/inspircd/trunk/debian/rules

Modified: packages/inspircd/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd/trunk/debian/control?rev=14&op=diff
==============================================================================
--- packages/inspircd/trunk/debian/control (original)
+++ packages/inspircd/trunk/debian/control Sat Oct  6 23:50:30 2007
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian IRC Team <pkg-irc-maintainers at lists.alioth.debian.org>
 Uploaders: Darren Blaber <dbmtech at gmail.com>, Mario Iseli <mario at debian.org>
-Build-Depends: debhelper (>= 5), perl-modules, libgnutls-dev
+Build-Depends: debhelper (>= 5), perl-modules, libgnutls-dev, dpatch
 Standards-Version: 3.7.2
 
 Package: inspircd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Modular IRCd written in C++
  Inspircd is a modulat IRC Daemon written in C++ for several operating systems.
  Its target is to be stale, lightweight and it's written from scratch. Inspircd

Modified: packages/inspircd/trunk/debian/inspircd.examples
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd/trunk/debian/inspircd.examples?rev=14&op=diff
==============================================================================
--- packages/inspircd/trunk/debian/inspircd.examples (original)
+++ packages/inspircd/trunk/debian/inspircd.examples Sat Oct  6 23:50:30 2007
@@ -1,0 +1,11 @@
+conf/inspircd.motd.example
+conf/inspircd.helpop-full.example
+conf/inspircd.censor.example
+conf/aliases
+conf/aliases/ircservices.conf.example
+conf/aliases/anope.conf.example
+conf/aliases/atheme.conf.example
+conf/inspircd.quotes.example
+conf/inspircd.helpop.example
+conf/inspircd.filter.example
+conf/inspircd.rules.example

Added: packages/inspircd/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd/trunk/debian/patches/00list?rev=14&op=file
==============================================================================
--- packages/inspircd/trunk/debian/patches/00list (added)
+++ packages/inspircd/trunk/debian/patches/00list Sat Oct  6 23:50:30 2007
@@ -1,0 +1,1 @@
+01_rpath.dpatch

Added: packages/inspircd/trunk/debian/patches/01_rpath.dpatch
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd/trunk/debian/patches/01_rpath.dpatch?rev=14&op=file
==============================================================================
--- packages/inspircd/trunk/debian/patches/01_rpath.dpatch (added)
+++ packages/inspircd/trunk/debian/patches/01_rpath.dpatch Sat Oct  6 23:50:30 2007
@@ -1,0 +1,140 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99-unnamed.dpatch by Mario Iseli <mario at marioiseli.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+
+diff -Naur new/inspircd/configure old/inspircd/configure
+--- new/inspircd/configure	2007-10-07 01:47:42.000000000 +0200
++++ old/inspircd/configure	2007-05-19 17:56:42.000000000 +0200
+@@ -881,7 +881,7 @@
+ 	$config{LDLIBS} = "-lstdc++";
+ 	$config{FLAGS}  = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+ 	$config{DEVELOPER} = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual -g";
+-	$SHARED = "-Wl,$config{LIBRARY_DIR} -shared";
++	$SHARED = "-Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared";
+ 	$config{MAKEPROG} = "make";
+ 
+ 	if ($config{OSNAME} =~ /darwin/i) {
+@@ -1681,96 +1681,96 @@
+ all: libIRCDtimer.so libIRCDcull_list.so libIRCDuserprocess.so libIRCDsocketengine.so libIRCDsocket.so libIRCDhash.so libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so $cmdobjs libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so libIRCDsnomasks.so inspircd
+ 
+ inspircd: inspircd.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/channels.h ../include/globals.h ../include/inspircd_config.h ../include/socket.h libIRCDtimer.so libIRCDcull_list.so libIRCDuserprocess.so libIRCDsocketengine.so libIRCDsocket.so libIRCDhash.so libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so $cmdobjs libIRCDsnomasks.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so
+-	\$(CC) -pipe -I../include $extra -Wl,$config{LIBRARY_DIR} \$(FLAGS) -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDhash.so libIRCDsocket.so libIRCDsocketengine.so libIRCDuserprocess.so libIRCDcull_list.so libIRCDcommand_parse.so libIRCDtimer.so libIRCDsnomasks.so
++	\$(CC) -pipe -I../include $extra -Wl,--rpath -Wl,$config{LIBRARY_DIR} \$(FLAGS) -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDhash.so libIRCDsocket.so libIRCDsocketengine.so libIRCDuserprocess.so libIRCDcull_list.so libIRCDcommand_parse.so libIRCDtimer.so libIRCDsnomasks.so
+ 
+ libIRCDsocketengine.so: $se.cpp socketengine.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h ../include/$se.h
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c socketengine.cpp $se.cpp
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDsocketengine.so socketengine.o $se.o
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDsocketengine.so socketengine.o $se.o
+ 
+ libIRCDsnomasks.so: snomasks.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/channels.h
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c snomasks.cpp
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDsnomasks.so snomasks.o
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDsnomasks.so snomasks.o
+ 
+ libIRCDcommand_parse.so: command_parse.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c command_parse.cpp
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDcommand_parse.so command_parse.o
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDcommand_parse.so command_parse.o
+ 
+ libIRCDcull_list.so: cull_list.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h ../include/users.h ../include/channels.h
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c cull_list.cpp
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDcull_list.so cull_list.o
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDcull_list.so cull_list.o
+ 
+ libIRCDuserprocess.so: userprocess.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c userprocess.cpp
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDuserprocess.so userprocess.o
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDuserprocess.so userprocess.o
+ 
+ libIRCDhash.so: hashcomp.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c hashcomp.cpp
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDhash.so hashcomp.o
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDhash.so hashcomp.o
+ 
+ libIRCDhelper.so: helperfuncs.cpp ../include/base.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c helperfuncs.cpp
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDhelper.so helperfuncs.o
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDhelper.so helperfuncs.o
+ 
+ libIRCDchannels.so: channels.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c channels.cpp
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDchannels.so channels.o
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDchannels.so channels.o
+ 
+ libIRCDmode.so: mode.cpp ../include/base.h ../include/mode.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h \$(RELCPPFILES)
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c mode.cpp
+ 	\${MAKE} -C "modes" DIRNAME="src/modes" CC="\$(CC)" \$(MAKEARGS) CPPFILES="\$(CPPFILES)"
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDmode.so mode.o modes/modeclasses.a
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDmode.so mode.o modes/modeclasses.a
+ 
+ libIRCDxline.so: xline.cpp ../include/base.h ../include/xline.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c xline.cpp
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDxline.so xline.o
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDxline.so xline.o
+ 
+ libIRCDstring.so: inspstring.cpp ../include/base.h ../include/inspstring.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c inspstring.cpp
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDstring.so inspstring.o
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDstring.so inspstring.o
+ 
+ libIRCDasyncdns.so: dns.cpp ../include/base.h ../include/dns.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c dns.cpp
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDasyncdns.so dns.o
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDasyncdns.so dns.o
+ 
+ libIRCDbase.so: base.cpp ../include/base.h ../include/globals.h ../include/inspircd_config.h
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c base.cpp
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDbase.so base.o
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDbase.so base.o
+ 
+ libIRCDconfigreader.so: configreader.cpp ../include/base.h ../include/configreader.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c configreader.cpp
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDconfigreader.so configreader.o
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDconfigreader.so configreader.o
+ 
+ libIRCDcommands.so: commands.cpp ../include/base.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c commands.cpp
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDcommands.so commands.o
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDcommands.so commands.o
+ 
+ libIRCDdynamic.so: dynamic.cpp ../include/base.h ../include/dynamic.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c dynamic.cpp
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDdynamic.so dynamic.o
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDdynamic.so dynamic.o
+ 
+ libIRCDusers.so: users.cpp ../include/base.h ../include/users.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c users.cpp
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDusers.so users.o
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDusers.so users.o
+ 
+ libIRCDmodules.so: modules.cpp ../include/base.h ../include/modules.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c modules.cpp
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDmodules.so modules.o
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDmodules.so modules.o
+ 
+ libIRCDwildcard.so: wildcard.cpp ../include/base.h ../include/wildcard.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c wildcard.cpp
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDwildcard.so wildcard.o
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDwildcard.so wildcard.o
+ 
+ libIRCDsocket.so: socket.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c socket.cpp
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDsocket.so socket.o
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDsocket.so socket.o
+ 
+ libIRCDinspsocket.so: inspsocket.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c inspsocket.cpp
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDinspsocket.so inspsocket.o
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDinspsocket.so inspsocket.o
+ 
+ libIRCDtimer.so: timer.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
+ 	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c timer.cpp
+-	\$(CC) -pipe -Wl,$config{LIBRARY_DIR} -shared -o libIRCDtimer.so timer.o
++	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDtimer.so timer.o
+ 
+ EOM
+ }

Modified: packages/inspircd/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd/trunk/debian/rules?rev=14&op=diff
==============================================================================
--- packages/inspircd/trunk/debian/rules (original)
+++ packages/inspircd/trunk/debian/rules Sat Oct  6 23:50:30 2007
@@ -33,7 +33,7 @@
 	rm -f build-stamp
 
 	#Making distclean should remove the symlink, but it doesn't, so we do it here
-	-$(MAKE) distclean
+	if [ -f Makefile ]; -$(MAKE) distclean
 	rm -rf src/modules/m_ssl_gnutls.cpp
 	dh_clean
 
@@ -56,6 +56,7 @@
 	dh_testdir
 	dh_testroot
 	dh_installdocs
+	dh_installchangelogs
 	dh_installexamples
 	dh_installinit
 	dh_installman debian/inspircd.1




More information about the Pkg-irc-commits mailing list