From: Russ Allbery <rra@debian.org>
Date: Mon, 18 Jul 2011 23:55:17 +0000 (-0700)
Subject: Update the Doxygen jquery removal code to be conditional
X-Git-Tag: debian/1.6.0.pre7-1~1
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=4aa9db3c6d5052d90c6e0bb06abeb579768ab190;p=packages%2Fo%2Fopenafs.git

Update the Doxygen jquery removal code to be conditional

* Reapply the removal of the Doxygen-generated copy of jquery, since
  this apparently wasn't as fixed as had been advertised.  However, make
  it conditional on the existence of the jquery.js script, so we should
  hopefully only fix this where necessary.
---

diff --git a/debian/changelog b/debian/changelog
index 506c164c0..cba0cbfda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ openafs (1.6.0~pre7-1) UNRELEASED; urgency=low
     - Treat Linux 3.0 as Linux 2.6 for sysname purposes
   * Update README.source for a few changes in procedures and source
     package format.
+  * Reapply the removal of the Doxygen-generated copy of jquery, since
+    this apparently wasn't as fixed as had been advertised.  However, make
+    it conditional on the existence of the jquery.js script, so we should
+    hopefully only fix this where necessary.
 
  -- Russ Allbery <rra@debian.org>  Mon, 18 Jul 2011 16:48:35 -0700
 
diff --git a/debian/rules b/debian/rules
index 5232c05ab..5ba163b83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -232,9 +232,11 @@ override_dh_installdocs:
 	set -e; if [ -d "$(DOCS)" ] ; then \
 	    for d in arch-overview bos-spec fs-cm-spec rx-spec \
 		     vldb-vol-spec ; do \
-		rm $(DOCS)/html/$$d/jquery.js ; \
-		ln -s /usr/share/javascript/jquery/jquery.min.js \
-		    $(DOCS)/html/$$d/jquery.js ; \
+		if [ -f "$(DOCS)/html/$$d/jquery.js" ] ; then \
+		    rm $(DOCS)/html/$$d/jquery.js ; \
+		    ln -s /usr/share/javascript/jquery/jquery.min.js \
+			$(DOCS)/html/$$d/jquery.js ; \
+		fi ; \
 	    done ; \
 	fi