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

[jwilk at users.alioth.debian.org]

    Date: Sunday, June 19, 2011 @ 11:19:19
  Author: jwilk
Revision: 17526

Check at build time if versions of both jQuery copies match.

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

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2011-06-19 10:57:28 UTC (rev 17525)
+++ packages/sphinx/trunk/debian/changelog	2011-06-19 11:19:19 UTC (rev 17526)
@@ -7,14 +7,16 @@
     python-simplejson. The latter package is only needed for python2.5, and
     python-defaults 2.6.6-14 doesn't support it anymore.
   * Include jQuery source (closes: #630973).
+    + Check at build time if versions of both jQuery copies match.
 
   [ Nikolaus Rath ]
   * Backport upstream changesets a8b0ef275438 and de340a6098c7 to allow
     extraction of function signature from docstring for extension modules.
     Closes: 630409.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 19 Jun 2011 12:54:24 +0200
 
+ -- Jakub Wilk <jwilk at debian.org>  Sun, 19 Jun 2011 13:17:57 +0200
+
 sphinx (1.0.7-4) unstable; urgency=low
 
   * When Sphinx crashes, show 10 stack frames (instead of a single one).

Modified: packages/sphinx/trunk/debian/rules
===================================================================
--- packages/sphinx/trunk/debian/rules	2011-06-19 10:57:28 UTC (rev 17525)
+++ packages/sphinx/trunk/debian/rules	2011-06-19 11:19:19 UTC (rev 17526)
@@ -3,6 +3,10 @@
 
 include /usr/share/python/python.mk
 
+jquery_version = $(shell grep 'jQuery JavaScript Library v' $(1) | sed -e 's/.* v//')
+jquery_version_debian = $(call jquery_version,$(wildcard debian/jquery-*.js))
+jquery_version_upstream = $(call jquery_version,sphinx/themes/basic/static/jquery.js)
+
 PACKAGE_NAME=python-sphinx
 PACKAGE_DIR=$(CURDIR)/debian/$(PACKAGE_NAME)
 SITE_PACKAGES_DIR=$(PACKAGE_DIR)$(call py_libdir,$(shell pyversions -d))
@@ -11,6 +15,12 @@
 
 build-stamp:
 	dh_testdir
+ifeq "$(jquery_version_upstream)" ""
+	$(error Unable to dermine upstream version of jQuery)
+endif
+ifneq "$(jquery_version_debian)" "$(jquery_version_upstream)"
+	$(error Debian and upstream versions of jQuery do not match ($(jquery_version_debian) != $(jquery_version_upstream)))
+endif
 	mkdir -p _build/html
 	PYTHONPATH=. python debian/sphinx-build-local.py doc _build/html
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))