Enlightenment CVS committal
Author : mej
Project : eterm
Module : Eterm
Dir : eterm/Eterm/debian
Modified Files:
Tag: ETERM-0_10
changelog control copyright rules
Added Files:
Tag: ETERM-0_10
eterm-utils.1 eterm.doc-base eterm.docs eterm.files
eterm.links eterm.menu eterm.postinst eterm.prerm
Removed Files:
Tag: ETERM-0_10
README.debian doc-base.faq doc-base.tech menu postinst postrm
Log Message:
Mon Oct 6 20:44:29 2003 Michael Jennings (mej)
Forgot to merge last time.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/debian/changelog,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -3 -r1.12.2.1 -r1.12.2.2
--- changelog 24 Aug 2003 15:16:43 -0000 1.12.2.1
+++ changelog 7 Oct 2003 00:48:27 -0000 1.12.2.2
@@ -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 <[EMAIL PROTECTED]> Mon, 13 Nov 2000 10:58:37 -0500
-
-Local variables:
-mode: debian-changelog
-add-log-mailing-address: "[EMAIL PROTECTED]"
-End:
-eoch
+ -- Sytse Wielinga <[EMAIL PROTECTED]> Thu, 11 Sep 2003 15:21:22 +0200
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/debian/control,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -3 -r1.4 -r1.4.2.1
--- control 7 Mar 2000 17:13:34 -0000 1.4
+++ control 7 Oct 2003 00:48:27 -0000 1.4.2.1
@@ -1,19 +1,21 @@
Source: eterm
Section: x11
Priority: optional
-Maintainer: Laurence J. Lane <[EMAIL PROTECTED]>
-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 <[EMAIL PROTECTED]>
+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.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/debian/copyright,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -3 -r1.2 -r1.2.2.1
--- copyright 7 Mar 2000 17:13:34 -0000 1.2
+++ copyright 7 Oct 2003 00:48:27 -0000 1.2.2.1
@@ -1,13 +1,30 @@
This package was debianized by Sean E. Perry [EMAIL PROTECTED] on
Sun, 27 Sep 1998 20:18:11 -0400.
-The source for this package was obtained from:
+It was downloaded by CVS from:
+ :pserver:[EMAIL PROTECTED]:/cvsroot/enlightenment
- ftp://eterm.sourceforge.net/pub/eterm/Eterm-0.9.tar.gz
+Upstream Author: Michael Jennings <[EMAIL PROTECTED]>
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.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/debian/rules,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -3 -r1.11 -r1.11.2.1
--- rules 4 Mar 2001 02:34:37 -0000 1.11
+++ rules 7 Oct 2003 00:48:27 -0000 1.11.2.1
@@ -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
-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
- ./autogen.sh ${cfg}
+ # 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
- install -d debian/pmt/
+build: configure build-stamp
+build-stamp:
+ dh_testdir
- # 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 @@
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 @@
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 @@
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
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
