the removal stuff needs a bit of cleaning

SVN revision: 944

4 files changed, 57 insertions, 107 deletions

diff --git a/debian/changelog b/debian/changelog
index 979f32d..e9a0719 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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
+
 eterm (0.8.9-0.1) unstable; urgency=low
 
   * Made CVS debian/ stuff just like regular package stuff
diff --git a/debian/control b/debian/control
index 4e574bb..0336988 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,12 @@
 Source: eterm
 Section: x11
 Priority: optional
-Maintainer: Brian M. Almeida <bma@debian.org>
+Maintainer: Laurence J. Lane <ljlane@debian.org>
 Standards-Version: 2.5.0.0
 
 Package: eterm
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: eterm-backgrounds
 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
diff --git a/debian/postinst b/debian/postinst
index 843845a..cd10aa0 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -2,28 +2,4 @@
 
 ldconfig
 
-if [ -x /usr/bin/update-menus ] ; then update-menus ; fi
-
-cd /usr/share/Eterm/themes
-for theme_dir in `ls -1`
-do
-	if [ -d $theme_dir ]
-	then
-		cd $theme_dir
-		echo "Linking pixmaps.list in $theme_dir"
-		ln -sf /usr/share/Eterm/pix/pixmaps.list pixmaps.list
-		cd ..
-	fi
-done
-
-# Register with suidmanager
-if command -v suidregister >/dev/null 2>&1 && [ -e /etc/suid.conf ]; then
-        suidregister -s eterm /usr/X11R6/bin/Eterm root root 4755
-else
-        chown root.root /usr/X11R6/bin/Eterm
-        chmod 4755 /usr/X11R6/bin/Eterm
-fi
-
-if command -v install-docs >/dev/null 2>&1; then
-	install-docs -i /usr/share/doc-base/eterm
-fi
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 8986ae8..f0bc771 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,94 +1,62 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_COMPAT=2
 
-INSTALL_BASE=`pwd`/debian/tmp
+vpath build debian
+vpath install debian
+cfg = --prefix=/usr --mandir=/usr/share/man
 
-configure: configure.in
-	libtoolize --copy --force
-	aclocal $ACLOCAL_FLAGS
-	automake --add-missing
-	autoconf
-	autoheader
-
-build: build-stamp
-build-stamp:
+build:
 	dh_testdir
-	
-	# Add here commands to compile the package.
-	./configure --prefix=/usr --bindir=/usr/X11R6/bin \
-		--datadir=/usr/share --mandir=/usr/X11R6/man
-
+	test -x autogen.sh && ./autogen.sh $(cfg)  || ./configure $(cfg)
 
-        # because glibc 2.1's utmpx.h is incompatible on sparc
-	sed -e 's/#define HAVE_UTMPX_H 1/\/* #undef HAVE_UTMPX_H *\//' config.h > config.h.tmp
+	# because glibc 2.1's utmpx.h is incompatible on sparc
+	sed 's/#define HAVE_UTMPX_H 1/\/* #undef HAVE_UTMPX_H *\//' config.h > config.h.tmp
 	mv config.h.tmp config.h
 
 	# fix rpath issues
-	sed < libtool > libtool-2 \
-		-e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec="-D__LIBTOOL_IS_A_FOOL__ "/' \
-		-e '/^archive_cmds="/s/"$$/ \\$$deplibs"/'
-	mv libtool-2 libtool
-	chmod 755 libtool
-
-	make
-
-	touch build-stamp
+	cp libtool libtool-2
+	sed \
+	-e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec="-D__LIBTOOL_IS_A_FOOL__ "/' \
+	-e '/^archive_cmds="/s/"$$/ \\$$deplibs"/' libtool-2 > libtool
+	$(MAKE)
+	touch debian/$@
 
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) -k distclean
-	-rm -f `find . -name "*~"`
-	-rm -rf `find . -name "\.deps"`
-	-rm -rf `find . -name "\.libs"`
-	-rm -rf debian/tmp `find debian/* -type d ! -name CVS` debian/files* core
-	-rm -f debian/*substvars
-
-	dh_clean
-
-# Build architecture-independent files here.
-binary-indep: build
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build
-	dh_testdir -a
-	dh_testroot -a
-	dh_clean -k -a
-	dh_installdirs -a
-
-	# Add here commands to install the files into debian/tmp
-	$(MAKE) install DESTDIR=$(INSTALL_BASE) \
-	    PREFIX=$(INSTALL_BASE)/usr \
-		datadir=$(INSTALL_BASE)/usr/share \
-		pkglibdir=$(INSTALL_BASE)/usr/share/Eterm \
-		DATADIR=$(INSTALL_BASE)/usr/share \
-		themedir=$(INSTALL_BASE)/usr/share/Eterm/themes
-
-	dh_installdocs -a
-	dh_installmenu -a
-	#dh_installmanpages --verbose -a
-	dh_undocumented -a Esetroot.1x
-	dh_installchangelogs -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	chown root.root debian/tmp/usr/X11R6/bin/Eterm
-	chmod 4755 debian/tmp/usr/X11R6/bin/Eterm
-	dh_suidregister 
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-source diff:                                                                  
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+	test -f Makefile && $(MAKE) -k distclean
+	dh_clean debian/{build,install,libtool-2}
+
+install: build
+	dh_testdir 
+	dh_testroot 
+	dh_clean 
+	dh_installdirs 
+	$(MAKE) install DESTDIR=$(shell pwd)/debian/eterm
+	touch debian/$@
+
+binary-arch: build install
+	dh_testdir 
+	dh_testroot 
+	dh_installdocs README ReleaseNotes doc/{FAQ.html,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 
+	dh_gencontrol 
+	dh_md5sums 
+	dh_builddeb 
+
+binary-indep:
+
+binary: binary-arch
+
+.PHONY: clean binary-indep binary-arch binary