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

vicho at users.alioth.debian.org vicho at users.alioth.debian.org
Tue Sep 17 07:27:19 UTC 2013 

    Date: Tuesday, September 17, 2013 @ 07:27:17
  Author: vicho
Revision: 10026

Merge revisions 9733:10015 from trunk into wheezy-backports

Added:
  packages/mercurial/branches/wheezy-backports/debian/hgrc
    (from rev 10015, packages/mercurial/trunk/debian/hgrc)
  packages/mercurial/branches/wheezy-backports/debian/mercurial-common.bash-completion
    (from rev 10015, packages/mercurial/trunk/debian/mercurial-common.bash-completion)
Modified:
  packages/mercurial/branches/wheezy-backports/debian/changelog
  packages/mercurial/branches/wheezy-backports/debian/control
  packages/mercurial/branches/wheezy-backports/debian/mercurial-common.dirs
  packages/mercurial/branches/wheezy-backports/debian/mercurial-common.examples
  packages/mercurial/branches/wheezy-backports/debian/mercurial-common.install
  packages/mercurial/branches/wheezy-backports/debian/mercurial.dirs
  packages/mercurial/branches/wheezy-backports/debian/mercurial.postinst
  packages/mercurial/branches/wheezy-backports/debian/mercurial.test_blacklist
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-templates-separately
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__optional-dependencies
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__use_sensible-editor.patch
  packages/mercurial/branches/wheezy-backports/debian/rules
Deleted:
  packages/mercurial/branches/wheezy-backports/debian/mercurial.preinst

