[Python-apps-commits] r11450 - in packages/mercurial/branches/wheezy-backports/debian (5 files)

[vicho at users.alioth.debian.org]

    Date: Sunday, October 19, 2014 @ 18:18:20
  Author: vicho
Revision: 11450

Merge r11331 to r11333 into wheezy-backports

Added:
  packages/mercurial/branches/wheezy-backports/debian/mercurial-common.links
    (from rev 11333, packages/mercurial/trunk/debian/mercurial-common.links)
Modified:
  packages/mercurial/branches/wheezy-backports/debian/changelog
  packages/mercurial/branches/wheezy-backports/debian/control
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__use_sensible-editor.patch
  packages/mercurial/branches/wheezy-backports/debian/rules

Modified: packages/mercurial/branches/wheezy-backports/debian/changelog
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/changelog	2014-10-19 18:10:56 UTC (rev 11449)
+++ packages/mercurial/branches/wheezy-backports/debian/changelog	2014-10-19 18:18:20 UTC (rev 11450)
@@ -1,3 +1,11 @@
+mercurial (3.1.2-1) unstable; urgency=medium
+
+  * New upstream release
+  * Use excanvas.js from libjs-excanvas instead of shipping a copy in
+    the package
+  
+ -- Javi Merino <vicho at debian.org>  Thu, 02 Oct 2014 23:34:41 +0100
+
 mercurial (3.1.1-1~bpo70+1) wheezy-backports; urgency=medium
 
   * Rebuild for wheezy-backports.

Modified: packages/mercurial/branches/wheezy-backports/debian/control
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/control	2014-10-19 18:10:56 UTC (rev 11449)
+++ packages/mercurial/branches/wheezy-backports/debian/control	2014-10-19 18:18:20 UTC (rev 11450)
@@ -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,

Copied: packages/mercurial/branches/wheezy-backports/debian/mercurial-common.links (from rev 11333, packages/mercurial/trunk/debian/mercurial-common.links)
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/mercurial-common.links	                        (rev 0)
+++ packages/mercurial/branches/wheezy-backports/debian/mercurial-common.links	2014-10-19 18:18:20 UTC (rev 11450)
@@ -0,0 +1 @@
+/usr/share/javascript/excanvas/excanvas.js usr/share/mercurial/templates/static/excanvas.js

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__use_sensible-editor.patch	2014-10-19 18:10:56 UTC (rev 11449)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__use_sensible-editor.patch	2014-10-19 18:18:20 UTC (rev 11450)
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -12206,10 +12206,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -12213,10 +12213,10 @@ msgstr " (modelos parecem ter sido insta
  msgid "checking commit editor...\n"
  msgstr "verificando editor para consolidação...\n"
  
@@ -229,7 +229,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr ""
-@@ -19270,10 +19270,12 @@ msgstr ""
+@@ -19275,10 +19275,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -20508,7 +20510,7 @@ msgid ""
+@@ -20513,7 +20515,7 @@ msgid ""
  "    editor it uses is determined by looking at the environment\n"
  "    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
  "    non-empty one is chosen. If all of them are empty, the editor\n"
@@ -253,7 +253,7 @@
  msgstr ""
  "EDITOR\n"
  "    Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -20516,7 +20518,7 @@ msgstr ""
+@@ -20521,7 +20523,7 @@ msgstr ""
  "    mensagens de consolidação. O editor usado é determinado pela\n"
  "    consulta às variáveis de ambiente HGEDITOR, VISUAL e EDITOR,\n"
  "    nessa ordem. O primeiro valor não vazio é escolhido. Se todos\n"
@@ -349,7 +349,7 @@
      This is used by Python to find imported modules and may need to be
 --- a/mercurial/help/config.txt
 +++ b/mercurial/help/config.txt
-@@ -1247,7 +1247,8 @@ User interface controls.
+@@ -1250,7 +1250,8 @@ User interface controls.
      Print debugging information. True or False. Default is False.
  
  ``editor``

Modified: packages/mercurial/branches/wheezy-backports/debian/rules
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/rules	2014-10-19 18:10:56 UTC (rev 11449)
+++ packages/mercurial/branches/wheezy-backports/debian/rules	2014-10-19 18:18:20 UTC (rev 11450)
@@ -88,6 +88,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 , \