[Pkg-jed-commit] r445 - in jed-extra/trunk: debian utils

[Guenter Milde]

Author: milde-guest
Date: 2006-10-06 09:52:51 +0000 (Fri, 06 Oct 2006)
New Revision: 445

Modified:
   jed-extra/trunk/debian/contents.txt
   jed-extra/trunk/debian/rules
   jed-extra/trunk/utils/build-from-svn-copy.sh
Log:
A new version of jed-extra

utils/build-from-svn-copy.sh   change regexp to extract also version 2.2
                               (without Debian sub-version as 2.2-1)
debian/changelog               new version with new upstream version
debian/rules                   put *.template into mode-docs
                               skip the html version of the upstream README
debian/contents.txt            new modes unittest and pymode



Modified: jed-extra/trunk/debian/contents.txt
===================================================================
--- jed-extra/trunk/debian/contents.txt	2006-09-29 21:02:28 UTC (rev 444)
+++ jed-extra/trunk/debian/contents.txt	2006-10-06 09:52:51 UTC (rev 445)
@@ -91,6 +91,7 @@
 X   pcre           Perl-compatible searching functions
 A   po_mode        Mode for editing PO-files
 A   print          printer interface
+X   pymode         Python mode with integrated help and "workbook mode"
 D   recent         Provide easy access to recently opened/saved files.
 X   rfcview        RFC viewer
 #O   rmail          MUA suite
@@ -111,6 +112,7 @@
 #X   tree           Recursive directory listing utility
 X   turbo          dynamic word completion (like in StarOffice)
 U   txtutils       Tools for text processing (marking, string processing, formatting)
+X   unittest       Framework for unit testing of S-Lang scripts
 E   uri            Let jed handle Universal Ressource Indicators (URIs)
 E   vi             vi editor emulation mode
 A   view           A generic view mode for readonly buffers

Modified: jed-extra/trunk/debian/rules
===================================================================
--- jed-extra/trunk/debian/rules	2006-09-29 21:02:28 UTC (rev 444)
+++ jed-extra/trunk/debian/rules	2006-10-06 09:52:51 UTC (rev 445)
@@ -21,17 +21,16 @@
 debroot = $(CURDIR)/debian/jed-extra
 libdir = /usr/share/jed/jed-extra
 
-dh_inst_excl = -X.html -X.otl -X.example -XREADME
+dh_inst_excl = -X.html -X.otl -X.example -X.template -XREADME
 
 # upstream version
-UPSTREAM_VERSION ?= $(shell perl -ne '/([\d.]+)-/; print $$1; exit' < debian/changelog)
+UPSTREAM_VERSION ?= $(shell perl -ne '/([\d.]+)-?/; print $$1; exit' < debian/changelog)
 
 get-orig-source:
 	# pre-release (source tarball from the jedmodes home site)
 	# wget http://jedmodes.sourceforge.net/cvs/jedmodes-$(UPSTREAM_VERSION).tgz
 	# officially released CVS tarball from the sf FRS
 	wget http://osdn.dl.sourceforge.net/sourceforge/jedmodes/jedmodes-$(UPSTREAM_VERSION).tgz
-
 	mv jedmodes-$(UPSTREAM_VERSION).tgz jed-extra_$(UPSTREAM_VERSION).orig.tar.gz
 
 	# additional modes from other sources
@@ -75,13 +74,19 @@
 
 	# install upstream documentation
 	dh_install $$(find . -wholename ./debian -prune \
-	    -o \( -name README -o -name README.html \) -print) \
-	    usr/share/doc/jed-extra/
+	    -o \( -name README \) -print) usr/share/doc/jed-extra/
 
-	dh_install $$(find . -wholename ./debian -prune -o \( -name \*.html \
-	    -o -name \*.otl -name \*.example \) -print) \
+	dh_install $$(find . -wholename ./debian -prune \
+	    -o \(   -name \*.html \
+	         -o -name \*.otl \
+	         -o -name \*.example \
+		 -o -name \*.hlp \
+		 -o -name \*.template \
+	       \) -print) \
 	    usr/share/doc/jed-extra/mode-doc/
-
+	# TODO: *.hlp files are installed in mode-doc and jed-library-path
+	#       symlink them instead
+	
 	# Install examples
 	dh_installexamples debian/examples/*
 	

Modified: jed-extra/trunk/utils/build-from-svn-copy.sh
===================================================================
--- jed-extra/trunk/utils/build-from-svn-copy.sh	2006-09-29 21:02:28 UTC (rev 444)
+++ jed-extra/trunk/utils/build-from-svn-copy.sh	2006-10-06 09:52:51 UTC (rev 445)
@@ -27,9 +27,10 @@
 fi  
 
 # upstream version
-UPSTREAM_VERSION=`perl -ne '/\(([\d.]+)-/; print $1; exit' < debian/changelog`
+UPSTREAM_VERSION=`perl -ne '/\(([\d.]+)-?/; print $1; exit' < debian/changelog`
 
-echo "building jed-extra $UPSTREAM_VERSION"
+echo "building jed-extra ($UPSTREAM_VERSION)"
+
 # Update the jed-extra files from SVN
 # --------------------------------