Modified: packages/mercurial/branches/wheezy-backports/debian/changelog
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/changelog	2013-09-14 06:03:11 UTC (rev 10025)
+++ packages/mercurial/branches/wheezy-backports/debian/changelog	2013-09-17 07:27:17 UTC (rev 10026)
@@ -1,3 +1,46 @@
+mercurial (2.7.1-2) unstable; urgency=low
+
+  * Temporarily don't run the testsuite when building.  Since 2.7.1 it
+    timeouts in buildd environments (but works ok if run in the command
+    line).
+
+ -- Javi Merino <vicho at debian.org>  Thu, 05 Sep 2013 21:52:14 +0100
+
+mercurial (2.7.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Enable tests that need networking
+
+ -- Javi Merino <vicho at debian.org>  Wed, 04 Sep 2013 23:06:57 +0100
+
+mercurial (2.7-2) unstable; urgency=low
+
+  * Fix "conffiles not removed" by properly moving them to mercurial-common
+    (Closes: #718621)
+
+ -- Javi Merino <vicho at debian.org>  Tue, 13 Aug 2013 23:11:14 +0200
+
+mercurial (2.7-1) unstable; urgency=low
+
+  * New upstream release
+  * Remove shrink-revlog.py from examples as it is no longer shipped in
+    mercurial
+
+ -- Javi Merino <vicho at debian.org>  Sun, 11 Aug 2013 16:09:20 +0200
+
+mercurial (2.6.3-1) unstable; urgency=low
+
+  * New upstream release
+  * Remove preinst script as it's mostly checks for stuff that was fixed
+    long ago
+  * Remove old checks from postinst
+  * Move config files to mercurial-common
+  * Install bash-completion using debhelper's bash-completion sequencer
+  * Compatible with hgsubversion 1.5 or greater, update breaks to
+    reflect that
+
+ -- Javi Merino <vicho at debian.org>  Sun, 21 Jul 2013 23:31:34 +0200
+
 mercurial (2.6.2-1~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-09-14 06:03:11 UTC (rev 10025)
+++ packages/mercurial/branches/wheezy-backports/debian/control	2013-09-17 07:27:17 UTC (rev 10026)
@@ -11,7 +11,8 @@
  python-docutils,
  python-roman,
  zip,
- unzip
+ unzip,
+ bash-completion
 Standards-Version: 3.9.4
 Homepage: http://mercurial.selenic.com/
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/mercurial/trunk/
@@ -44,7 +45,7 @@
  wish, 
  vim | emacs,
  kdiff3 | kdiff3-qt | kompare | meld | tkcvs | mgdiff
-Breaks: hgsubversion (<= 1.4), 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.3.3), 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.

Copied: packages/mercurial/branches/wheezy-backports/debian/hgrc (from rev 10015, packages/mercurial/trunk/debian/hgrc)
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/hgrc	                        (rev 0)
+++ packages/mercurial/branches/wheezy-backports/debian/hgrc	2013-09-17 07:27:17 UTC (rev 10026)
@@ -0,0 +1,2 @@
+# system-wide mercurial configuration file
+# See hgrc(5) for more information

Copied: packages/mercurial/branches/wheezy-backports/debian/mercurial-common.bash-completion (from rev 10015, packages/mercurial/trunk/debian/mercurial-common.bash-completion)
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/mercurial-common.bash-completion	                        (rev 0)
+++ packages/mercurial/branches/wheezy-backports/debian/mercurial-common.bash-completion	2013-09-17 07:27:17 UTC (rev 10026)
@@ -0,0 +1 @@
+contrib/bash_completion mercurial

Modified: packages/mercurial/branches/wheezy-backports/debian/mercurial-common.dirs
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/mercurial-common.dirs	2013-09-14 06:03:11 UTC (rev 10025)
+++ packages/mercurial/branches/wheezy-backports/debian/mercurial-common.dirs	2013-09-17 07:27:17 UTC (rev 10026)
@@ -1 +1,2 @@
 usr/share/mercurial/help
+etc/mercurial/hgrc.d

Modified: packages/mercurial/branches/wheezy-backports/debian/mercurial-common.examples
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/mercurial-common.examples	2013-09-14 06:03:11 UTC (rev 10025)
+++ packages/mercurial/branches/wheezy-backports/debian/mercurial-common.examples	2013-09-17 07:27:17 UTC (rev 10026)
@@ -7,7 +7,6 @@
 contrib/perf.py
 contrib/python-hook-examples.py
 contrib/sample.hgrc
-contrib/shrink-revlog.py
 contrib/simplemerge
 contrib/tcsh_completion
 contrib/tcsh_completion_build.sh

Modified: packages/mercurial/branches/wheezy-backports/debian/mercurial-common.install
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/mercurial-common.install	2013-09-14 06:03:11 UTC (rev 10025)
+++ packages/mercurial/branches/wheezy-backports/debian/mercurial-common.install	2013-09-17 07:27:17 UTC (rev 10026)
@@ -9,3 +9,5 @@
 contrib/hgk usr/share/mercurial/
 
 contrib/hg-ssh usr/bin
+
+debian/hgrc etc/mercurial/

Modified: packages/mercurial/branches/wheezy-backports/debian/mercurial.dirs
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/mercurial.dirs	2013-09-14 06:03:11 UTC (rev 10025)
+++ packages/mercurial/branches/wheezy-backports/debian/mercurial.dirs	2013-09-17 07:27:17 UTC (rev 10026)
@@ -1,3 +1 @@
-etc/bash_completion.d
-etc/mercurial/hgrc.d
 usr/share/doc/mercurial

Modified: packages/mercurial/branches/wheezy-backports/debian/mercurial.postinst
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/mercurial.postinst	2013-09-14 06:03:11 UTC (rev 10025)
+++ packages/mercurial/branches/wheezy-backports/debian/mercurial.postinst	2013-09-17 07:27:17 UTC (rev 10026)
@@ -25,8 +25,6 @@
 	  # /etc/mercurial/hgrc.d.
 	  ucf --sum-file /usr/share/mercurial/$conffile.md5sums --three-way \
 		/usr/share/mercurial/$conffile /etc/mercurial/hgrc.d/$conffile
-	  # Fix wrong registration until 1.0.1-2 included
-	  ucfr --purge mercurial /etc/hgrc.d/$conffile
 	  ucfr mercurial /etc/mercurial/hgrc.d/$conffile
 	done
 

Deleted: packages/mercurial/branches/wheezy-backports/debian/mercurial.preinst
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/mercurial.preinst	2013-09-14 06:03:11 UTC (rev 10025)
+++ packages/mercurial/branches/wheezy-backports/debian/mercurial.preinst	2013-09-17 07:27:17 UTC (rev 10026)
@@ -1,67 +0,0 @@
-#! /bin/sh
-# preinst script for mercurial
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    install|upgrade)
-        # Fixing a wrong name in a config file (package 6c-1)
-	FILE=/etc/bash_completion.d/bash_completion
-        if [ -f $FILE ] && grep -sq hg $FILE ; then
-	    # Argh, there is the previous wrong named file
-	    # Has it been modified ?
-	    MD5="`md5sum $FILE | cut -f 1 -d \ `"
-	    if [ "$MD5" != a78c4acd831bacee32fde42a42a5ae5e ]; then
-		# conffile has been locally modified. Moving it so that
-		# dpkg will ask what to do about
-		mv $FILE /etc/bash_completion.d/mercurial
-	    else
-		# not changed. Removing it so that dpkg install quietly the
-		# new (renamed) file
-		rm $FILE
-	    fi
-	fi
-	if [ "$2" = "0.7-3" ] && [ -f /etc/mercurial/hgrc.d/hgit.rc ]; then
-	    # This release has never been official. Let's purge the
-	    # old config file if someone installed the package from
-	    # my web page. No need to take care of user's modifications:
-	    # it was experimental stuff.
-	    echo "Purging old config file '/etc/mercurial/hgrc.d/hgit.rc'"
-	    rm -fv /etc/mercurial/hgrc.d/hgit.rc
-	fi
-	if [ -h /usr/share/doc/mercurial ] && [ "$(readlink /usr/share/doc/mercurial)" = mercurial-common ]; then
-	    # /usr/share/doc/mercurial was a symlink to mercurial-common
-	    # It is problematic in case of binary NMU
-	    rm /usr/share/doc/mercurial
-	fi
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-

Modified: packages/mercurial/branches/wheezy-backports/debian/mercurial.test_blacklist
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/mercurial.test_blacklist	2013-09-14 06:03:11 UTC (rev 10025)
+++ packages/mercurial/branches/wheezy-backports/debian/mercurial.test_blacklist	2013-09-17 07:27:17 UTC (rev 10026)
@@ -1,34 +1,3 @@
-# These tests need networking (there is no network in buildds, not
-# even loopback)
-test-archive.t
-test-extension.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-no-path-info.t
-test-hgweb-no-request-uri.t
-test-hgweb-non-interactive.t
-test-hgweb-raw.t
-test-hgweb-removed.t
-test-hgwebdir.t
-test-hgwebdirsym.t
-test-interhg.t
-test-keyword.t
-test-largefiles.t
-test-mq-qclone-http.t
-test-mq-qimport.t
-test-newcgi.t
-test-newercgi.t
-test-obsolete.t
-test-oldcgi.t
-test-serve.t
-test-share.t
-test-subrepo-relative-path.t
-test-websub.t
-
 # Failed to locate styles (?)
 test-bisect3.t
 test-command-template.t

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-templates-separately
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-templates-separately	2013-09-14 06:03:11 UTC (rev 10025)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-templates-separately	2013-09-17 07:27:17 UTC (rev 10026)
@@ -2,7 +2,7 @@
 
 --- a/mercurial/templater.py
 +++ b/mercurial/templater.py
-@@ -323,7 +323,7 @@ funcs = {
+@@ -368,7 +368,7 @@ funcs = {
  
  # template engine
  

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__optional-dependencies	2013-09-14 06:03:11 UTC (rev 10025)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__optional-dependencies	2013-09-17 07:27:17 UTC (rev 10026)
@@ -139,7 +139,7 @@
  
          self.lastrevs = {}
  
-@@ -1013,6 +1017,8 @@ class svn_sink(converter_sink, commandli
+@@ -1023,6 +1027,8 @@ class svn_sink(converter_sink, commandli
          return self.join('hg-authormap')
  
      def __init__(self, ui, path):

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-09-14 06:03:11 UTC (rev 10025)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__use_sensible-editor.patch	2013-09-17 07:27:17 UTC (rev 10026)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2048,8 +2048,8 @@ def debuginstall(ui):
+@@ -2089,8 +2089,8 @@ def debuginstall(ui):
      editor = ui.geteditor()
      cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
      if not cmdpath:
@@ -26,7 +26,7 @@
          else:
 --- a/mercurial/ui.py
 +++ b/mercurial/ui.py
-@@ -753,7 +753,7 @@ class ui(object):
+@@ -754,7 +754,7 @@ class ui(object):
              # avoid confusion.
              editor = 'E'
          else:
@@ -67,7 +67,7 @@
  msgid ""
 --- a/i18n/de.po
 +++ b/i18n/de.po
-@@ -10755,8 +10755,8 @@ msgstr "(Vorlagen scheinen falsch instal
+@@ -11328,8 +11328,8 @@ msgstr "(Vorlagen scheinen falsch instal
  msgid "checking commit editor...\n"
  msgstr "Prüfe Editor für Versionsmeldungen...\n"
  
@@ -78,7 +78,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (Gib einen Editor in der .hgrc Datei an!)\n"
-@@ -16055,7 +16055,8 @@ msgstr ""
+@@ -16933,7 +16933,8 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -88,7 +88,7 @@
  msgstr ""
  
  msgid ""
-@@ -16837,7 +16838,7 @@ msgid ""
+@@ -17815,7 +17816,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,9 +97,9 @@
  msgstr ""
  "EDITOR\n"
  "    Manchmal muss Mercurial eine Textdatei in einem Editor öffnen, damit\n"
-@@ -16845,7 +16846,7 @@ msgstr ""
- "    geschrieben wird. Der verwendete Editor wird aus den drei Umgebungs-\n"
- "    variablen HGEDITOR, VISUAL und EDITOR (in dieser Reihenfolge) ermittelt.\n"
+@@ -17824,7 +17825,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."
@@ -117,7 +117,7 @@
  msgstr ""
  
  msgid ""
-@@ -11500,7 +11500,7 @@ msgstr ""
+@@ -6364,7 +6364,7 @@ msgstr ""
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -137,7 +137,7 @@
  msgstr ""
  
  msgid ""
-@@ -8228,7 +8228,7 @@ msgstr ""
+@@ -8201,7 +8201,7 @@ msgstr ""
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -170,7 +170,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -11539,8 +11539,8 @@ msgstr " (テンプレートのインス
+@@ -11603,8 +11603,8 @@ msgstr " (テンプレートのインス
  msgid "checking commit editor...\n"
  msgstr "メッセージ入力用エディタの確認中...\n"
  
@@ -181,7 +181,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (コミットログ用エディタを設定ファイルで設定してください)\n"
-@@ -18069,11 +18069,12 @@ msgstr ""
+@@ -18161,11 +18161,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -196,7 +196,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -19220,7 +19221,7 @@ msgid ""
+@@ -19323,7 +19324,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"
@@ -205,7 +205,7 @@
  msgstr ""
  "EDITOR\n"
  "    コミットログ入力時のように、 エディタでファイルを開き、\n"
-@@ -19228,7 +19229,7 @@ msgstr ""
+@@ -19331,7 +19332,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -11688,10 +11688,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -11746,10 +11746,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 ""
-@@ -18386,10 +18386,12 @@ msgstr ""
+@@ -18473,10 +18473,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -19579,7 +19581,7 @@ msgid ""
+@@ -19666,7 +19668,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"
-@@ -19587,7 +19589,7 @@ msgstr ""
+@@ -19674,7 +19676,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"
@@ -296,7 +296,7 @@
  msgid ""
 --- a/i18n/zh_CN.po
 +++ b/i18n/zh_CN.po
-@@ -5880,7 +5880,7 @@ msgstr ""
+@@ -5778,7 +5778,7 @@ msgstr ""
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -305,7 +305,7 @@
  msgstr ""
  
  msgid " (specify a commit editor in your .hgrc file)\n"
-@@ -8768,7 +8768,7 @@ msgid ""
+@@ -8666,7 +8666,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"

Modified: packages/mercurial/branches/wheezy-backports/debian/rules
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/rules	2013-09-14 06:03:11 UTC (rev 10025)
+++ packages/mercurial/branches/wheezy-backports/debian/rules	2013-09-17 07:27:17 UTC (rev 10026)
@@ -2,7 +2,7 @@
 # -*- mode: makefile; coding: utf-8 -*-
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2,bash-completion
 
 PYVERS=$(shell pyversions -vs)
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -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
 
-	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
@@ -62,27 +62,21 @@
 	fi
 
 install-archdep:
-	# Install bash autocompletion.
-	install -m 644 \
-		contrib/bash_completion \
-		$(CURDIR)/debian/mercurial/etc/bash_completion.d/mercurial
-	# Install system-wide conffiles
-	echo "# system-wide mercurial configuration file" \
-		>  $(CURDIR)/debian/mercurial/etc/mercurial/hgrc
-	echo "# See hgrc(5) for more information" \
-		>>  $(CURDIR)/debian/mercurial/etc/mercurial/hgrc
-	install -m 644 \
-		contrib/mergetools.hgrc \
-		$(CURDIR)/debian/mercurial/etc/mercurial/hgrc.d/mergetools.rc
-	install -m 644 \
-		debian/cacerts.hgrc \
-		$(CURDIR)/debian/mercurial/etc/mercurial/hgrc.d/cacerts.rc
 	# remove arch-independent python stuff
 	find debian/mercurial/usr/lib \
 		! -name '*.so' ! -type d -delete , \
 		-type d -empty -delete
 
 install-archindep:
+	# Install system-wide conffiles.  Note the rename from .hgrc
+	# to .rc, which dh_install can't do if you list the file in
+	# mercurial-common.install
+	install -m 644 \
+		contrib/mergetools.hgrc \
+		$(CURDIR)/debian/mercurial-common/etc/mercurial/hgrc.d/mergetools.rc
+	install -m 644 \
+		debian/cacerts.hgrc \
+		$(CURDIR)/debian/mercurial-common/etc/mercurial/hgrc.d/cacerts.rc
 	# remove arch-dependent python stuff
 	find debian/mercurial-common/usr/lib \
 		-name '*.so' ! -type d -delete , \

More information about the Python-apps-commits mailing list