aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-01-03 14:56:47 -05:00
Code

Moved location of config, theme and doc files. Added debian dir for building a .deb easily.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1607 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-07-05 23:16:18 +00:00 committed by cras
parent 3eca462859
commit 2ddba459c0
17 changed files with 246 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.am
View File

@ -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

72
debian/changelog vendored Normal file
View File

@ -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

1
debian/conffiles vendored Normal file
View File

@ -0,0 +1 @@
/etc/irssi.conf

25
debian/control vendored Normal file
View File

@ -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 (&gt;= 5.6.0-16), libperl-dev, libncurses5-dev, debhelper (&gt;= 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

28
debian/copyright vendored Normal file
View File

@ -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

3
debian/dirs vendored Normal file
View File

@ -0,0 +1,3 @@
etc
usr/bin
usr/share/irssi/scripts

2
debian/menu vendored Normal file
View File

@ -0,0 +1,2 @@
?package(irssi-text):needs=text section=Apps/Net\
title="irssi-text" command="/usr/bin/irssi-text"

8
debian/postinst vendored Normal file
View File

@ -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

8
debian/prerm vendored Normal file
View File

@ -0,0 +1,8 @@
#!/bin/sh -e
#DEBHELPER#
if [ "$1" != "upgrade" ]; then
update-alternatives --remove irssi /usr/bin/irssi-text
fi

80
debian/rules vendored Executable file
View File

@ -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

2
debian/undocumented vendored Normal file
View File

@ -0,0 +1,2 @@
irssi-text.1
botti.1

2
docs/Makefile.am
View File

@ -1,4 +1,4 @@
docdir = $(prefix)/doc/irssi
docdir = $(datadir)/doc/irssi
doc_DATA = \
botnet.txt \

0
config → irssi.conf
View File

6
scripts/Makefile.am
View File

@ -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)

2
src/core/settings.c
View File

@ -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 */

2
src/fe-common/core/Makefile.am
View File

@ -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 \

2
src/fe-common/core/themes.c
View File

@ -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);