diff options
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | debian/changelog | 72 | ||||
| -rw-r--r-- | debian/conffiles | 1 | ||||
| -rw-r--r-- | debian/control | 25 | ||||
| -rw-r--r-- | debian/copyright | 28 | ||||
| -rw-r--r-- | debian/dirs | 3 | ||||
| -rw-r--r-- | debian/menu | 2 | ||||
| -rw-r--r-- | debian/postinst | 8 | ||||
| -rw-r--r-- | debian/prerm | 8 | ||||
| -rwxr-xr-x | debian/rules | 80 | ||||
| -rw-r--r-- | debian/undocumented | 2 | ||||
| -rw-r--r-- | docs/Makefile.am | 2 | ||||
| -rw-r--r-- | irssi.conf (renamed from config) | 0 | ||||
| -rw-r--r-- | scripts/Makefile.am | 6 | ||||
| -rw-r--r-- | src/core/settings.c | 2 | ||||
| -rw-r--r-- | src/fe-common/core/Makefile.am | 2 | ||||
| -rw-r--r-- | src/fe-common/core/themes.c | 2 |
17 files changed, 246 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 631254e2..df35f7c9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,8 @@ # create default-config.h config.h: default-config.h default-theme.h -default-config.h: $(srcdir)/config - $(srcdir)/file2header.sh $(srcdir)/config default_config > default-config.h +default-config.h: $(srcdir)/irssi.conf + $(srcdir)/file2header.sh $(srcdir)/irssi.conf default_config > default-config.h default-theme.h: $(srcdir)/default.theme $(srcdir)/file2header.sh $(srcdir)/default.theme default_theme > default-theme.h @@ -15,8 +15,11 @@ endif SUBDIRS = src $(SERVERTEST) docs scripts -confdir = $(sysconfdir)/irssi -conf_DATA = config default.theme colorless.theme +confdir = $(sysconfdir) +conf_DATA = irssi.conf + +themedir = $(datadir)/irssi/themes +theme_DATA = default.theme colorless.theme noinst_HEADERS = irssi-version.h @@ -29,6 +32,7 @@ EXTRA_DIST = \ irssi.spec \ irssi.spec.in \ $(conf_DATA) \ + $(theme_DATA) \ irssi-config.in \ irssi-icon.png diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..208b2f00 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,72 @@ +irssi-text (0.7.98.3-2) unstable; urgency=low + + * Made perl support ready for perl 5.6.1, thanks to Branden O'Dea + (closes: #95535) + + -- Pekka Aleksi Knuutila <pa@debian.org> Sun, 20 May 2001 15:02:42 +0300 + +irssi-text (0.7.98.3-1) unstable; urgency=low + + * New upstream release (closes: #90139) + * Include the libfe_perl files (closes: #90189) + + -- Pekka Aleksi Knuutila <pa@debian.org> Mon, 19 Mar 2001 17:17:25 +0200 + +irssi-text (0.7.98.1-1) unstable; urgency=low + + * New upstream release + * Recompiled with perl-5.6 (closes: #86157) + * Added alternative for irssi(1) man-page (closes: #80845) + + -- Pekka Aleksi Knuutila <pa@debian.org> Fri, 23 Feb 2001 16:48:43 +0200 + +irssi-text (0.7.97.2-1) unstable; urgency=low + + * New upstream release + + -- Pekka Aleksi Knuutila <pa@debian.org> Tue, 19 Dec 2000 15:22:56 +0200 + +irssi-text (0.7.97.1-1) unstable; urgency=low + + * New upstream release + + -- Pekka Aleksi Knuutila <pa@debian.org> Wed, 6 Dec 2000 21:40:44 +0200 + +irssi-text (0.7.97-1) unstable; urgency=low + + * New upstream release + + -- Pekka Aleksi Knuutila <pa@debian.org> Sun, 3 Dec 2000 21:35:03 +0200 + +irssi-text (0.7.96-2) unstable; urgency=low + + * Added startup-howto to /usr/share/doc + * Applied 0.7.96-2 bugfixes from upstream + + -- Pekka Aleksi Knuutila <pa@debian.org> Mon, 30 Oct 2000 17:48:34 +0200 + +irssi-text (0.7.96-1) unstable; urgency=low + + * New upstream release + + -- Pekka Aleksi Knuutila <pa@debian.org> Thu, 19 Oct 2000 23:22:54 +0300 + +irssi-text (0.7.95-2) unstable; urgency=medium + + * Applied patch to fix remote crash + + -- Pekka Aleksi Knuutila <pa@debian.org> Wed, 23 Aug 2000 10:21:36 +0300 + +irssi-text (0.7.95-1) unstable; urgency=low + + * New upstream release + * Fixed debian/rules clean (closes: Bug#69105) + + -- Pekka Aleksi Knuutila <pa@debian.org> Sun, 13 Aug 2000 22:03:53 +0300 + +irssi-text (0.7.94-1) unstable; urgency=low + + * Initial release + + -- Pekka Aleksi Knuutila <pa@debian.org> Wed, 26 Jul 2000 21:40:40 +0300 + diff --git a/debian/conffiles b/debian/conffiles new file mode 100644 index 00000000..b3001747 --- /dev/null +++ b/debian/conffiles @@ -0,0 +1 @@ +/etc/irssi.conf diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..1080276b --- /dev/null +++ b/debian/control @@ -0,0 +1,25 @@ +Source: irssi-text +Section: net +Priority: optional +Maintainer: Pekka Aleksi Knuutila <pa@debian.org> +Standards-Version: 3.1.0 +Build-Depends: libglib1.2-dev, perl (>= 5.6.0-16), libperl-dev, libncurses5-dev, debhelper (>= 3.0.18), gettext + +Package: irssi-text +Architecture: any +Depends: ${shlibs:Depends} +Suggests: ${perl:Depends} +Conflicts: irssi +Description: text-mode version of the irssi IRC client + Irssi is an IRC client from the author of yagirc, Timo Sirainen. It has a + text, GTK and GNOME interface (with integration to the GNOME panel). + Irssi's features include configurability, smart nick completion, DCC resuming, + support for plugins and perl scripting. + . + This package includes the text-mode version of the irssi client. + . + Other irssi packages are: + irssi-common: common files for the irssi IRC client + irssi-gtk: GTK version of the irssi IRC client + irssi-gnome: GNOME version of the irssi IRC client + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..05bc574c --- /dev/null +++ b/debian/copyright @@ -0,0 +1,28 @@ +This package was debianized by Pekka Aleksi Knuutila <pa@debian.org> on +Wed, 26 Jul 2000 21:40:40 +0300 + +The source for the package can be found from http://www.irssi.org/ + +Upstream Author(s): Timo Sirainen <tss@iki.fi> + +Copyright: + + Copyright (C) 1999 Timo Sirainen + + 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. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in /usr/share/common-licenes/GPL diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 00000000..9ced22e2 --- /dev/null +++ b/debian/dirs @@ -0,0 +1,3 @@ +etc +usr/bin +usr/share/irssi/scripts diff --git a/debian/menu b/debian/menu new file mode 100644 index 00000000..4b7ea5bb --- /dev/null +++ b/debian/menu @@ -0,0 +1,2 @@ +?package(irssi-text):needs=text section=Apps/Net\ +title="irssi-text" command="/usr/bin/irssi-text" diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 00000000..59cc3b2a --- /dev/null +++ b/debian/postinst @@ -0,0 +1,8 @@ +#!/bin/sh -e + +#DEBHELPER# + +update-alternatives --install /usr/bin/irssi irssi /usr/bin/irssi-text 30 \ + --slave /usr/share/man/man1/irssi.1.gz irssi.1.gz \ + /usr/share/man/man1/irssi-text.1.gz + diff --git a/debian/prerm b/debian/prerm new file mode 100644 index 00000000..adcb70b7 --- /dev/null +++ b/debian/prerm @@ -0,0 +1,8 @@ +#!/bin/sh -e + +#DEBHELPER# + +if [ "$1" != "upgrade" ]; then + update-alternatives --remove irssi /usr/bin/irssi-text +fi + diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..216bf649 --- /dev/null +++ b/debian/rules @@ -0,0 +1,80 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This is the debhelper compatability version to use. +export DH_COMPAT=2 + +TMP=`pwd`/debian/irssi-text + +configure: configure-stamp +configure-stamp: + dh_testdir + if grep -q in6_addr /usr/include/netinet/in.h ; then \ + ./configure --prefix=/usr --exec-prefix=/usr --sysconf=/etc \ + --without-servertest --enable-ipv6 --with-bot --with-proxy \ + --enable-perl=yes ; else \ + ./configure --prefix=/usr --exec-prefix=/usr --sysconf=/etc \ + --without-servertest --disable-ipv6 --with-bot --with-proxy \ + --enable-perl=yes ; fi + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + PERL_MM_OPT=INSTALLDIRS=vendor \ + $(MAKE) CFLAGS="-O2 -g -Wall" PERL_LIB_DIR= + touch build-stamp + +clean: + dh_testdir + + -$(MAKE) distclean + -rm -f src/perl/perl-signals-list.h + -rm -f default-theme.h + #-rm -f `find . -name "*~"` debian/*debhelper debian/{files,substvars} + -rm -f default-config.h libtool* + find -name Makefile -o -name Makefile.PL | xargs rm -f + + dh_clean build-stamp configure-stamp + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install DESTDIR=$(TMP) PREFIX=$(TMP)/usr + mv $(TMP)/usr/bin/irssi $(TMP)/usr/bin/irssi-text + rm -rf $(TMP)/usr/share/doc + find $(TMP) -name perllocal.pod -o -name .packlist | xargs rm -f + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + + dh_installdocs README TODO AUTHORS docs/*.txt + dh_installchangelogs NEWS + dh_installmenu + dh_undocumented +ifeq "$(findstring nostrip,$(DEB_BUILD_OPTIONS))" "" + dh_strip +endif + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_perl + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian/undocumented b/debian/undocumented new file mode 100644 index 00000000..512226e1 --- /dev/null +++ b/debian/undocumented @@ -0,0 +1,2 @@ +irssi-text.1 +botti.1 diff --git a/docs/Makefile.am b/docs/Makefile.am index df7947a1..d34d110c 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,4 +1,4 @@ -docdir = $(prefix)/doc/irssi +docdir = $(datadir)/doc/irssi doc_DATA = \ botnet.txt \ diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 542c4700..7a5a7ab4 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1,4 +1,6 @@ -EXTRA_DIST = \ +scriptdir = $(datadir)/irssi/scripts + +script_DATA = \ autoop.pl \ autorejoin.pl \ clones.pl \ @@ -6,3 +8,5 @@ EXTRA_DIST = \ privmsg.pl \ realname.pl \ quitmsg.pl + +EXTRA_DIST = $(script_DATA) diff --git a/src/core/settings.c b/src/core/settings.c index 0169b268..d2482106 100644 --- a/src/core/settings.c +++ b/src/core/settings.c @@ -500,7 +500,7 @@ static CONFIG_REC *parse_configfile(const char *fname) else { /* user configuration file not found, use the default one from sysconfdir */ - path = SYSCONFDIR"/irssi/config"; + path = SYSCONFDIR"/irssi.conf"; if (stat(path, &statbuf) != 0) { /* no configuration file in sysconfdir .. use the build-in configuration */ diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am index 9913cfe8..01c4f002 100644 --- a/src/fe-common/core/Makefile.am +++ b/src/fe-common/core/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = \ $(GLIB_CFLAGS) \ -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \ -DHELPDIR=\""$(datadir)/irssi/help"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" + -DTHEMESDIR=\""$(datadir)/irssi/themes"\" libfe_common_core_a_SOURCES = \ autorun.c \ diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c index 6a8c42c4..7fcd31ac 100644 --- a/src/fe-common/core/themes.c +++ b/src/fe-common/core/themes.c @@ -705,7 +705,7 @@ THEME_REC *theme_load(const char *setname) if (stat(fname, &statbuf) != 0) { /* check global config dir */ g_free(fname); - fname = g_strdup_printf(SYSCONFDIR"/irssi/%s.theme", name); + fname = g_strdup_printf(THEMESDIR"/%s.theme", name); if (stat(fname, &statbuf) != 0) { /* theme not found */ g_free(fname); |