diff --git a/debian/README.debian b/debian/README.debian deleted file mode 100644 index 36f463b..0000000 --- a/debian/README.debian +++ /dev/null @@ -1,12 +0,0 @@ -eterm for DEBIAN ----------------------- - -Sources can be found at www.eterm.org. Would like again to thank all of -#E on EFNet and #Debian on openprojects.net. - -This is a CVS PRERELEASE DEB _ONLY_! DO NOT FILE BUGS AGAINST IT! -If you run into problems, please contact Brian Almeida - -No changes made from the original. - -Brian M. Almeida , Sun, 27 Sep 1998 20:18:11 -0400 diff --git a/debian/changelog b/debian/changelog index fc647bc..8c36a5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,5 @@ -eterm (0.9.2-0.2003080201) unstable; urgency=low +eterm (0.9.3-0cvs20030911) unstable; urgency=low - * a cvs release + * a CVS release - -- Laurence J. Lane Mon, 13 Nov 2000 10:58:37 -0500 - -Local variables: -mode: debian-changelog -add-log-mailing-address: "ljlane@debian.org" -End: -eoch + -- Sytse Wielinga Thu, 11 Sep 2003 15:21:22 +0200 diff --git a/debian/control b/debian/control index c482878..2276d4c 100644 --- a/debian/control +++ b/debian/control @@ -1,19 +1,21 @@ Source: eterm Section: x11 Priority: optional -Maintainer: Laurence J. Lane -Standards-Version: 3.1.1 -Build-Depends: imlib-dev, libc6-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libungif3g-dev | giflib3g-dev, zlib1g-dev, debhelper, xlib6g-dev +Maintainer: Sytse Wielinga +Standards-Version: 3.6.1.0 +Build-Depends: libimlib2-dev, libast2-dev (>=0.6), libpcre3-dev, libttf-dev, debhelper (>> 4.0) Package: eterm Architecture: any -Depends: ${shlibs:Depends} -Provides: x-terminal-emulator -Conflicts: eterm-backgrounds (<< 1.1-5) -Description: Enlightened Terminal Emulator (ala xterm) with Imlib support - A terminal emulator in the spirit of xterm or rxvt. However this one differs - in that it uses an Enlightenment style config file, as well as themes. The - Imlib graphics engine is used to render images. This version supports - background images, pixmapped scrollbars, and the pseudo-transparency. - Eterm also now uses libpthreads. - +Depends: ncurses-term, ${shlibs:Depends} +Provides: x-terminal-emulator, eterm-backgrounds +Conflicts: eterm-backgrounds, eterm-ml +Replaces: eterm-ml, eterm-backgrounds +Description: Enlightened Terminal Emulator + A terminal emulator in the spirit of xterm or rxvt, eterm uses an + Enlightenment style config file, as well as themes. The Imlib graphics + engine is used to render images. This version supports background images, + pixmapped scrollbars, pseudo-transparency, POSIX threads, and unicode + support. + . + This is a CVS version. diff --git a/debian/copyright b/debian/copyright index deaad28..d0260f5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,13 +1,30 @@ This package was debianized by Sean E. Perry shaleh@debian.org on Sun, 27 Sep 1998 20:18:11 -0400. -The source for this package was obtained from: +It was downloaded by CVS from: + :pserver:anonymous@cvs.sourceforge.net:/cvsroot/enlightenment - ftp://eterm.sourceforge.net/pub/eterm/Eterm-0.9.tar.gz +Upstream Author: Michael Jennings Copyright: -Eterm is released under the GNU Public License. Debian systems should have -a copy located at: - - /usr/share/common-licenses/GPL. + Copyright (C) 1997-2003, Michael Jennings + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies of the Software, its documentation and marketing & publicity + materials, and acknowledgment shall be given in the documentation, materials + and software packages that this Software was used. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/debian/doc-base.faq b/debian/doc-base.faq deleted file mode 100644 index 80f9bd8..0000000 --- a/debian/doc-base.faq +++ /dev/null @@ -1,10 +0,0 @@ -Document: eterm-faq -Title: Eterm Frequently Asked Questions -Author: Michael Jennings -Abstract: Frequently Asked Questions about the Enlightened Terminal. - . -Section: Apps/Terminals - -Format: HTML -Index: /usr/doc/eterm/FAQ.html -Files: /usr/doc/eterm/FAQ.html diff --git a/debian/eterm-utils.1 b/debian/eterm-utils.1 new file mode 100644 index 0000000..52b711c --- /dev/null +++ b/debian/eterm-utils.1 @@ -0,0 +1,47 @@ +.TH ETERM-UTILS 1 +.SH NAME +eterm-utils \- Eterm accessory programs +.SH SYNOPSIS +.B Esetroot +.I "[-display display] [-scale] pixmap" +.br +.B kEsetroot +.I pixmap +.br +.B Etbg +.I "pixmap" +.br +.B Ettable +.br +.B Etcolors +.br +.B Etsearch +.I string +.br +.B Etbg_update_list +.SH "DESCRIPTION" +.PP +.B Esetroot +set the Eterm background for transparency with window managers other than enlightenment. +.B kEsetroot +is provided for KDE. +.br +.B Etbg +set the Eterm background image +.br +.B Ettable +display the current font character set +.br +.B Etcolors +display a table of the current color map +.br +.B Etsearch +search the scroll back buffer, it's secksie +.br +.B Etbg_update_list +update pixmap lists for the menus +.SH "SEE ALSO" +.IR "eterm(1)" , +.SH AUTHOR +This manual page was written by Laurence J. Lane , +for the Debian GNU/Linux system (but may be used by others). diff --git a/debian/doc-base.tech b/debian/eterm.doc-base similarity index 100% rename from debian/doc-base.tech rename to debian/eterm.doc-base diff --git a/debian/eterm.docs b/debian/eterm.docs new file mode 100644 index 0000000..cc3d82a --- /dev/null +++ b/debian/eterm.docs @@ -0,0 +1,8 @@ +README +CVS-README +ReleaseNotes +ReleaseNotes.1 +doc/README.Escreen +doc/Eterm_reference.html +doc/Eterm.ti +doc/Eterm.tcap diff --git a/debian/eterm.files b/debian/eterm.files new file mode 100644 index 0000000..7ed6f51 --- /dev/null +++ b/debian/eterm.files @@ -0,0 +1,17 @@ +usr/bin/* +usr/lib/*.so +usr/lib/*.la +usr/share/man/man1/*.1 +usr/share/Eterm/pix/tile/*.jpg +usr/share/Eterm/pix/scale/*.jpg +usr/share/Eterm/pix/*.png +usr/share/Eterm/pix/pixmaps.list +usr/share/Eterm/gdb.scr +usr/share/Eterm/themes/auto/*.cfg +usr/share/Eterm/themes/auto/pixmaps.list +usr/share/Eterm/themes/Eterm/*.cfg +usr/share/Eterm/themes/Eterm/pixmaps.list +usr/share/Eterm/themes/trans/*.cfg +usr/share/Eterm/themes/trans/pixmaps.list +usr/share/Eterm/themes/Escreen/*.cfg +usr/share/Eterm/themes/Escreen/pixmaps.list diff --git a/debian/eterm.links b/debian/eterm.links new file mode 100644 index 0000000..576bf0e --- /dev/null +++ b/debian/eterm.links @@ -0,0 +1,7 @@ +usr/share/man/man1/eterm-utils.1.gz usr/share/man/man1/Etcolors.1.gz +usr/share/man/man1/eterm-utils.1.gz usr/share/man/man1/Etbg.1.gz +usr/share/man/man1/eterm-utils.1.gz usr/share/man/man1/Ettable.1.gz +usr/share/man/man1/eterm-utils.1.gz usr/share/man/man1/Esetroot.1.gz +usr/share/man/man1/eterm-utils.1.gz usr/share/man/man1/kEsetroot.1.gz +usr/share/man/man1/eterm-utils.1.gz usr/share/man/man1/Etsearch.1.gz +usr/share/man/man1/eterm-utils.1.gz usr/share/man/man1/Etbg_update_list.1.gz diff --git a/debian/menu b/debian/eterm.menu similarity index 100% rename from debian/menu rename to debian/eterm.menu diff --git a/debian/eterm.postinst b/debian/eterm.postinst new file mode 100644 index 0000000..c8809a9 --- /dev/null +++ b/debian/eterm.postinst @@ -0,0 +1,20 @@ +#!/bin/sh + +set -e + +if [ "$1" = configure ]; then + xte='x-terminal-emulator' + binary='/usr/bin/Eterm' + xtebinary="/usr/bin/$xte" + xteman="/usr/share/man/man1/$xte.1.gz" + man='/usr/share/man/man1/Eterm.1.gz' + + chown root.utmp $binary + chmod 2755 $binary + + update-alternatives \ + --install $xtebinary $xte $binary 10 \ + --slave $xteman $xte.1.gz $man +fi + +#DEBHELPER# diff --git a/debian/eterm.prerm b/debian/eterm.prerm new file mode 100644 index 0000000..d89a1d7 --- /dev/null +++ b/debian/eterm.prerm @@ -0,0 +1,9 @@ +#!/bin/sh -e + +if [ "$1" = remove -o "$1" = upgrade ]; then + xte='x-terminal-emulator' + xtebinary="/usr/bin/$xte" + update-alternatives --remove $xte $xtebinary +fi + +#DEBHELPER# diff --git a/debian/postinst b/debian/postinst deleted file mode 100644 index 87b2531..0000000 --- a/debian/postinst +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -e - -BIN=/usr/bin/Eterm - -if [ "$1" = configure ]; then - ldconfig - if test -x /usr/bin/update-menus; then update-menus; fi - if test -e /etc/suid.conf -a -x /usr/sbin/suidregister; then - #cleanup old "Eterm" mess - if test -x /usr/sbin/suidunregister; then - grep -q "Eterm $BIN" /etc/suid.conf && /usr/sbin/suidunregister -s Eterm $BIN - fi - suidregister -s eterm /usr/bin/Eterm root utmp 2755 - else - chown root.utmp $BIN - chmod 2755 $BIN - fi -fi - -#DEBHELPER# diff --git a/debian/postrm b/debian/postrm deleted file mode 100644 index 8178bb1..0000000 --- a/debian/postrm +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -e - -if [ "$1" = remove ]; then - if test -x /usr/bin/update-menus; then update-menus; fi -fi - -#DEBHELPER# diff --git a/debian/rules b/debian/rules index 8b457f8..cf902b1 100644 --- a/debian/rules +++ b/debian/rules @@ -3,42 +3,75 @@ # GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 -export DH_COMPAT=1 -pwd:=$(shell pwd) -cfg = --mandir=/usr/share/man --enable-fsstd \ - --enable-xim --with-backspace=del --with-delete=execute \ - --with-home=linux --with-end=linux +# This is the debhelper compatability version to use. +export DH_COMPAT=4 -build: build-stamp + +CFLAGS ?= -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif +ifneq (,$(findstring mmx,$(DEB_BUILD_OPTIONS))) + ENABLE_MMX = yes +else + ENABLE_MMX = no +endif + +# 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) + +INSTALL=/usr/bin/install -p +CONFIGUREOPTS = --prefix=/usr --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \ + --mandir=/usr/share/man \ + --enable-xim \ + --with-backspace=del \ + --with-delete=execute \ + --with-home=xterm \ + --with-end=xterm \ + --enable-share=yes \ + --enable-static=no \ + --enable-mmx=$(ENABLE_MMX) \ + --enable-multi-charset=unicode \ + --enable-escreen \ + --without-sense-of-humor \ + --with-pty-group=tty + +configure: configure-stamp +configure-stamp: + dh_testdir + + # we don't like rpath + perl -pi -e 's/^(Eterm|Esetroot)_LDFLAGS =.*$$//' \ + $$(find . -name Makefile.am -o -name Makefile.in) + + test -x autogen.sh && ./autogen.sh $(CONFIGUREOPTS) || ./configure $(CONFIGUREOPTS) + + touch configure-stamp + +build: configure build-stamp build-stamp: dh_testdir - ./autogen.sh ${cfg} - - install -d debian/pmt/ - - # because glibc 2.1's utmpx.h is incompatible on sparc - sed 's/#define HAVE_UTMPX_H 1/\/* #undef HAVE_UTMPX_H *\//' config.h > debian/pmt/config.h - cp debian/pmt/config.h config.h - - # fix rpath issues - cp libtool debian/pmt/libtool - sed \ - -e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec="-D__LIBTOOL_IS_A_FOOL__ "/' \ - -e '/^archive_cmds="/s/"$$/ \\$$deplibs"/' debian/pmt/libtool > libtool $(MAKE) - touch debian/pmt/$@ + + touch build-stamp clean: dh_testdir - dh_testroot - rm -f build-stamp config.cache + rm -f build-stamp configure-stamp - # Add here commands to clean up after the build process. - -$(MAKE) clean - -rm -rf debian/pmt/ + -$(MAKE) distclean dh_clean @@ -47,12 +80,8 @@ install: build dh_testroot dh_clean -k dh_installdirs - - # Add here commands to install the package into debian/tmp. - $(MAKE) install DESTDIR=$(pwd)/debian/tmp - install -d $(pwd)/debian/tmp/usr/share/doc/eterm - install $(pwd)/ChangeLog $(pwd)/debian/tmp/usr/share/doc/eterm - + + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp binary-indep: build install @@ -61,11 +90,14 @@ binary-arch: build install dh_testroot dh_installdocs dh_installmenu + dh_installman debian/eterm-utils.1 dh_installchangelogs + dh_movefiles dh_link dh_strip dh_compress dh_fixperms + dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol @@ -73,4 +105,4 @@ binary-arch: build install dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +.PHONY: build clean binary-indep binary-arch binary install configure