[Python-modules-commits] r21355 - in packages/ipython/trunk/debian (changelog rules watch)

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

    Date: Sunday, April 22, 2012 @ 11:39:42
  Author: jtaylor-guest
Revision: 21355

new upstream release

Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/rules
  packages/ipython/trunk/debian/watch

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2012-04-22 11:27:20 UTC (rev 21354)
+++ packages/ipython/trunk/debian/changelog	2012-04-22 11:39:42 UTC (rev 21355)
@@ -1,8 +1,6 @@
-ipython (0.12.1~git20120417+dfsg1-1) UNRELEASED; urgency=low
+ipython (0.12.1+dfsg-1) UNRELEASED; urgency=low
 
-  * New upstream release candidate
-    Closes: #655413, #663256
-    Commit db499aa470c3730d6c68d9d502ba5c8aa05dacdc
+  * New upstream release (Closes: #655413, #663256)
     Repackaged to remove minified javascript files from source.
   * add get-orig-source target to rules
   * ipython-notebook: depend on libjs-mathjax instead of recommending.

Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules	2012-04-22 11:27:20 UTC (rev 21354)
+++ packages/ipython/trunk/debian/rules	2012-04-22 11:39:42 UTC (rev 21355)
@@ -158,16 +158,19 @@
 	dh_sphinxdoc
 endif
 
-VERSION = $(shell dpkg-parsechangelog | grep "^Version:" | sed -r "s/Version: (.*)-.*/\1/")
+VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-\+]+)+(\+dfsg)*.*,\1,p')
 COMMIT = $(shell dpkg-parsechangelog | grep Commit | sed -e "s/^\s*Commit //")
 get-orig-source:
-	git clone --depth 1 git://github.com/ipython/ipython ipython.git
-	cd ipython.git && git archive --format=tar --prefix=ipython.git/ $(COMMIT) | gzip -9 -c > ../ipython_$(VERSION).orig.tar.gz
-	rm -rf ipython.git
-	tar xfz ipython_$(VERSION).orig.tar.gz
-	rm -f ipython.git/IPython/frontend/html/notebook/static/jquery/js/jquery-1.6.2.min.js
-	rm -f ipython.git/IPython/frontend/html/notebook/static/jquery/js/jquery-ui-1.8.14.custom.min.js
-	mv ipython.git/IPython/frontend/html/notebook/static/unminified/prettify.js \
-	   ipython.git/IPython/frontend/html/notebook/static/prettify/prettify.js
-	tar cfz ipython_$(VERSION).orig.tar.gz ipython.git
-	rm -rf ipython.git
+	#git clone --depth 1 git://github.com/ipython/ipython ipython.git
+	#cd ipython.git && git archive --format=tar --prefix=ipython/ $(COMMIT) | gzip -9 -c > ../ipython_$(VERSION).orig.tar.gz
+	#rm -rf ipython.git
+	#tar xfz ipython_$(VERSION).orig.tar.gz
+	mkdir ipython
+	uscan --force-download --destdir=. --download-version=$(VERSION)
+	tar -C ipython -xz -f rel-$(VERSION).tar.gz --strip 1
+	rm -f ipython/IPython/frontend/html/notebook/static/jquery/js/jquery-1.6.2.min.js
+	rm -f ipython/IPython/frontend/html/notebook/static/jquery/js/jquery-ui-1.8.14.custom.min.js
+	mv ipython/IPython/frontend/html/notebook/static/unminified/prettify.js \
+	   ipython/IPython/frontend/html/notebook/static/prettify/prettify.js
+	tar cfz ipython_$(VERSION)+dfsg.orig.tar.gz ipython
+	rm -rf ipython

Modified: packages/ipython/trunk/debian/watch
===================================================================
--- packages/ipython/trunk/debian/watch	2012-04-22 11:27:20 UTC (rev 21354)
+++ packages/ipython/trunk/debian/watch	2012-04-22 11:39:42 UTC (rev 21355)
@@ -1,3 +1,4 @@
 version=3
+opts=dversionmangle=s/\+dfsg// \
 http://githubredir.debian.net/github/ipython/ipython /rel-(.*).tar.gz