[Pkg-jed-commit] r759 - in tmexpand/trunk/debian: . patches

[Rafael Laboissiere]

Author: rafael
Date: 2007-05-29 18:46:02 +0000 (Tue, 29 May 2007)
New Revision: 759

Added:
   tmexpand/trunk/debian/patches/paths-in-example-makefiles.dpatch
Modified:
   tmexpand/trunk/debian/patches/00list
   tmexpand/trunk/debian/rules
Log:
* debian/patches/paths-in-example-makefiles.dpatch: Change paths in
  TMEXPAND and MACRODIR make variales such that the Makefiles in
  examples/ and examples/web worked for the installed package
* debian/rules:
  + Run regression tests
  + Clean examples directory
  + Install Makefiles in examples
* debian/control: Build-Depends on jed | xjed (needed for the regression
  tests) 



Modified: tmexpand/trunk/debian/patches/00list
===================================================================
--- tmexpand/trunk/debian/patches/00list	2007-05-29 12:54:32 UTC (rev 758)
+++ tmexpand/trunk/debian/patches/00list	2007-05-29 18:46:02 UTC (rev 759)
@@ -1 +1,2 @@
 manpage
+paths-in-example-makefiles

Added: tmexpand/trunk/debian/patches/paths-in-example-makefiles.dpatch
===================================================================
--- tmexpand/trunk/debian/patches/paths-in-example-makefiles.dpatch	                        (rev 0)
+++ tmexpand/trunk/debian/patches/paths-in-example-makefiles.dpatch	2007-05-29 18:46:02 UTC (rev 759)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## paths-in-example-makefiles.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Change paths in TMEXPAND and MACRODIR make variales such that the
+## DP: Makefiles in examples/ and examples/web worked for the installed
+## DP: package
+
+ at DPATCH@
+
+--- tmexpand-0.1.2.0.orig/doc/examples/web/Makefile
++++ tmexpand-0.1.2.0/doc/examples/web/Makefile
+@@ -1,7 +1,7 @@
+ # -*- sh -*-
+ 
+-TMEXPAND = ../../bin/tmexpand
+-MACRODIR = ../../macros
++TMEXPAND = /usr/bin/tmexpand
++MACRODIR = /usr/share/tmexpand/macros
+ 
+ TMFILES = index.tm other.tm
+ 
+--- tmexpand-0.1.2.0.orig/doc/examples/Makefile
++++ tmexpand-0.1.2.0/doc/examples/Makefile
+@@ -1,5 +1,5 @@
+-TMEXPAND = ../bin/tmexpand
+-MACRODIR = ../macros
++TMEXPAND = /usr/bin/tmexpand
++MACRODIR = /usr/share/tmexpand/macros
+ 
+ TMFILES = help.tm
+ 


Property changes on: tmexpand/trunk/debian/patches/paths-in-example-makefiles.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: tmexpand/trunk/debian/rules
===================================================================
--- tmexpand/trunk/debian/rules	2007-05-29 12:54:32 UTC (rev 758)
+++ tmexpand/trunk/debian/rules	2007-05-29 18:46:02 UTC (rev 759)
@@ -14,6 +14,7 @@
 	    make -C $$i distclean; \
 	    rm -f $$i/Makefile; \
 	done
+	for i in "" web ; do make -C doc/examples/$$i distclean ; done
 	rm -f config.log config.status Makefile
 	rm -f build-stamp install-stamp
 
@@ -25,6 +26,10 @@
 build-stamp: config.status
 	dh_testdir
 	make
+	( cd doc/examples ; \
+	  make TMEXPAND=../../bin/tmexpand MACRODIR=../../macros )
+	( cd doc/examples/web ; \
+	  make TMEXPAND=../../../bin/tmexpand MACRODIR=../../../macros )
 	touch build-stamp
 
 binary-indep: build-stamp
@@ -37,7 +42,7 @@
 	mv $(instdir)/usr/man $(instdir)/usr/share/man
 	dh_installchangelogs -i ChangeLog
 	dh_installdocs -i
-	dh_installexamples -i --exclude=Makefile doc/examples/*
+	dh_installexamples -i doc/examples/*
 
 	dh_install -i debian/lintian.override usr/share/lintian/overrides/
 	mv $(instdir)/usr/share/lintian/overrides/lintian.override \