[subversion-commit] SVN tetex-base commit + diffs: r1437 - tetex-base/trunk/debian

[Frank Küster]

Author: frank
Date: 2006-06-17 19:59:35 +0000 (Sat, 17 Jun 2006)
New Revision: 1437

Modified:
   tetex-base/trunk/debian/changelog
   tetex-base/trunk/debian/rules
   tetex-base/trunk/debian/rules.in
Log:
- add the $rc = 2 check suggested by Mohammed

- changelog entry for all the #373951 fixes

- and a final version number

Modified: tetex-base/trunk/debian/changelog
===================================================================
--- tetex-base/trunk/debian/changelog	2006-06-17 07:53:10 UTC (rev 1436)
+++ tetex-base/trunk/debian/changelog	2006-06-17 19:59:35 UTC (rev 1437)
@@ -1,19 +1,25 @@
-tetex-base (3.0-18.1) UNRELEASED; urgency=low
+tetex-base (3.0-19) unstable; urgency=medium
 
+  * Fix a Makefile error in rules.in which caused a FTBFS on slow systems
+    (or systems with subsecond timestamps).  Furthermore, do not ignore
+    all quilt errors in the clean target, just those that mean it already
+    has been unpatched.  Thanks to Daniel Schepler
+    <schepler at math.berkeley.edu> and Mohammed Adnène Trojette
+    <adn+deb at diwi.org> (closes: #373951) [frank]
   * Adjust the directory name in the apache configuration file to the new
     location of the teTeX documentation, thanks to Vincent Danjean
-    <Vincent.Danjean at ens-lyon.org> (closes: #370660)
+    <Vincent.Danjean at ens-lyon.org> (closes: #370660) [frank]
   * Also adjust the path specification for texdoctk, thanks to Sven
-    Joachim <sven_joachim at web.de> and Lutz Lehmann
-    <llehmann at mathematik.hu-berlin.de> (closes: #372715)
+    Joachim <sven_joachim at web.de> and Lutz Lehmann 
+    <llehmann at mathematik.hu-berlin.de> (closes: #372715) [frank]
   * Add a patch for dvipdfm's config file that allows proper inclusion of
     really large Postscript files, as reported by Thomas Esser and Laurent
     Siebenmann  on the TeXLive list.  Thanks to Heiko Oberdiek for the
-    patch. 
+    patch.  [frank]
   * Move debhelper and quilt to Build-Depends, they are used in the clean
-    target. 
+    target.  [frank]
 
- -- Frank Küster <frank at debian.org>  Thu, 15 Jun 2006 20:30:34 +0200
+ -- Frank Küster <frank at debian.org>  Sat, 17 Jun 2006 21:39:45 +0200
 
 tetex-base (3.0-18) unstable; urgency=low
 

Modified: tetex-base/trunk/debian/rules
===================================================================
--- tetex-base/trunk/debian/rules	2006-06-17 07:53:10 UTC (rev 1436)
+++ tetex-base/trunk/debian/rules	2006-06-17 19:59:35 UTC (rev 1437)
@@ -114,7 +114,7 @@
 $(stampdir):
 	-mkdir $(stampdir)
 
-$(stampdir)/eperl-stamp: $(stampdir) $(EPERL_FILES) 
+$(stampdir)/eperl-stamp: $(EPERL_FILES) | $(stampdir) 
 	touch $@
 
 $(stampdir)/build-stamp: $(stampdir)/patch-stamp
@@ -142,7 +142,7 @@
 
 	rm -f $(stampdir)/patch-stamp
 
-$(stampdir)/patch-stamp: $(stampdir) debian/missingfiles.tar.gz
+$(stampdir)/patch-stamp: debian/missingfiles.tar.gz | $(stampdir) 
 	quilt push -a
 	tar -xzf debian/missingfiles.tar.gz
 	touch $@

Modified: tetex-base/trunk/debian/rules.in
===================================================================
--- tetex-base/trunk/debian/rules.in	2006-06-17 07:53:10 UTC (rev 1436)
+++ tetex-base/trunk/debian/rules.in	2006-06-17 19:59:35 UTC (rev 1437)
@@ -138,7 +138,8 @@
 
 # quilt patch targets
 clean-patches:  debian/missingfiles.tar.gz
-	-quilt pop -a
+	# quilt returns 2 if no patch is applied, but 1 if the topmost patch needs refreshing
+	quilt pop -a || test $$? = 2
 	# remove ordinary files (not dirs) from missingfiles.tar.gz
 	for file in `tar -tzf debian/missingfiles.tar.gz`; do \
 	   test -f $$file && rm -f $$file || true; \