[Pkg-jed-commit] r316 - trunk/packages/jed-extra/debian

[Guenter Milde]

Author: milde-guest
Date: 2006-06-06 09:51:44 +0000 (Tue, 06 Jun 2006)
New Revision: 316

Modified:
   trunk/packages/jed-extra/debian/control
   trunk/packages/jed-extra/debian/rules
Log:
control: added some more suggestions. 
         TODO: check that all helper apps needed by modes in jed-extra are
               suggested

rules:   reordering of some rules (cosmetic change to increase readability)
         removed the debian/jed-extra.install rule now that Joergs awk sorting
         is in place (avoids double-install by jed-extra.install and Joergs
         scheme which had the side-effect of installing the documentation 
         into the jed-extra lib).




Modified: trunk/packages/jed-extra/debian/control
===================================================================
--- trunk/packages/jed-extra/debian/control	2006-06-04 23:35:29 UTC (rev 315)
+++ trunk/packages/jed-extra/debian/control	2006-06-06 09:51:44 UTC (rev 316)
@@ -9,7 +9,7 @@
 Package: jed-extra
 Architecture: all
 Depends: jed-common (>= 0.99.17.111), findutils (>= 4.2.9)
-Suggests: slsh, slang-gdbm, slang-curl
+Suggests: slsh, slang-gdbm, slang-curl, www-browser, dict, 
 Conflicts: dictionaries-common (<< 0.14.0)
 Description: collection of useful JED modes and utilities
  The JED text editor can be easily extended using the SLang scripting

Modified: trunk/packages/jed-extra/debian/rules
===================================================================
--- trunk/packages/jed-extra/debian/rules	2006-06-04 23:35:29 UTC (rev 315)
+++ trunk/packages/jed-extra/debian/rules	2006-06-06 09:51:44 UTC (rev 316)
@@ -26,9 +26,6 @@
 # upstream version
 UPSTREAM_VERSION ?= $(shell perl -ne '/([\d.]+)-/; print $$1; exit' < debian/changelog)
 
-build:
-	# nothing to do, but required by debian policy
-
 get-orig-source:
 	# latest non-released source tarball
 	wget http://jedmodes.sourceforge.net/cvs/jedmodes-$(UPSTREAM_VERSION).tgz
@@ -50,23 +47,12 @@
 	dh_testdir
 	dh_clean
 
-debian/jed-extra.install: debian/contents.txt	
-	# generate jed-extra.install from categorization in contents.txt
-	jed-script debian/sort-modes.sl
-
-binary binary-indep: patch-stamp debian/jed-extra.install
+binary binary-indep: patch-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean
 
 	# install modes
-	# -------------
-
-	# install mode documentation in /usr/share/doc/jed-extra/mode-doc/
-	dh_install $$(find . -wholename ./debian -prune -o \( -name \*.html \
-	    -o -name \*.otl -name \*.example -o -name README \) -print) \
-	    usr/share/doc/jed-extra/mode-doc/
-
 ifneq ($(ADDITION)$(ENHANCEMENT), )
 	dh_install $(dh_inst_excl) $(ADDITION) $(ENHANCEMENT) $(libdir)
 endif
@@ -89,6 +75,11 @@
 	# Install examples
 	dh_installexamples debian/examples/*
 	
+	# install mode documentation
+	dh_install $$(find . -wholename ./debian -prune -o \( -name \*.html \
+	    -o -name \*.otl -name \*.example -o -name README \) -print) \
+	    usr/share/doc/jed-extra/mode-doc/
+
 	# fix some names (as dh_install* cannot change filenames)
 	mv $(debroot)/usr/share/jed/compile/compile \
 	   $(debroot)/usr/share/jed/compile/jed-extra
@@ -105,6 +96,9 @@
 	dh_md5sums
 	dh_builddeb
 
+build:
+	# nothing to do, but required by debian policy
+
 binary-arch:
 	# nothing to do, but we need it to be policy conform