[Python-modules-commits] r29755 - in packages/ipython/trunk/debian (2 files)

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

    Date: Tuesday, July 15, 2014 @ 22:07:17
  Author: jtaylor-guest
Revision: 29755

debian/rules: allow building with uglifyjs 2

Thanks to Leo Iannacone for the patch (Closes: #750715)

Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/patches/packaged-js.patch

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2014-07-14 20:08:33 UTC (rev 29754)
+++ packages/ipython/trunk/debian/changelog	2014-07-15 22:07:17 UTC (rev 29755)
@@ -1,3 +1,10 @@
+ipython (2.1.0-2) unstable; urgency=medium
+
+  * debian/rules: allow building with uglifyjs 2
+    Thanks to Leo Iannacone for the patch (Closes: #750715)
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Tue, 15 Jul 2014 22:33:25 +0200
+
 ipython (2.1.0-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/ipython/trunk/debian/patches/packaged-js.patch
===================================================================
--- packages/ipython/trunk/debian/patches/packaged-js.patch	2014-07-14 20:08:33 UTC (rev 29754)
+++ packages/ipython/trunk/debian/patches/packaged-js.patch	2014-07-15 22:07:17 UTC (rev 29755)
@@ -6,7 +6,7 @@
  	mkdir -p bootstrap/js
  	cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > bootstrap/js/bootstrap.js
 -	./node_modules/.bin/uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js
-+	uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js
++	uglifyjs bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js
  	echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js
  	cat bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js > bootstrap/js/bootstrap.min.js
  	rm bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js