Debian Emacs Devel Commit: rev 49 - emacs21/pkg/trunk/debian

[Rob Browning]

Author: rlb
Date: 2004-02-21 23:03:47 +0100 (Sat, 21 Feb 2004)
New Revision: 49

Modified:
   emacs21/pkg/trunk/debian/changelog
   emacs21/pkg/trunk/debian/rules
Log:
* test ${major_ver} rather than running dpkg-parsechangelog.
* fix autodiff generation for newer autoconf.


Modified: emacs21/pkg/trunk/debian/changelog
===================================================================
--- emacs21/pkg/trunk/debian/changelog	2004-02-21 19:59:01 UTC (rev 48)
+++ emacs21/pkg/trunk/debian/changelog	2004-02-21 22:03:47 UTC (rev 49)
@@ -21,11 +21,13 @@
     (closes: #222767) [Jérôme Marant]
   * debian/emacs-common.postinst: install alternative for emacsclient
     manpage. [Jérôme Marant]
-  * add dpkg-parsechangelog to ${checkdir} so that we can't accidentally
-    generate bad files from our .in files, i.e. subst emacs rather than
-    emacs21, etc.
+  * test -n "${major_ver}" in a few places so that we don't accidentally
+    generate bad output files from our .in files.
+  * rm aclocal.m4 during autofiles-sync so that old bits won't kill new
+    autoconf run.  Also ignore autom4te.cache when generating
+    autofiles.diff.
 
- -- Rob Browning <rlb@defaultvalue.org>  Sat, 21 Feb 2004 13:53:20 -0600
+ --
 
 emacs21 (21.3+1-4) unstable; urgency=medium
 

Modified: emacs21/pkg/trunk/debian/rules
===================================================================
--- emacs21/pkg/trunk/debian/rules	2004-02-21 19:59:01 UTC (rev 48)
+++ emacs21/pkg/trunk/debian/rules	2004-02-21 22:03:47 UTC (rev 49)
@@ -223,7 +223,6 @@
 
 define checkdir
 	test -f debian/emacs.postinst
-	dpkg-parsechangelog
 endef
 
 define build_cmd
@@ -285,15 +284,17 @@
 	mkdir debian/autodiff-old
 	cp -a `ls | grep -v debian` debian/autodiff-old
 	cp -a debian/autodiff-old debian/autodiff-new
+	cd debian/autodiff-new && rm -f aclocal.m4
 	cd debian/autodiff-new && aclocal
 	cd debian/autodiff-new && autoconf
-	cd debian && diff -ruN autodiff-old autodiff-new \
+	cd debian && diff -ruN -x autom4te.cache autodiff-old autodiff-new \
 	  > autofiles.diff.tmp; test $$? -eq 0 -o $$? -eq 1
 	mv debian/autofiles.diff.tmp debian/autofiles.diff
 endef
 DEB_TRASH += debian/autofiles.diff.tmp
 
 define expand_file_subst_vars
+	test -n "${major_ver}" && \
 	perl -p \
 	  -e "s/\@PKGNAME\@/emacs21/go;" \
 	  -e "s/\@MAJOR_VERSION\@/${major_ver}/go;" \