[Python-modules-commits] r23875 - in packages/sphinx/trunk/debian (changelog rules)

jwilk at users.alioth.debian.org jwilk at users.alioth.debian.org
Mon Apr 8 10:37:28 UTC 2013


    Date: Monday, April 8, 2013 @ 10:37:26
  Author: jwilk
Revision: 23875

Make it impossible to accidentally build the source package with an .orig.tar that includes jquery.js or underscore.js.

Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/rules

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2013-04-08 10:16:55 UTC (rev 23874)
+++ packages/sphinx/trunk/debian/changelog	2013-04-08 10:37:26 UTC (rev 23875)
@@ -11,8 +11,10 @@
     + Refresh other patches.
     + Update integration tests for the JavaScript code.
     + Update debian/copyright.
+  * Make it impossible to accidentally build the source package with an
+    .orig.tar that includes jquery.js or underscore.js.
 
- -- Jakub Wilk <jwilk at debian.org>  Mon, 08 Apr 2013 01:03:52 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Mon, 08 Apr 2013 12:35:50 +0200
 
 sphinx (1.1.3+dfsg-7) experimental; urgency=low
 

Modified: packages/sphinx/trunk/debian/rules
===================================================================
--- packages/sphinx/trunk/debian/rules	2013-04-08 10:16:55 UTC (rev 23874)
+++ packages/sphinx/trunk/debian/rules	2013-04-08 10:37:26 UTC (rev 23875)
@@ -30,10 +30,16 @@
 
 build-indep build: build-stamp
 
-build-stamp:
+sphinx/themes/basic/static/%.js:
+	ln -sf /usr/share/javascript/$(*)/$(*).js $(@)
+       
+build/javascript-stamp: $(addprefix sphinx/themes/basic/static/,jquery.js underscore.js)
+	echo $(^) | xargs -n1 | xargs -t -I {} [ -L {} ]
+	mkdir -p $(dir $@)
+	touch $(@)
+
+build-stamp: build/javascript-stamp
 	dh_testdir
-	ln -sf /usr/share/javascript/jquery/jquery.js sphinx/themes/basic/static/
-	ln -sf /usr/share/javascript/underscore/underscore.js sphinx/themes/basic/static/
 	python ./sphinx-build.py doc build/html/
 	rm -rf build/man
 	cp -rl build/html build/man




More information about the Python-modules-commits mailing list