[Python-modules-commits] r22377 - in packages/ipython/trunk/debian (3 files)

[jtaylor-guest at users.alioth.debian.org]

    Date: Saturday, June 30, 2012 @ 13:23:33
  Author: jtaylor-guest
Revision: 22377

New upstream release

No repackging necessary anymore, js sources available in external
minified variants are not installed

Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/ipython-notebook-common.install
  packages/ipython/trunk/debian/rules

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2012-06-30 12:59:48 UTC (rev 22376)
+++ packages/ipython/trunk/debian/changelog	2012-06-30 13:23:33 UTC (rev 22377)
@@ -1,8 +1,10 @@
-ipython (0.12.1+dfsg-3) UNRELEASED; urgency=low
+ipython (0.13-1) unstable; urgency=low
 
-  * add python-tornado to build depends for more tests
+  * New upstream release
+    No repackging necessary anymore, js sources available in external
+    minified variants are not installed
 
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 19 May 2012 17:17:55 +0200
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 30 Jun 2012 10:55:14 +0200
 
 ipython (0.12.1+dfsg-2) unstable; urgency=low
 

Modified: packages/ipython/trunk/debian/ipython-notebook-common.install
===================================================================
--- packages/ipython/trunk/debian/ipython-notebook-common.install	2012-06-30 12:59:48 UTC (rev 22376)
+++ packages/ipython/trunk/debian/ipython-notebook-common.install	2012-06-30 13:23:33 UTC (rev 22377)
@@ -1 +1,2 @@
 IPython/frontend/html/notebook/static usr/share/ipython/notebook
+IPython/external/js usr/share/ipython/notebook

Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules	2012-06-30 12:59:48 UTC (rev 22376)
+++ packages/ipython/trunk/debian/rules	2012-06-30 13:23:33 UTC (rev 22377)
@@ -21,9 +21,7 @@
 	set -e && for pyvers in $(PY3VERS); do \
 	  $$pyvers setup.py build --executable '/usr/bin/env python3'; \
 	done
-	# so dh_python2 symlinks the missing stuff
-	touch IPython/frontend/html/notebook/static/jquery/js/jquery-1.6.2.min.js
-	touch IPython/frontend/html/notebook/static/jquery/js/jquery-ui-1.8.14.custom.min.js
+
 ifeq (,$(filter nodocs,$(DEB_BUILD_OPTIONS)))
 	HOME=$(CURDIR)/build PYTHONPATH=$(CURDIR) $(MAKE) -C $(CURDIR)/docs html
 endif
@@ -59,6 +57,7 @@
 		--exclude="IPython/frontend/html/" \
 		--exclude="IPython/deathrow/" \
 		--exclude="IPython/quarantine/" \
+		--exclude="IPython/external/js/" \
 		--exclude=tests
 	dh_install -pipython-notebook --exclude="html/notebook/static/"
 	dh_install -pipython3-notebook --exclude="html/notebook/static/"
@@ -83,10 +82,6 @@
 	# remove embedded arparse
 	find $(CURDIR)/debian/ipython/usr/ -name _argparse.py -delete
 	find $(CURDIR)/debian/ipython3/usr/ -name _argparse.py -delete
-	
-	# remove embedded configobj
-	find $(CURDIR)/debian/ipython/usr/ -name _configobj.py -delete
-	find $(CURDIR)/debian/ipython/usr/ -name _validate.py -delete
 
 	# remove embedded simplegeneric
 	find $(CURDIR)/debian/ipython/usr/ -name _simplegeneric.py -delete
@@ -99,9 +94,6 @@
 	# remove embedded pexpect
 	find $(CURDIR)/debian/ipython/usr/ -name _pexpect.py -delete
 
-	# remove embedded pyparsing
-	find $(CURDIR)/debian/ipython/usr/ -name _pyparsing.py -delete
-
 	# add wrapper scripts for all python versions
 	set -e ;\
 	firstpyver="" ;\