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

vicho at users.alioth.debian.org vicho at users.alioth.debian.org
Mon Oct 14 21:17:09 UTC 2013 

    Date: Monday, October 14, 2013 @ 21:17:07
  Author: vicho
Revision: 10058

Merge revisions 10015:10047 from trunk into wheezy-backports

Added:
  packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
    (from rev 10047, packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch)
  packages/mercurial/branches/wheezy-backports/debian/tests/
Modified:
  packages/mercurial/branches/wheezy-backports/debian/changelog
  packages/mercurial/branches/wheezy-backports/debian/control
  packages/mercurial/branches/wheezy-backports/debian/mercurial.test_blacklist
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-help-separately
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__use_sensible-editor.patch
  packages/mercurial/branches/wheezy-backports/debian/patches/series
  packages/mercurial/branches/wheezy-backports/debian/rules

Modified: packages/mercurial/branches/wheezy-backports/debian/changelog
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/changelog	2013-10-14 03:58:05 UTC (rev 10057)
+++ packages/mercurial/branches/wheezy-backports/debian/changelog	2013-10-14 21:17:07 UTC (rev 10058)
@@ -1,3 +1,18 @@
+mercurial (2.7.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Revert breaks of mercurial-git back to << 0.4.0-1 (Closes: #725145)
+  * Re-enable the testsuite as the tests that timeout can be blacklisted
+
+ -- Javi Merino <vicho at debian.org>  Wed, 02 Oct 2013 23:55:58 +0100
+
+mercurial (2.7.1-3) unstable; urgency=low
+
+  * Update breaks of mercurial-git to the current version (0.4.0-1)
+  * Add autopkgtest tests
+
+ -- Javi Merino <vicho at debian.org>  Tue, 01 Oct 2013 08:48:23 +0100
+
 mercurial (2.7.1-2~bpo70+1) wheezy-backports; urgency=low
 
   * Rebuild for wheezy-backports.

Modified: packages/mercurial/branches/wheezy-backports/debian/control
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/control	2013-10-14 03:58:05 UTC (rev 10057)
+++ packages/mercurial/branches/wheezy-backports/debian/control	2013-10-14 21:17:07 UTC (rev 10058)
@@ -18,6 +18,7 @@
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/mercurial/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/mercurial/trunk/
 X-Python-Version: >= 2.4
+XS-Testsuite: autopkgtest
 
 Package: mercurial-common
 Architecture: all 
@@ -45,7 +46,10 @@
  wish, 
  vim | emacs,
  kdiff3 | kdiff3-qt | kompare | meld | tkcvs | mgdiff
-Breaks: hgsubversion (<< 1.5~), hgview (<< 1.7.1-1~), mercurial-git (<= 0.3.3), qct (<< 1.7-2~)
+Breaks: hgsubversion (<< 1.5~),
+ hgview (<< 1.7.1-1~),
+ mercurial-git (<< 0.4.0-1~),
+ qct (<< 1.7-2~),
 Description: easy-to-use, scalable distributed version control system
  Mercurial is a fast, lightweight Source Control Management system designed
  for efficient handling of very large distributed projects.

Modified: packages/mercurial/branches/wheezy-backports/debian/mercurial.test_blacklist
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/mercurial.test_blacklist	2013-10-14 03:58:05 UTC (rev 10057)
+++ packages/mercurial/branches/wheezy-backports/debian/mercurial.test_blacklist	2013-10-14 21:17:07 UTC (rev 10058)
@@ -11,6 +11,7 @@
 
 # No such file or directory /usr/share/mercurial/help/revsets.txt (?)
 test-bookmarks.t
+test-extension.t
 test-help.t
 test-mq.t
 test-transplant.t
@@ -20,3 +21,36 @@
 
 # I'm missing some locales or something (?)
 test-i18n.t
+
+# No hgweb templates
+test-archive.t
+test-hgweb.t
+test-hgweb-commands.t
+test-hgweb-descend-empties.t
+test-hgweb-diffs.t
+test-hgweb-empty.t
+test-hgweb-filelog.t
+test-hgweb-non-interactive.t
+test-hgweb-nopath.t
+test-hgweb-no-path-info.t
+test-hgweb-no-request-uri.t
+test-hgweb-raw.t
+test-hgwebdir.t
+test-hgwebdirsym.t
+test-keyword.t
+test-newcgi.t
+test-newercgi.t
+test-oldcgi.t
+test-share.t
+test-websub.t
+
+# local server failed (?)
+test-hgweb-removed.t
+test-largefiles.t
+test-mq-qclone-http.t
+test-mq-qimport.t
+test-obsolete.t
+test-subrepo-relative-path.t
+
+# no port number associated with service 'daytime' (this should be easily solvable)
+test-serve.t

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-help-separately
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-help-separately	2013-10-14 03:58:05 UTC (rev 10057)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-help-separately	2013-10-14 21:17:07 UTC (rev 10058)
@@ -14,7 +14,7 @@
      return p and p[0] != '.' and p[-1] != '~'
 --- a/mercurial/help.py
 +++ b/mercurial/help.py
-@@ -130,9 +130,11 @@ def loaddoc(topic):
+@@ -131,9 +131,11 @@ def loaddoc(topic):
              module = __file__
          base = os.path.dirname(module)
  

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	2013-10-14 03:58:05 UTC (rev 10057)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__use_sensible-editor.patch	2013-10-14 21:17:07 UTC (rev 10058)
@@ -67,19 +67,19 @@
  msgid ""
 --- a/i18n/de.po
 +++ b/i18n/de.po
-@@ -11328,8 +11328,8 @@ msgstr "(Vorlagen scheinen falsch instal
- msgid "checking commit editor...\n"
+@@ -13738,8 +13738,8 @@ msgid "checking commit editor...\n"
  msgstr "Prüfe Editor für Versionsmeldungen...\n"
  
+ #: mercurial/commands.py:2093
 -msgid " No commit editor set and can't find vi in PATH\n"
 -msgstr " Kein Editor für Versionsmeldungen angegeben und vi nicht im PATH\n"
 +msgid " No commit editor set and can't find sensible-editor in PATH\n"
 +msgstr " Kein Editor für Versionsmeldungen angegeben und sensible-editor nicht im PATH\n"
  
+ #: mercurial/commands.py:2094 mercurial/commands.py:2098
  msgid " (specify a commit editor in your configuration file)\n"
- msgstr " (Gib einen Editor in der .hgrc Datei an!)\n"
-@@ -16933,7 +16933,8 @@ msgstr ""
- 
+@@ -20474,7 +20474,8 @@ msgstr ""
+ #: mercurial/help/config.txt:1156
  msgid ""
  "``editor``\n"
 -"    The editor to use during a commit. Default is ``$EDITOR`` or ``vi``."
@@ -87,8 +87,8 @@
 +"    ``sensible-editor``."
  msgstr ""
  
- msgid ""
-@@ -17815,7 +17816,7 @@ msgid ""
+ #: mercurial/help/config.txt:1159
+@@ -21471,7 +21472,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"
@@ -97,15 +97,15 @@
  msgstr ""
  "EDITOR\n"
  "    Manchmal muss Mercurial eine Textdatei in einem Editor öffnen, damit\n"
-@@ -17824,7 +17825,7 @@ msgstr ""
+@@ -21480,7 +21481,7 @@ msgstr ""
  "    variablen HGEDITOR, VISUAL und EDITOR (in dieser Reihenfolge) "
  "ermittelt.\n"
  "    Der erste nicht-leere wird verwendet. Wenn alle Angaben leer sind,\n"
 -"    wird die Voreinstellung 'vi' verwendet."
 +"    wird die Voreinstellung 'sensible-editor' verwendet."
  
+ #: mercurial/help/environment.txt:99
  msgid ""
- "PYTHONPATH\n"
 --- a/i18n/el.po
 +++ b/i18n/el.po
 @@ -274,7 +274,7 @@ msgid ""
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -11746,10 +11746,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -11790,10 +11790,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 ""
-@@ -18473,10 +18473,12 @@ msgstr ""
+@@ -18513,10 +18513,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -19666,7 +19668,7 @@ msgid ""
+@@ -19706,7 +19708,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"
-@@ -19674,7 +19676,7 @@ msgstr ""
+@@ -19714,7 +19716,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"

Copied: packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch (from rev 10047, packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch)
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	                        (rev 0)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2013-10-14 21:17:07 UTC (rev 10058)
@@ -0,0 +1,21 @@
+Author: Javi Merino <vicho at debian.org>
+Description: Don't rm /usr/bin/python when running the testsuite
+ mercurial tries to delete /usr/bin/python when running the testsuite
+ with "make tests TESTFLAGS=--with-hg=/usr/bin/hg".  If you're doing
+ it as a user, the testsuite fails because it can't remove it.
+ .
+ This fixes it at least in Debian.  I'm unsure about other systems.
+Bug: http://bz.selenic.com/show_bug.cgi?id=4045
+
+diff --git a/tests/run-tests.py b/tests/run-tests.py
+--- a/tests/run-tests.py
++++ b/tests/run-tests.py
+@@ -429,7 +429,7 @@ def usecorrectpython():
+              sys.executable)
+         mypython = os.path.join(BINDIR, pyexename)
+         try:
+-            if os.readlink(mypython) == sys.executable:
++            if (mypython == sys.executable) or (os.readlink(mypython) == sys.executable):
+                 return
+             os.unlink(mypython)
+         except OSError, err:

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/series
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/series	2013-10-14 03:58:05 UTC (rev 10057)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/series	2013-10-14 21:17:07 UTC (rev 10058)
@@ -7,3 +7,4 @@
 deb_specific__install-mo-fhs.patch
 deb_specific__disable_libdir_replacement.patch
 deb_specific__fix_hg-ssh_interpreter.patch
+for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch

Modified: packages/mercurial/branches/wheezy-backports/debian/rules
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/rules	2013-10-14 03:58:05 UTC (rev 10057)
+++ packages/mercurial/branches/wheezy-backports/debian/rules	2013-10-14 21:17:07 UTC (rev 10058)
@@ -23,22 +23,22 @@
 ARCH_IS_SPARC := $(if $(subst sparc,,$(DEB_HOST_ARCH)),,T)
 
 override_dh_auto_test:
-# ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-# # test-pull-pull-corruption tries to execute two hg commands at the
-# # same time to test for corruption.  It does so by running an hg
-# # command in the background, sleeping one second and running the
-# # second command.  In architectures with slow buildds, one second is
-# # not enough and the second test starts before the first one has
-# # started printing.  This is hacky and we just enhance the hack by
-# # incrementing the sleep time in those architectures.
-# ifneq ($(or $(ARCH_IS_MIPS), $(ARCH_IS_KFREEBSD-i386), $(ARCH_IS_ARMEL), $(ARCH_IS_SPARC)),)
-# 		sed -i.deb-backup -e 's/sleep 1/sleep 2/' $(CURDIR)/tests/test-pull-pull-corruption.t
-# endif
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+# test-pull-pull-corruption tries to execute two hg commands at the
+# same time to test for corruption.  It does so by running an hg
+# command in the background, sleeping one second and running the
+# second command.  In architectures with slow buildds, one second is
+# not enough and the second test starts before the first one has
+# started printing.  This is hacky and we just enhance the hack by
+# incrementing the sleep time in those architectures.
+ifneq ($(or $(ARCH_IS_MIPS), $(ARCH_IS_KFREEBSD-i386), $(ARCH_IS_ARMEL), $(ARCH_IS_SPARC)),)
+		sed -i.deb-backup -e 's/sleep 1/sleep 2/' $(CURDIR)/tests/test-pull-pull-corruption.t
+endif
 
-# 	http_proxy='' dh_auto_test -- TESTFLAGS="--verbose --timeout 480 $(PARALLEL_TEST_JOBS) --blacklist $(CURDIR)/debian/mercurial.test_blacklist"
+	http_proxy='' dh_auto_test -- TESTFLAGS="--verbose --timeout 480 $(PARALLEL_TEST_JOBS) --blacklist $(CURDIR)/debian/mercurial.test_blacklist"
 
-# 	rename.ul .deb-backup '' $(CURDIR)/tests/*
-# endif
+	rename.ul .deb-backup '' $(CURDIR)/tests/*
+endif
 
 build-python%: mercurial/__version__.py
 	python$* setup.py build

More information about the Python-apps-commits mailing list