[Python-modules-commits] r11667 - in packages/python-django/branches/experimental/debian (3 files)

[lamby at users.alioth.debian.org]

    Date: Tuesday, February 9, 2010 @ 14:11:52
  Author: lamby
Revision: 11667

jQuery added to admin system upstream.

Modified:
  packages/python-django/branches/experimental/debian/changelog
  packages/python-django/branches/experimental/debian/control
  packages/python-django/branches/experimental/debian/rules

Modified: packages/python-django/branches/experimental/debian/changelog
===================================================================
--- packages/python-django/branches/experimental/debian/changelog	2010-02-09 14:11:47 UTC (rev 11666)
+++ packages/python-django/branches/experimental/debian/changelog	2010-02-09 14:11:52 UTC (rev 11667)
@@ -4,6 +4,10 @@
   * Switch to dpkg-source 3.0 (quilt) format
   * Bump Standards-Version to 3.8.4.
   * Remove "0.96 -> 1.x" NEWS entry.
+  * jQuery added to admin system upstream:
+    - Add libjs-jquery to python-django's Recommends
+    - Use symlinks so we use the version from libjs-query over an embedded code
+      copy.
 
  -- Chris Lamb <lamby at debian.org>  Tue, 09 Feb 2010 12:29:19 +0000
 

Modified: packages/python-django/branches/experimental/debian/control
===================================================================
--- packages/python-django/branches/experimental/debian/control	2010-02-09 14:11:47 UTC (rev 11666)
+++ packages/python-django/branches/experimental/debian/control	2010-02-09 14:11:52 UTC (rev 11667)
@@ -13,6 +13,7 @@
 Package: python-django
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
+Recommends: libjs-jquery
 Suggests: python-psycopg2, python-psycopg, python-mysqldb, python-flup, python-sqlite
 Description: High-level Python web development framework
  Django is a high-level web application framework that loosely follows the

Modified: packages/python-django/branches/experimental/debian/rules
===================================================================
--- packages/python-django/branches/experimental/debian/rules	2010-02-09 14:11:47 UTC (rev 11666)
+++ packages/python-django/branches/experimental/debian/rules	2010-02-09 14:11:52 UTC (rev 11667)
@@ -46,6 +46,12 @@
 	
 	# Rename django-admin.py to django-admin
 	mv $(PREFIX)/usr/bin/django-admin.py $(PREFIX)/usr/bin/django-admin
+	
+	# Remove embedded Javascript libraries
+	for FILENAME in jquery.js jquery.min.js; do \
+		find $(PREFIX) -name $$FILENAME -exec \
+			ln -sf /usr/share/javascript/jquery/$$FILENAME {} \;; \
+	done
 
 override_dh_installdocs:
 	dh_installdocs