stuff

SVN revision: 2194

7 files changed, 104 insertions, 75 deletions

diff --git a/debian/changelog b/debian/changelog
index 43bdb41..d9d743f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,29 +1,10 @@
-eterm (0.9.0-0-cvs0b) unstable; urgency=low
+eterm (0.9.1-0.2000022502) unstable; urgency=low
 
-  * Yet Another CVS release 
+  * A CVS release.
 
- -- Laurence John Lane <ljlane@debian.org>  Fri, 19 Nov 1999 22:38:33 -0500
-
-eterm (0.9.0-0-cvs0a) unstable; urgency=low
-
-  * Yet Another CVS Release 
-
- -- Laurence John Lane <ljlane@debian.org>  Thu, 18 Nov 1999 13:41:21 -0500
-
-eterm (0.9.0-0-cvs00) unstable; urgency=low
-
-  * changed cvs version numbering
-
- -- Laurence John Lane <ljlane@debian.org>  Sat, 23 Oct 1999 19:39:25 -0400
-
-eterm (0.9.0-0.1) unstable; urgency=low
-
-  * new mainter
-  * jacked the stable debian/ for the cvs tree
-
- -- Laurence John Lane <ljlane@debian.org>  Thu, 21 Oct 1999 22:20:12 -0400
+ -- Laurence J. Lane <ljlane@debian.org>  Fri, 25 Feb 2000 17:11:42 -0500
 
 Local variables:
 mode: debian-changelog
-add-log-mailing-address: "ljlane@debian.org"
+add-log-mailing-address: "bma@debian.org"
 End:
diff --git a/debian/control b/debian/control
index b1cf126..c482878 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,18 @@ Source: eterm
 Section: x11
 Priority: optional
 Maintainer: Laurence J. Lane <ljlane@debian.org>
-Standards-Version: 2.5.0.0
+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
 
 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, pixmap shading/tinting, and pseudo-transparency.
+ background images, pixmapped scrollbars, and the pseudo-transparency.
  Eterm also now uses libpthreads.
+
diff --git a/debian/copyright b/debian/copyright
index 26ba98b..deaad28 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,13 @@
 This package was debianized by Sean E. Perry shaleh@debian.org on
 Sun, 27 Sep 1998 20:18:11 -0400.
 
-It was downloaded from www.eterm.org
+The source for this package was obtained from:
+
+  ftp://eterm.sourceforge.net/pub/eterm/Eterm-0.9.tar.gz
 
 Copyright:
 
-Eterm is released under the GPL.
+Eterm is released under the GNU Public License.  Debian systems should have 
+a copy located at:
+  
+  /usr/share/common-licenses/GPL.
diff --git a/debian/doc-base.tech b/debian/doc-base.tech
index 3748b4a..eef5427 100644
--- a/debian/doc-base.tech
+++ b/debian/doc-base.tech
@@ -6,5 +6,5 @@ Abstract: Technical Reference for Eterm's escape codes, config file format,
 Section: Apps/Terminals
 
 Format: HTML
-Index: /usr/doc/eterm/Eterm_reference.html
-Files: /usr/doc/eterm/Eterm_reference.html
+Index: /usr/share/doc/eterm/Eterm_reference.html
+Files: /usr/share/doc/eterm/Eterm_reference.html
diff --git a/debian/postinst b/debian/postinst
index cd10aa0..87b2531 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,5 +1,20 @@
 #!/bin/sh -e
 
-ldconfig
+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
index e03afae..8178bb1 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,9 +1,7 @@
 #!/bin/sh -e
-# Automatically added by dh_installmenu
-if test -x /usr/bin/update-menus ; then update-menus ; fi
-# End automatically added section
-# Automatically added by dh_suidregister
-if command -v suidunregister >/dev/null 2>&1 && [ -e /etc/suid.conf ]; then
-        suidunregister -s eterm /usr/X11R6/bin/Eterm
+
+if [ "$1" = remove ]; then
+    if test -x /usr/bin/update-menus; then update-menus; fi
 fi
-# End automatically added section
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 6313c59..31fd9f4 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,22 @@
 #!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
 
-export DH_COMPAT=2
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-vpath build debian/pmt/
-vpath install debian/pmt/
-cfg = --prefix=/usr --mandir=/usr/share/man
-pwd := $(shell pwd)
+# This is the debhelper compatability version to use.
+export DH_COMPAT=1
+pwd:=$(shell pwd)
 
-build:
+cfg = --mandir=$(pwd)/tmp/usr/share/man --enable-fsstd \
+  --enable-xim --with-backspace=del --with-delete=execute
+
+build: build-stamp
+build-stamp:
 	dh_testdir
-	test -x autogen.sh && ./autogen.sh $(cfg)  || ./configure $(cfg)
+
+	./autogen.sh ${cfg}
 
 	install -d debian/pmt/
 
@@ -28,39 +35,58 @@ build:
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
-	-$(MAKE) -k distclean clean
-	rm -rvf debian/pmt/
+	rm -f build-stamp config.cache
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+	-rm -rf debian/pmt/
+
 	dh_clean
 
 install: build
-	dh_testdir 
-	dh_testroot 
-	dh_clean 
-	dh_installdirs 
-	$(MAKE) install DESTDIR=$(pwd)/debian/eterm
-	touch debian/pmt/$@
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
 
+	# Add here commands to install the package into debian/tmp.
+	$(MAKE) install prefix=$(pwd)/debian/tmp/usr
+
+
+# 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 ReleaseNotes doc/{Eterm.tcap,Eterm.ti,Eterm_reference.html}
-	dh_installmenu 
-	dh_undocumented  Esetroot.1 Etbg.1 Etcolors.1 Ettable.1 Etwinop.1
-	dh_installchangelogs 
-	dh_strip 
-	dh_compress 
-	dh_fixperms 
-	dh_suidregister usr/bin/Eterm
-	dh_installdeb 
-	dh_makeshlibs
-	dh_shlibdeps -l$(pwd)/debian/Eterm/usr/lib 
-	dh_gencontrol 
-	dh_md5sums 
-	dh_builddeb 
-
-binary-indep:
-
-binary: binary-arch
-
-.PHONY: clean binary-indep binary-arch binary
+#	dh_testversion
+	dh_testdir
+	dh_testroot
+#	dh_installdebconf	
+	dh_installdocs
+	dh_installexamples
+	dh_installmenu
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installinit
+#	dh_installcron
+	dh_installmanpages
+	dh_installinfo
+#	dh_undocumented
+	dh_installchangelogs ChangeLog
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	# You may want to make some executables suid here.
+#	dh_suidregister
+#	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