* debian/control:

+ Build-depend on the new X development packages instead of xlibs-dev.
  * debian/menu:
    + Syntax fixes.


git-svn-id: svn://svn.zoy.org/elk/trunk@251 55e467fa-43c5-0310-a8a2-de718669efc6

debian/changelog

@@ -1,3 +1,10 @@
+elk (3.99.6-3) unstable; urgency=low
+
+  * debian/control:
+    + Build-depend on the new X development packages instead of xlibs-dev.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Sun, 14 Mar 2004 13:09:32 +0100
+
 elk (3.99.6-2) unstable; urgency=low
 
   * debian/control:

debian/control

@@ -2,7 +2,7 @@ Source: elk
 Section: devel
 Priority: optional
 Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
-Build-Depends: debhelper (>= 3.0), groff, libelfg0-dev, xlibs-dev, lesstif-dev, libgdbm-dev, libxaw7-dev
+Build-Depends: debhelper (>= 3.0), groff, libelfg0-dev, libx11-dev, libxext-dev, libxmu-dev, libxt-dev, libice-dev, libsm-dev, lesstif-dev, libgdbm-dev, libxaw7-dev
 Standards-Version: 3.6.1.0
 
 Package: elk
@@ -36,7 +36,7 @@ Description: implementation of Scheme (the Extension Language Kit)
 Package: libelk0-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, libelfg0-dev, xlibs-dev
+Depends: ${shlibs:Depends}, libelfg0-dev, libx11-dev, libxext-dev, libxmu-dev, libxt-dev, libice-dev, libsm-dev
 Conflicts: elk (<< 3.99-1)
 Replaces: elk (<< 3.99-1)
 Description: development files for libelk0

debian/menu

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

debian/rules

@@ -1,27 +1,17 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper. 
-# GNU copyright 1997 by Joey Hess.
-#
-# This version is for a hypothetical package that builds an
-# architecture-dependant package, as well as an architecture-independent
-# package.
 
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 
-	# Touch stuff
+	touch configure.ac
-	touch configure.ac \
+	touch aclocal.m4
-	&& touch aclocal.m4 \
+	touch configure
-	&& touch configure \
+	touch config.h.in
-	&& touch config.h.in \
+	touch `find . -name Makefile.in`
-	&& touch `find . -name Makefile.in`
 
 	./configure --prefix=/usr --mandir=/usr/share/man
 
@@ -30,21 +20,16 @@ configure-stamp:
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-
 	$(MAKE)
-
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-
 	-$(MAKE) -i distclean
-
 	dh_clean
 
-install: DH_OPTIONS=
 install: build
 	dh_testdir
 	dh_testroot
@@ -68,63 +53,34 @@ install: build
 	mv $(CURDIR)/debian/elk/usr/share/doc/elk/examples \
 	   $(CURDIR)/debian/elkdoc/usr/share/doc/elkdoc/
 
-# Build architecture-independent files here.
-# Pass -i to all debhelper commands in this target to reduce clutter.
-binary-indep: DH_OPTIONS=-i
 binary-indep: build install
-	dh_testdir
+	dh_testdir -i
-	dh_testroot
+	dh_testroot -i
-#	dh_installdebconf
+	dh_installdocs -i
-	dh_installdocs
+	dh_installchangelogs -i ChangeLog
-#	dh_installexamples
+	dh_compress -i
-#	dh_installmenu
+	dh_fixperms -i
-#	dh_installemacsen
+	dh_installdeb -i
-#	dh_installpam
+	dh_gencontrol -i
-#	dh_installinit
+	dh_md5sums -i
-#	dh_installcron
+	dh_builddeb -i
-#	dh_installmanpages
-#	dh_installinfo
-#	dh_undocumented
-	dh_installchangelogs ChangeLog
-#	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-#	dh_perl
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-# Build architecture-dependent files here.
-# Pass -a to all debhelper commands in this target to reduce clutter.
-binary-arch: DH_OPTIONS=-a
 binary-arch: build install
-	dh_testdir
+	dh_testdir -a
-	dh_testroot
+	dh_testroot -a
-#	dh_installdebconf
+	dh_installdocs -a
-	dh_installdocs
+	dh_installmenu -a
-#	dh_installexamples
+	dh_installchangelogs -a ChangeLog
-	dh_installmenu
+	dh_strip -a
-#	dh_installemacsen
+	dh_link -a usr/bin/elk usr/bin/scheme-elk
-#	dh_installpam
+	dh_compress -a
-#	dh_installinit
+	dh_fixperms -a
-#	dh_installcron
+	dh_installdeb -a
-#	dh_installmanpages
+	dh_makeshlibs -a -X usr/lib/elk
-#	dh_installman
+	dh_shlibdeps -a -L libelk0 -l debian/libelk0/usr/lib
-#	dh_installinfo
+	dh_gencontrol -a
-#	dh_undocumented
+	dh_md5sums -a
-	dh_installchangelogs ChangeLog
+	dh_builddeb -a
-	dh_strip
-	dh_link usr/bin/elk usr/bin/scheme-elk
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_makeshlibs -X usr/lib/elk
-#	dh_perl
-	dh_shlibdeps -L libelk0 -l debian/libelk0/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure