[Python-apps-commits] r11332 - in packages/mercurial/trunk/debian (4 files)

[vicho at users.alioth.debian.org]

    Date: Thursday, October 2, 2014 @ 22:07:55
  Author: vicho
Revision: 11332

Use excanvas.js from libjs-excanvas instead of shipping a copy in the package

Added:
  packages/mercurial/trunk/debian/mercurial-common.links
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/control
  packages/mercurial/trunk/debian/rules	(contents, properties)

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2014-10-02 21:30:42 UTC (rev 11331)
+++ packages/mercurial/trunk/debian/changelog	2014-10-02 22:07:55 UTC (rev 11332)
@@ -1,6 +1,8 @@
 mercurial (3.1.2-1) UNRELEASED; urgency=medium
 
   * New upstream version
+  * Use excanvas.js from libjs-excanvas instead of shipping a copy in
+    the package
 
  -- Javi Merino <vicho at debian.org>  Thu, 02 Oct 2014 22:29:50 +0100
 

Modified: packages/mercurial/trunk/debian/control
===================================================================
--- packages/mercurial/trunk/debian/control	2014-10-02 21:30:42 UTC (rev 11331)
+++ packages/mercurial/trunk/debian/control	2014-10-02 22:07:55 UTC (rev 11332)
@@ -25,7 +25,10 @@
 
 Package: mercurial-common
 Architecture: all 
-Depends: ${misc:Depends}, ${python:Depends}
+Depends:
+ ${misc:Depends},
+ ${python:Depends},
+ libjs-excanvas
 Recommends: mercurial (>= ${source:Version}), ca-certificates
 Suggests:
  wish,

Added: packages/mercurial/trunk/debian/mercurial-common.links
===================================================================
--- packages/mercurial/trunk/debian/mercurial-common.links	                        (rev 0)
+++ packages/mercurial/trunk/debian/mercurial-common.links	2014-10-02 22:07:55 UTC (rev 11332)
@@ -0,0 +1 @@
+/usr/share/javascript/excanvas/excanvas.js usr/share/mercurial/templates/static/excanvas.js

Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules	2014-10-02 21:30:42 UTC (rev 11331)
+++ packages/mercurial/trunk/debian/rules	2014-10-02 22:07:55 UTC (rev 11332)
@@ -85,6 +85,8 @@
 	-rm -rf $(CURDIR)/debian/mercurial-common/usr/lib/python*/dist-packages/mercurial/templates \
 	        $(CURDIR)/debian/mercurial-common/usr/lib/python*/dist-packages/mercurial/help \
 	        $(CURDIR)/debian/mercurial-common/usr/lib/python*/dist-packages/mercurial/locale \
+	# excanvas.js is provided by libjs-excanvas
+	rm $(CURDIR)/debian/mercurial-common/usr/share/mercurial/templates/static/excanvas.js
 	# remove arch-dependent python stuff
 	find debian/mercurial-common/usr/lib \
 		-name '*.so' ! -type d -delete , \