--- mercurial-1.3.1.orig/debian/hgext.rc.md5sums +++ mercurial-1.3.1/debian/hgext.rc.md5sums @@ -0,0 +1,2 @@ +4c808ced6b7ddc2e3c1514703bc238b9 0.9.5-3 +80086669df3007b5b17d7d12efe03775 sarge --- mercurial-1.3.1.orig/debian/watch +++ mercurial-1.3.1/debian/watch @@ -0,0 +1,17 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 2 file +version=2 + +# Uncomment to examine a Webpage +# +#http://www.example.com/downloads.php mercurial-(.*)\.tar\.gz + +# Uncomment to examine a Webserver directory +#http://www.example.com/pub/mercurial-(.*)\.tar\.gz + +# Uncommment to examine a FTP server +http://www.selenic.com/mercurial/release/mercurial-([^s].*)\.tar\.gz --- mercurial-1.3.1.orig/debian/pycompat +++ mercurial-1.3.1/debian/pycompat @@ -0,0 +1 @@ +2 --- mercurial-1.3.1.orig/debian/rules +++ mercurial-1.3.1/debian/rules @@ -0,0 +1,79 @@ +#!/usr/bin/make -f +# -*- mode: makefile; coding: utf-8 -*- + +%: + dh --with quilt $@ + +PYVERS=$(shell pyversions -vs) + +override_dh_auto_build: $(PYVERS:%=build-python%) + $(MAKE) -C doc man + touch $@ + +build-python%: mercurial/__version__.py + python$* setup.py build + touch $@ + +override_dh_auto_install: $(PYVERS:%=install-python%) + +install-python%: build-python% + python$* setup.py install --root $(CURDIR)/debian/tmp + # Do not hardcode the python interpreter + sed -i '1c#!/usr/bin/python' debian/tmp/usr/bin/hg + + +override_dh_install: + dh_install + if test -d $(CURDIR)/debian/mercurial ; then \ + $(MAKE) -f debian/rules install-archdep ; \ + fi + if test -d $(CURDIR)/debian/mercurial-common ; then \ + $(MAKE) -f debian/rules install-archindep ;\ + 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 + + # Symlink docs + rm -rf $(CURDIR)/debian/mercurial/usr/share/doc/mercurial + ln -s mercurial-common $(CURDIR)/debian/mercurial/usr/share/doc/mercurial + # remove arch-independent python stuff + find debian/mercurial/usr/lib \ + ! -name '*.so' ! -type d -delete , \ + -type d -empty -delete + +install-archindep: + # remove arch-dependent python stuff + find debian/mercurial-common/usr/lib \ + -name '*.so' ! -type d -delete , \ + -type d -empty -delete + +override_dh_auto_clean: + cp -a mercurial/__version__.py mercurial/__version__.py.save + $(MAKE) clean + mv mercurial/__version__.py.save mercurial/__version__.py + $(RM) -rv tmp/ + $(RM) build-python* + # if this is a git repository, restore removed files that would have been ignored by dpkg-source + -test -d .git && git checkout -- $$(git status | \ + sed -e '/^#[[:space:]]*deleted:[[:space:]]*/s/^#[[:space:]]*deleted:[[:space:]]*//p;d' | \ + grep -v '^debian/') + +mercurial/__version__.py: + @echo "$@ is missing (you probably call 'make clean' directly)." + @echo "Restore it from sources before building the package" + @echo "Aborting." + exit 1 + --- mercurial-1.3.1.orig/debian/copyright +++ mercurial-1.3.1/debian/copyright @@ -0,0 +1,26 @@ +Format-Specification: + http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=143 +Upstream-Name: mercurial +Upstream-Source: http://www.selenic.com/mercurial/ + +Files: * +Copyright: Copyright 2005 Matt Mackall and others. +License: GPL-2 + You can redistribute this software and/or modify it under the terms of + the GNU General Public License as published by the Free Software + Foundation; version 2 dated June, 1991. + . + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +Files: debian/* +Copyright: Copyright 2005-2008, Vincent Danjean +License: GPL-2 + +This package was debianized by Vincent Danjean on +Fri, 29 Apr 2005 08:54:25 +0200. --- mercurial-1.3.1.orig/debian/mercurial.postrm +++ mercurial-1.3.1/debian/mercurial.postrm @@ -0,0 +1,60 @@ +#!/bin/sh +# postrm script for mercurial +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge) + for conffile in hgext.rc; do + # we mimic dpkg as closely as possible, so we remove configuration + # files with dpkg backup extensions too: + ### Some of the following is from Tore Anderson: + for ext in '~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist .ucf-old .ucf-new .ucf-dist; do + rm -f /etc/mercurial/hgrc.d/$conffile$ext + done + # remove the configuration file itself + rm -f /etc/mercurial/hgrc.d/$conffile + # and finally clear it out from the ucf database + if which ucf >/dev/null; then + ucf --purge /etc/mercurial/hgrc.d/$conffile + fi + if which ucfr >/dev/null; then + ucfr --purge mercurial /etc/mercurial/hgrc.d/$conffile + fi + done + + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm 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 + + --- mercurial-1.3.1.orig/debian/mercurial.dirs +++ mercurial-1.3.1/debian/mercurial.dirs @@ -0,0 +1,3 @@ +etc/bash_completion.d +etc/mercurial/hgrc.d +usr/share/doc/mercurial --- mercurial-1.3.1.orig/debian/pyversions +++ mercurial-1.3.1/debian/pyversions @@ -0,0 +1 @@ +2.4- --- mercurial-1.3.1.orig/debian/mercurial-common.manpages +++ mercurial-1.3.1/debian/mercurial-common.manpages @@ -0,0 +1,4 @@ +doc/hg.1 +doc/hgrc.5 +doc/hgignore.5 +debian/hg-ssh.8 --- mercurial-1.3.1.orig/debian/compat +++ mercurial-1.3.1/debian/compat @@ -0,0 +1 @@ +7 --- mercurial-1.3.1.orig/debian/mercurial.preinst +++ mercurial-1.3.1/debian/mercurial.preinst @@ -0,0 +1,62 @@ +#! /bin/sh +# preinst script for mercurial +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' +# +# 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 + ;; + + 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 + + --- mercurial-1.3.1.orig/debian/mercurial.lintian-overrides +++ mercurial-1.3.1/debian/mercurial.lintian-overrides @@ -0,0 +1,2 @@ +# The hg(1) man page is installed by mercurial-common. +binary-without-manpage usr/bin/hg --- mercurial-1.3.1.orig/debian/mercurial.postinst +++ mercurial-1.3.1/debian/mercurial.postinst @@ -0,0 +1,66 @@ +#!/bin/sh +# postinst script for mercurial +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in + configure) + # Link mercurial doc directory if dpkg didn't do it + DOC=/usr/share/doc/mercurial + if [ -d "$DOC" -a ! -L "$DOC" ]; then + if rmdir "$DOC"; then + ln -s mercurial-common "$DOC" + fi + fi + # Fix for old packages not managing pyc files + for d in /usr/lib/python*/site-packages/mercurial /usr/lib/python*/site-packages/hgext ; do + if [ -d "$d" ] ; then + echo "Removing old python byte-compiled files in $d" + rm -rf "$d" + fi + done + + for conffile in hgext.rc; do + # Tell ucf that the file in /usr/share/mercurial is the latest maintainer + # version, and let it handle how to manage the real configuration file in + # /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 + + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst 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 + + --- mercurial-1.3.1.orig/debian/hg-ssh.8 +++ mercurial-1.3.1/debian/hg-ssh.8 @@ -0,0 +1,40 @@ +.TH HG-SSH 8 2008-01-03 +.SH NAME +hg-ssh \- restricted ssh login shell for Mercurial +.SH SYNOPSIS +.B hg-ssh +.IR repositories ... +.SH DESCRIPTION +.B hg-ssh +can be used as a restricted shell where access to Mercurial repositories is given over +.BR ssh (1). +It should be specified, together with the paths to the +.I repositories +the user should be given access to, as a +.I command +option in an +.BR authorized_keys (5) +file. +.PP +An example +.I authorized_keys +line using +.BR hg-ssh : +.RS +command="hg-ssh path/to/repo1 /path/to/repo2 ~/repo3 ~user/repo4" +ssh-rsa AA...== +.RE +.PP +The user with the specified key would then be permitted to push and pull to the repositories using the URLs: +.RS +.nf +ssh://example.com/path/to/repo1 +ssh://example.com//path/to/repo2 +ssh://example.com/~/repo3 +ssh://example.com/~user/repo4 +.fi +.RE +.SH SEE ALSO +.BR sshd (8), +.BR ssh (1), +.BR hg (1). --- mercurial-1.3.1.orig/debian/hgext.rc +++ mercurial-1.3.1/debian/hgext.rc @@ -0,0 +1,125 @@ +# mercurial configuration file for bundled hg extensions +# See hgrc(5) for more information + +# Extensions included in Mercurial listed in alphabetical order +[extensions] + +# changeset access control +# hgext.acl = + +# allow user-defined command aliases +# hgext.alias = + +# provides the 'bookmarks' command +# hgext.bookmarks = + +# bugzilla integration +# requires python-mysqldb +# hgext.bugzilla = + +# show the children of the given or working dir revision +# provides the 'children' command +# hgext.children = + +# graph count of revisions grouped by template +# provides the 'churn' command +# hgext.churn = + +# add color output to status, qseries, and diff-related commands +# hgext.color = + +# converts a foreign SCM to a Mercurial one +# provides the 'convert' and 'debugsvnlog' commands +# requires: +# - bzr to convert from Bazaar +# - cvs to convert from CVS +# - python-celementtree or python-elementtree to convert from Darcs +# - git-core to convert from Git +# - tla to convert from GNU Arch +# - monotone to convert from Monotone +# - python-subversion to convert from Subversion +# hgext.convert = + +# external diff program support +# hgext.extdiff = + +# pull and merge remote changes +# provides the 'fetch' command +# hgext.fetch = + +# GnuPG signing +# provides the 'sign', 'sigcheck' and 'sigs' commands +# requires gnupg +# hgext.gpg = + +# show revision graphs in terminal windows +# provides the 'glog' command +# hgext.graphlog = + +# CIA notification hook +# hgext.hgcia = + +# allows browsing the history of a repository in a graphical way +# provides the 'view' command +# requires wish +# hgext.hgk = + +# syntax highlighting in hgweb +# requires python-pygments +# hgext.highlight = + +# lets you split a merge into pieces +# provides the 'imerge' command +# hgext.imerge = + +# inotify-based status acceleration for Linux systems +# provides the 'inserve' command +# hgext.inotify = + +# allows you to change changelog and summary text +# hgext.interhg = + +# CVS/RCS-like keyword expansion +# hgext.keyword = + +# quilt-like patch queues +# provides the 'q*' commands +# hgext.mq = + +# email notifications +# hgext.notify = + +# display output using a pager +# hgext.pager = + +# make it easy to refer to the parent of a revision +# hgext.parentrevspec = + +# send changes as series of email patches +# provides the 'email' command +# hgext.patchbomb = + +# removes files not known to mercurial +# provides the 'purge' command +# hgext.purge = + +# moves sets of revisions to a different ancestor +# provides the 'rebase' command +# hgext.rebase = + +# interactive change selection during commit +# provides the 'record' command +# hgext.record = + +# patch transplanting tool +# provides the 'transplant' command +# hgext.transplant = + +# non-Unicode MBCS filename support +# hgext.win32mbcs = + +# Unix/Mac/DOS line ending conversion utilities +# hgext.win32text = + +# mDNS/DNS-SD (Zeroconf) support for 'hg serve' +# hgext.zeroconf = --- mercurial-1.3.1.orig/debian/mercurial-common.examples +++ mercurial-1.3.1/debian/mercurial-common.examples @@ -0,0 +1,17 @@ +hgeditor +contrib/dumprevlog +contrib/git-viz +contrib/hgdiff +contrib/hg-relink +contrib/hgsh +contrib/perf.py +contrib/rewrite-log +contrib/sample.hgrc +contrib/simplemerge +contrib/tcsh_completion +contrib/tcsh_completion_build.sh +contrib/undumprevlog +contrib/vim +contrib/zsh_completion +hgweb.cgi +hgwebdir.cgi --- mercurial-1.3.1.orig/debian/mercurial-common.install +++ mercurial-1.3.1/debian/mercurial-common.install @@ -0,0 +1,10 @@ +templates usr/share/mercurial +debian/tmp/usr/lib + +contrib/mercurial.el usr/share/emacs/site-lisp +contrib/mq.el usr/share/emacs/site-lisp + +contrib/logo-droplets.svg usr/share/mercurial +contrib/hgk usr/share/mercurial/ + +contrib/hg-ssh usr/bin --- mercurial-1.3.1.orig/debian/README.Debian +++ mercurial-1.3.1/debian/README.Debian @@ -0,0 +1,53 @@ +Mercurial for Debian +-------------------- + +Table of contents +* Documentation +* Extensions provided in this package and their dependencies +* Other extensions +* Emacs support + + +Documentation +************* + +Mercurial documentation is available on the web at: + http://hgbook.red-bean.com/ and + http://www.selenic.com/mercurial/wiki/ + +Some parts of the online documentation will be added to the package (for people +not online) as soon as the documentation stabilizes. + + +Extensions +********** + +Extensions can be enabled system-wide, per-user and/or per repository (see +hgrc(5) for more information). Previous versions of this Debian package +enabled some extensions by default; however, this is no longer the case. + +To enable extensions system-wide, you may edit the +/etc/mercurial/hgrc.d/hgext.rc configuration file. This file also contains +information on the dependencies of each extension. + + +Emacs support +************* +This package installs a mercurial.el file. However, it is not enabled (loaded) +by default. Users who want to use it should in their start-up files (such as +~/.emacs) include something like: + + (require 'mercurial) + +It may be better to do instead: + + (when (locate-library "mercurial") + (autoload 'hg-find-file-hook "mercurial") + (add-hook 'find-file-hooks 'hg-find-file-hook)) + +because it defers loading Mercurial until it is needed, meaning that +Emacs will boot faster and use less memory when not using Mercurial. + +This is not done system-wide by this package because the "until needed" is a +bit of a fallacy in this case: find-file is likely to be run at or shortly +after boot. --- mercurial-1.3.1.orig/debian/mercurial.install +++ mercurial-1.3.1/debian/mercurial.install @@ -0,0 +1,5 @@ +debian/tmp/usr/bin +debian/tmp/usr/lib + +debian/hgext.rc usr/share/mercurial/ +debian/hgext.rc.md5sums usr/share/mercurial/ --- mercurial-1.3.1.orig/debian/control +++ mercurial-1.3.1/debian/control @@ -0,0 +1,56 @@ +Source: mercurial +Section: vcs +Priority: optional +Maintainer: Python Applications Packaging Team +Uploaders: Vincent Danjean , + Gerardo Curiel , + Vernon Tang +Build-Depends: debhelper (>= 7.0.50), quilt (>> 0.46-6), + patchutils (>= 0.2.25), gettext, + python-support (>= 0.5.3), python-all-dev, xmlto, asciidoc +Standards-Version: 3.8.2 +Homepage: http://www.selenic.com/mercurial/ +Vcs-Svn: svn://svn.debian.org/python-apps/packages/mercurial/trunk +Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/ + +Package: mercurial-common +Architecture: all +Depends: ${misc:Depends}, ${python:Depends} +Recommends: mercurial (= ${binary:Version}) +Suggests: wish, + python-mysqldb, + python-pygments, + python-openssl +Conflicts: mercurial (<< ${binary:Version}) +Replaces: mercurial (<< ${binary:Version}) +Description: scalable distributed version control system (common files) + Mercurial is a fast, lightweight Source Control Management system designed + for efficient handling of very large distributed projects. + . + This package contains the architecture independent components of Mercurial, + and is generally useless without the mercurial package. + +Package: mercurial +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ucf (>= 2.0020), + mercurial-common (= ${source:Version}) +Suggests: qct, + wish, + vim | emacs, + kdiff3 | tkdiff | meld | xxdiff +Description: scalable distributed version control system + Mercurial is a fast, lightweight Source Control Management system designed + for efficient handling of very large distributed projects. + . + Its features include: + * O(1) delta-compressed file storage and retrieval scheme + * Complete cross-indexing of files and changesets for efficient exploration + of project history + * Robust SHA1-based integrity checking and append-only storage model + * Decentralized development model with arbitrary merging between trees + * High-speed HTTP-based network merge protocol + * Easy-to-use command-line interface + * Integrated stand-alone web interface + * Small Python codebase + . + This package contains the architecture dependent files. --- mercurial-1.3.1.orig/debian/NEWS +++ mercurial-1.3.1/debian/NEWS @@ -0,0 +1,89 @@ +mercurial (1.1.2-1) unstable; urgency=low + + Since the 1.1.2-1 version, mercurial does not enable any extension by + default anymore. Upstream asks us to do so because: + - users can easily enable any extension if they wish, however they cannot + disable a extension that have been enabled system-wide + - upstream prefers that default Mercurial installation is the plain Mercurial + without extension. + + -- Vincent Danjean Sat, 17 Jan 2009 17:47:06 +0100 + +mercurial (1.0-5) unstable; urgency=low + + Since the 1.0 version, mercurial handles most of the merges internaly. + This is an upstream decision (see upstream changeset f077815932ce) + that the debian package will follow. This means that : + - there is no hgmerge script any more + - programs that were invoked by hgmerge (kdiff3, ...) are not by default + See http://www.selenic.com/mercurial/wiki/index.cgi/MergeToolConfiguration + for configuring mergetools with mercurial 1.0 + + -- Vincent Danjean Tue, 20 May 2008 22:37:24 +0200 + +mercurial (1.0) unstable; urgency=low + + Since the 1.0 version, the hbisect extension is now provided as a + built-in command. If you keep an older version of the hgext.rc file + in /etc/mercurial/hgrc.d/ or a $HOME/.hgrc file with the extension + enabled , mercurial will emit a warning: "failed to import extension + hgext.hbisect: No module named hbisect". Just delete the + hgext.hbisect entry in the hgext.rc and/or .hgrc file. + + -- Gerardo Curiel Wed, 02 Apr 2008 16:14:47 -0430 + +mercurial (0.9) unstable; urgency=low + + Since the 0.8.1-5 version, mercurial uses python2.4 instead of (currently the + default on Debian system) python2.3. This allows tailor to use the hg + backend (tailor requires python2.4). + If someone really need python2.3 version of mercurial, please tell me (with + reportbug for example). I will then split the package in python modules + (default, 2.3, 2.4, ...) and one executable. + + Note: if you copied the hgwebdir.cgi or hgweb.cgi script from the examples + directory, do not forget to update it so that it runs /usr/bin/python2.4 + instead of /usr/bin/python (or recopy it) + + UPDATE since 0.9-6: + Due to the new python policy, mercurial modules are now available for all + supported python versions in debian (currently 2.3 and 2.4) + + -- Vincent Danjean Tue, 4 Jul 2006 00:53:21 +0200 + +mercurial (0.8) unstable; urgency=low + Upgrade notes: + - diff and status command are now repo-wide by default + (use 'hg diff .' for the old behavior) + - GPG signing is now done with the gpg extension + - the --text option for commit, rawcommit, and tag has been removed + - the copy/rename --parents option has been removed + + -- Vincent Danjean Mon, 30 Jan 2006 16:11:19 +0100 + +mercurial (0.6c-1) unstable; urgency=low + + Previous versions of mercurial can lead to conflicts for internal filenames + if the repo has both a file 'foo' and a directory 'foo.d'. + This version of mercurial solves this, however this means that some internal + files have been renamed. + + If you want to use (commit, clone on same filesystem, ...) a repo created + with an old version with the new version AND this repo contains directory + nammed 'foo.d', then you need to deal with it. According to the upstream + author, something like this should do the trick: + + find .hg -type d -name "*.[di]" -exec echo mv {} {}.hg ";" + + Run this at the top of your working dir. Take out the 'echo' once + you've confirmed it's finding the right files. + + Also note that 0.6c and older clients should be perfectly compatible + over the wire, so long as each side has the appropriate directory + naming. + + But if you use 0.6c to pull into a repo created by 0.6b with changes + that touch files in an affected directory, you're likely to have + strange behavior. + + -- Vincent Danjean Tue, 23 Aug 2005 09:55:35 +0200 --- mercurial-1.3.1.orig/debian/changelog +++ mercurial-1.3.1/debian/changelog @@ -0,0 +1,1265 @@ +mercurial (1.3.1-1~bpo50+2) lenny-backports; urgency=low + + * Rebuild for lenny-backports + * adjust quilt dependency so that it works with backports + (ie quilt >> 0.46-6 instead of quilt >= 0.46-7) + + -- Vincent Danjean Tue, 18 Aug 2009 12:50:49 +0200 + +mercurial (1.3.1-1~bpo50+1) lenny-backports; urgency=low + + * Rebuild for lenny-backports. + * Revert support for python2.6 so that python-all-dev from stable is + enought for building + + -- Vincent Danjean Thu, 23 Jul 2009 23:07:42 +0200 + +mercurial (1.3.1-1) unstable; urgency=low + + * New Upstream Version (mostly bugfixes) + + -- Vincent Danjean Thu, 23 Jul 2009 22:49:32 +0200 + +mercurial (1.3-2) unstable; urgency=low + + * Do not hardcode the python interpreter in the hg script + (ie use python and not pythonX.Y...) [thanks Vernon Tang] + + -- Vincent Danjean Thu, 09 Jul 2009 17:21:25 +0200 + +mercurial (1.3-1) unstable; urgency=low + + [ Vincent Danjean ] + * [debian/control] add version to the quilt dependency. "dh --with quilt" + is only supported since quilt 0.46-7 (thanks Faheem Mitha and Zed Pobre) + (Closes: #529700, #534589). + + [ Luca Falavigna ] + * Changes for Python 2.6 transition (Closes: #532190): + - Pass --install-layout=deb option to setup.py install call. + - Bump python-all-dev dependency to >= 2.5.4-1~. + + [ Vernon Tang ] + * New upstream release. (closes: #536009) + - Experimental support for sub-repositories + - Fixed support for HTTPS through proxies (closes: #498711) + - Experimental share extension + - Updated translations and numerous small changes and bug fixes + * Updated Standards-Version to 3.8.2. + + -- Vincent Danjean Wed, 08 Jul 2009 17:03:39 +0200 + +mercurial (1.2.1-3) unstable; urgency=low + + * Only install (or remove) files in packages we are building + (Closes: #529803) + Who knows how dh_install detect if we are building arch-dep and/or + arch-indep packages ? + + -- Vincent Danjean Wed, 27 May 2009 01:46:40 +0200 + +mercurial (1.2.1-2) unstable; urgency=low + + * rebuild (forgot to upload arch-all in previous upload) + + -- Vincent Danjean Tue, 19 May 2009 11:01:15 +0200 + +mercurial (1.2.1-1) unstable; urgency=low + + [ Vernon Tang ] + * New bugfix upstream release. (Closes: #525403) + - fixed version number build from tarball + - fix allow_read logic for hgweb + - improve handling of damaged revlogs in verify + - keep .orig files when resolving + - clear resolve state properly when rebasing + - improve --command handling with bisect + - fix diff against bundles + - improve fetch logic for inactive branches + - fix diffstat with notify + - fix 'synthetic file adds' in CVS conversion + + [ Vincent Danjean ] + * Dump Standards-Version (no change needed) + * Switch to dh7 instead of cdbs (last releases of cdbs was breaking + the build system) (Closes: #522426, #527504) + + -- Vincent Danjean Mon, 18 May 2009 19:43:53 +0200 + +mercurial (1.2-1) unstable; urgency=low + + * New upstream release. + + * Fix FTBFS with python-support 0.90 by removing dependence on + python-support internals. (closes: #516269) + + -- Vernon Tang Fri, 06 Mar 2009 17:37:45 +0800 + +mercurial (1.1.2+hg20090217-7787-b8d750daadde-1) experimental; urgency=low + + [ Vernon Tang ] + * New snapshot for feature freeze before next major release. + + * debian/patches: + - deb_specific__mergetools: remove RCS merge from merge tools + - Added: + - proposed_upstream__dont-install-i18n + - Dropped: + - convert-darc-doc.patch: dropping for now to avoid fuzzing translations + - backport__zeroconf-doc + - Refreshed: + - deb_specific__install-templates-separately + - deb_specific__mergetools + + * debian/control: + - Add gettext to build dependencies for compiling translations + - Remove RCS merge from Recommends + - Change merge tool Recommends to Suggests, add xxdiff + + [ Vincent Danjean ] + * swich to debhelper 7. + Debhelper 5.0.37.2 is not enought: 6.0.7 at least is required for + dh_lintian to be called. + * Fix version to hg hash (instead of 'unknown') for this snapshot + * Fix upstream version in changelog + * Upload to experimental + + -- Vincent Danjean Wed, 18 Feb 2009 16:24:23 +0100 + +mercurial (1.1.2-2) unstable; urgency=low + + * debian/mercurial.postinst: symlink /usr/share/doc/mercurial if dpkg didn't + do it when upgrading (closes: #512155) + * debian/control: mercurial-common replaces all earlier versions of + mercurial + + -- Vernon Tang Sun, 18 Jan 2009 10:39:58 +0800 + +mercurial (1.1.2-1) unstable; urgency=low + + [ Vernon Tang ] + * New upstream release (closes: #499846) + Also resolves the following Debian bugs: + - mq corrupts repository on file rename (closes: #503997) + - failing import breaks Python help (closes: #476885) + - hg email doesn't use correct encoding (closes: #427854) + - error when loading extensions twice (closes: #447088) + - static-http does not work with old layout repositories (closes: #494889) + - hgwebdir.cgi goes into endless loop when viewing moved files + (closes: #506694) + + * Install hg-ssh (ssh login shell for an hg server) system-wide. + * Don't enable extensions by default. (closes: #511872, #503865, #491109) + + * debian/control: + - Moved dependencies to mercurial-common where appropriate + - Removed Recommends: python-beaker (not a Mercurial dependency) + - Removed 'convert' extension dependencies from Suggests: + (convert depends on many of the other SCMs it can convert from) + - Added python-openssl to Suggests for "hg serve" HTTPS support. + * debian/hgext.rc: updated for 1.1.2. + * debian/mercurial*, debian/rules: general cleanup. + * debian/README.Debian: updated, proofread, and corrected. + * debian/patches: + - Added headers. + - Added: + - deb_specific__install-templates-separately + (patch template search path to /usr/share instead of symlinking from + the module directory) + - backport__zeroconf-doc, proposed_upstream__correct-zeroconf-doc + - deb_specific__mergetools + - Renamed deb_specific__ElementTree_for_darcs.patch to + deb_specific__optional-dependencies and updated to suggest Debian + packages for more optional dependencies + - Dropped: + - proposed_upstream__extension_syntax.patch + - deb_specific__FAQ_subst.patch + - deb_specific__bash_completion_global_option_already_set.patch + - backport__CVE-2008-2942-fix.patch + - backport__svn1.5-fix.patch + - Refreshed: + - deb_specific__use_sensible-editor.patch + - deb_specific__hgk.py.patch + - convert-darc-doc.patch + + [ Sandro Tosi ] + * debian/control + - switch Vcs-Browser field to viewsvn + + [ Marco Rodrigues ] + * debian/control: + + Add ${misc:Depends} to Depends to remove + lintian warning. + + [ Vincent Danjean ] + * Document the fact that extensions are not enabled by default anymore + in the NEWS file + * big thanks to Vernon Tang for its work + * upload the package + + -- Vincent Danjean Sat, 17 Jan 2009 17:33:46 +0100 + +mercurial (1.0.1-5.1) unstable; urgency=high + + * Non-maintainer upload by the Security Team. + * Honor allowpull configuration setting from hgrc on a repository clone to + prevent information disclosure (CVE-2008-4297; Closes: #500781). + + -- Nico Golde Fri, 03 Oct 2008 16:25:13 +0200 + +mercurial (1.0.1-5) unstable; urgency=low + + * Fix debian/copyright (GPL-2 only and not GPL-2+) (Closes: #493967) + + -- Vincent Danjean Tue, 26 Aug 2008 15:28:20 +0200 + +mercurial (1.0.1-4) unstable; urgency=low + + * fix subversion 1.5 compatibility (Closes: #492244) + using upstream patch + * fix bashism in postinst + + -- Vincent Danjean Thu, 31 Jul 2008 14:27:51 +0200 + +mercurial (1.0.1-3) unstable; urgency=low + + * debian/control: + + update Standard-Version (no change needed) + + add python-beaker as recommends (needed for "hg serve") (Closes: + #486299) + * fix wrong ucf registration (/etc/hgrc.d/ vs /etc/mercurial/hgrc.d/) + (Closes: #487089). Thanks Max Bowsher for noticing. + * add a mention to "legacy Darcs 1 format" in convert documentation + (Closes: #485887) + + -- Vincent Danjean Tue, 08 Jul 2008 20:40:05 +0200 + +mercurial (1.0.1-2) unstable; urgency=high + + * Backport from upstream: fix CVE-2008-2942 Insufficient input validation + (Closes: #488628) + + -- Vincent Danjean Tue, 01 Jul 2008 18:44:19 +0200 + +mercurial (1.0.1-1) unstable; urgency=low + + * New upstream release + + Bugfix release + * debian/watch: do not call uupdate + + -- Vincent Danjean Sat, 31 May 2008 19:26:16 +0200 + +mercurial (1.0-7) unstable; urgency=low + + * Lowering versioned dependency on ucf. Etch version of ucf is enought. + #479485 was using a pre etch version of ucf. + + -- Vincent Danjean Mon, 26 May 2008 09:25:45 +0200 + +mercurial (1.0-6) unstable; urgency=low + + * add versionned dependency on ucf due to the use to ucfr (Closes: #479485) + * re-add rcs as first alternative of recommands. Discussion about this + can be found in #460943 and #479077 (Closes: #479077) + + -- Vincent Danjean Wed, 21 May 2008 10:04:32 +0200 + +mercurial (1.0-5) unstable; urgency=low + + * Add a note in the NEWS file about upstream change for merging conflicts. + (Closes: #481553, ) + * install mergetools.hgrc system wide (Closes: #481089) + * add suggest and documentation for convert extension dependencies + (Closes: #477652) + + -- Vincent Danjean Tue, 20 May 2008 22:46:57 +0200 + +mercurial (1.0-4) unstable; urgency=low + + * fix build system so that "hg version" works + * fix typos in doc (darcs instead of darc) + * remove suggests: for foreign SCM. If someone needs them for the convert + extension, they should be already installed (Closes: #476342) + + -- Vincent Danjean Wed, 16 Apr 2008 10:05:53 +0200 + +mercurial (1.0-3) unstable; urgency=low + + * really fix auto-enabling extensions at installation time + + be less strict with spaces + + reformat the hgext.rc file to be consistent + + -- Vincent Danjean Tue, 15 Apr 2008 10:32:38 +0200 + +mercurial (1.0-2) unstable; urgency=low + + * fix typo in mercurial postinst + * remove Suggests to non existant mercurial-web + * add lintian-override for non depends on "tk8.4 | wish" in + mercurial-common (the Suggests: is in the mercurial package + as for all other extensions' dependencies) + * fix handling of automatic enabled extension in postinst + (they must be disabled in the installed template) + * add detection of inotify extension before enabling it (needed on + etch that has a too old libc) + + -- Vincent Danjean Mon, 07 Apr 2008 09:06:04 +0200 + +mercurial (1.0-1) unstable; urgency=low + + * new upstream version + Closes several Debian bugs: + * "hg convert broken" (Closes: #472185) + * "hgmerge: uses non-POSIX syntax `type' in /bin/sh script" (Closes: + #447094) + * "hgmerge: --help option gives a message that ends strangely" (Closes: + #443428) + * "mercurial: hg/editor interaction leaves a lot of temp files around" + (Closes: #472943) + * "mercurial: Mercurial merge with meld needs hint" (Closes: #466006) + * "glog: tries to close closed fd" (Closes: #454326) + * "mercurial: `hg diff` can break UTF-8 encoding" (Closes: #469326) + * "Recording mtime after recording commit message leads to hidden (lost) + changes" (Closes: #452385) + General: + * greatly improved merge tool configuration, see "hgrc.5.txt" for details + * improved copy/rename handling in diffs, status, and merge + * files in .hg inherit permissions from .hg/store + * infer --repository when possible, so commands may be run from anywhere. + * easy-installable + * new "droplet" logo + + Commands: + * archive: disable ".hg_archival.txt" file addition with "ui.archivemeta" + * bisect: now built-in with greatly improved performance and usability + * bundle: new --all option to bundle the whole repository more easily. + * cat: apply decode filters with --decode + * clone: can clone from a full-history bundle + * commit: warn when creating a new head + * debugancestor: index argument is now optional + * diff: set the number of context line to show with -U/--unified + * grep: display matched revisions commit date with --date + * import: new --no-commit and --user options + * incoming/outgoing: add --limit option + * log: use -b/--only-branch to show revisions of a single branch + * remove: improve handling for --after + * revert: major speedup + * serve: prefix the served path with --prefix (also in [web] section) + * status: unknown files are skipped by --quiet + * tag: allow multiple tags to be added or removed + * tags: --verbose flags local tags + * update: switch between named branches without -C + + Extensions: + * churn: promoted to an official extension (previously in contrib) + * color: new extension coloring "status" and "qseries" command outputs + * convert: + * allow synthetic history to be spliced in with --splicemap + * support GNU Arch and Monotone sources + * svn: allow shallow conversions of single branches with + convert.svn.startrev option. + * svn: make trunk/branches/tags layout detection more flexible by + allowing either of them to be skipped. + * svn: preliminary support as a conversion target + * hgk: configuration file changed from .gitk to .hgk + * highlight: new extension enabling syntax highlighting in hgweb file view + (requires pygments) + * inotify: new extension using Linux 2.6 inotify API for instant status + checking + * keyword: new extension for filewise RCS-keyword expansion in working + directory + * mq: new --currentdate, --date, --currentuser, and + --user options + * record: add "qrecord" command when used with mq + + Web interface: + * improved WSGI integration and compatibility + * follow symlinks in hgwebdir collections + * show branches in most of gitweb templates + * add line anchors to annotate, changeset, diff and file views + * support web.baseurl in hgwebdir, overriding SCRIPT_NAME + + Hooks: + * standard hook to reject text files with CRLF in win32text extension + * redirect stdout to stderr for ssh and http servers + + [ Gerardo Curiel ] + * Split package to fix lintian warnings: + + mercurial - main package + + mercurial-common - Arch-indep bits + * Fix clean target + * Dropped patches: + patches/proposed_upstream__check_hgmerge_args.patch + patches/proposed_upstream__type_is_not_posix.patch + * patches/deb_specific__use_sensible-editor.patch: + Rediff against mercurial 1.0 + * hgmerge shell script is not provided anymore + * contrib/favicon.ico is not provided anymore + * Deleted obsolete link_hgit target from debian/rules + * Added mergetools.hgrc to the examples + directory + * Added logo-droplets.svg to /usr/share/mercurial + * Added new extensions to the hgext.rc file + + hgext.color (not enabled by default) + + hgext.highlight (not enabled by default) + + hgext.inotify (enabled, Closes: #472583) + + hgext.keyword (not enabled by default) + * Removed extensions from the hgext.rc file + + hgext.hbisect (now provided as a built-in command) + * Added new suggested dependencies : + + python-pygments (needed for hgext/highlight.py) + + python-elementtree (for darcs conversion) + + [ Vincent Danjean ] + * import mercurial in the Python Application Packaging Team project + * debian/control: + + add PAPT in the Uploaders field + + add Vcs-* fields + + add conflicts/replaces fields to ensure proper upgrade for + mercurial-common + * cleanup debian/ files + + remove unneeded debian/*.{dirs} files + * move examples/ in usr/share/doc/mercurial (in the mercurial-common + package) + * manage hgext.rc with ucf. Enabling some extensions only if their + dependencies are present + * put all usr/share/python-support/* in mercurial-common instead of + mercurial. This trigger a lintian warning but this is an error (see + #473428) + + [ Piotr Ożarowski ] + * New recommended packages: + + python-mysqldb (hgext/bugzilla.py) + + python-openssl (hgweb/server.py) + * New suggested packages: + + python-flup (contrib/hgwebdir.fcgi, Closes: #466731) + + [ William Pitcock ] + * patches/deb_specific__use_sensible-editor.patch: + +Rediff against 1.0 branch. + + -- Vincent Danjean Mon, 07 Apr 2008 00:11:40 +0200 + +mercurial (0.9.5-3) unstable; urgency=low + + * [debian/control] + + Recommends rcs first (and before kdiff3) as hgmerge + use it in first (and does not use another program if it exists) + (Closes: #460943) + As an additionnal value, rcs has really fewer dependencies + + Move Homepage: from description to source stanza + + Suggest qct instead of commit-tool (better developed upstream) + + Bump standard-version to 3.7.3 (no change needed) + + Add python-elementtree to suggest (needed for hg convert with darcs + repo) (Closes: 459353) + Should be removed when debian will switch to python2.5 (as it is + included in it) + + move tk8.4 | wish from recommends to suggests as it is needed by + an extension (hgk) and not by the core package + * [debian/README] + + document that extension dependencies are listed as Suggests: + * [debian/patches/deb_specific__use_VISUAL_envvar.patch] + Rewrite the patch using sensible-editor (Closes: 448376) + and rename it to deb_specific__use_sensible-editor.patch + * [debian/rule] + + rewrite the fix for cdbs/dh_python so that we depend on the + current python version (Closes: #456556) + + -- Vincent Danjean Mon, 21 Jan 2008 20:57:27 +0100 + +mercurial (0.9.5-2) unstable; urgency=low + + * Apply patch to change 'hgext/' into 'hgext.' when loading an extension + Current config files use the documented syntax (ie 'hgext.extname=') + Users can use 'hgext/extname=' in their hgrc if they want to + (Closes: #447088) + + -- Vincent Danjean Fri, 02 Nov 2007 11:59:03 +0100 + +mercurial (0.9.5-1) unstable; urgency=low + + * New upstream release + Closes: #435636 (erroneous multiple heads after commit) + Closes: #427808 (hgweb/hgwebdir do not work with flup (FastCGI)) + Closes: #418780 (partial hgweb listings) + Closes: #440175 (please include record extension) + Closes: #447663 (0.9.5 available) + Closes: #427851 (RSS feeds have wrong URL with https) + New features: + * Handle symlinks on systems without symlink support + * hg archive supports symlinks + * Display executable/symlink bit with "hg manifest -v" (see UpgradeNotes) + * Improved hg verify diagostics + * Faster revlog handling + * Faster handling of large directories + * Greatly improved handling of large files + * Atom syndication support in hgweb + * Improved test suite with parallel execution + + Fixes: + * Fixes for some file copy and rename corner cases + * Allow moving newly-added files before commit + * Improve hg diff whitespace handling + * Disallow fast-forward merge with an ancestor + * Fix adding untracked files on directory renames + * Fix hg archive %r format specifier + * Fix re: and glob: patterns in .hgignore + * Improve hg executable path resolution + * Many options and hgrc parsing improvements + * Better handling of VFAT filesystems on Linux + * Fix tgz archival on Windows + * Fix hg serve on Windows requiring pywin32 modules + * Fix --profile under Windows + + New extensions: + * alias - allow user-defined command aliases + * children - show the children of the given or working dir revision + * imerge - incremental interactive merging + * interhg - modify changelog text as in InterWiki + * record - darcs-style interactive change selection during commit + + New extension features: + * convert + * Now supports Subversion, Darcs and Mercurial as source SCMs + * Use clone's behaviour for the default destination name + * Force encoding to UTF-8 for converted repository + * Support new-style .cvspass file format + * Filter the files and directories to import + * Remap paths to new locations during import + * hgk + * Fix hgk stopping because of untrusted repository warnings + * Handle filenames with spaces + * Improved documentation + * mq + * Autodetect --git patches on qrefresh + + * Improve README.Debian about Emacs + Closes: #446972 (mercurial.el: autoload) + Thanks to Trent W. Buck for its explainations added to the README.Debian + * Apply several patches to hgmerge: + - use /bin/bash for hgmerge: 'type' is not POSIX (Closes: #447094) + - patch hgmerge to do minimum check of its arguments (Closes: #443428) + - use $VISUAL and default to 'editor' instead of 'vi' + (Closes: #447095, #448376) [mercurial/command.py modified too] + * Correct wrong link to web docs in README.Debian (Closes: #425841) + * [debian/control] Recommends: meld (used to hgmerge) (Closes: #316347) + + -- Vincent Danjean Mon, 29 Oct 2007 10:22:45 +0100 + +mercurial (0.9.4-1) unstable; urgency=low + + * New upstream release (Closes: #430714) + + New features: + * support for symlinks + * improved tag handling + * improved merge handling of file and directory renames + * improved named branch usability + * numerous improvements to commands + * generic pre- and post-command hooks + * improved Windows support + * basic BeOS and OpenVMS support + * numerous bug fixes + + + New extensions and contributions: + * extensions can now be specified in .hg/hgrc + * new convert extension with CVS support + * new graphlog extension + * improved patchbomb extension + * example FastCGI script + + -- Vincent Danjean Wed, 27 Jun 2007 00:33:27 +0200 + +mercurial (0.9.3-2) unstable; urgency=low + + * [debian/rule, debian/control] remove workaround for symlink support in + python-support and bump dependency of python-support (>= 0.4.3) + * [debian/rule] use default python interpreter as 2.4 is the default now + * [debian/mercurial.postinst] remove old + /usr/lib/python*/site-packages/{mercurial,hgext} directories if needed + (Closes: #382252) + * forgot to closes: #382185 since 0.9.2 upstream release (hgrc manual does + not say [smtp] host is optional any more) + + -- Vincent Danjean Wed, 3 Jan 2007 14:22:10 +0100 + +mercurial (0.9.3-1) unstable; urgency=low + + * New upstream release + + Bug fixes: + - fix a merge copy/rename corner case + - fix spurious new heads message with push -r + - fix hg export %n sequence numbers + - fix shell quoting on Windows + - fix charset encoding for hgwebdir and obfuscated addresses + - fix missing generated files for distribution tarball + - fix convert-repo tag updates and transcoding of committer + - add instructions for redoing failed merges + + + Documentation fixes: + - hg cat, manifest, and tag default to current parent revision. + - CGI stub comments clarified + - corrected synopses for many commands + - improve doc building and distribution + - convert-repo: update usage information + + + Extension fixes: + - mq: fix strip on Windows + - mq: fix some guards corner cases + - gpg: make 'hg sign' default to current parent + + + + -- Vincent Danjean Tue, 19 Dec 2006 11:25:55 +0100 + +mercurial (0.9.2-3) unstable; urgency=low + + * remove debian/patches/submitted_upstream__restore_hgk.py.patch + as it is now included in the release (and avoid to use a old hgk.py + with a recent hg) (Closes: #403282) + + -- Vincent Danjean Sat, 16 Dec 2006 15:51:13 +0100 + +mercurial (0.9.2-2) unstable; urgency=low + + * [debian/rules] add support for python2.5 + * [README.Debian] update list of default extensions + + -- Vincent Danjean Thu, 14 Dec 2006 15:26:10 +0100 + +mercurial (0.9.2-1) unstable; urgency=low + + * New upstream release + + New features: + - merge now follows renames and copies + - new layout protects against case-insensitivity issues + - new branch and branches commands for managing named branches + - push command accepts -r for pushing specified heads or named + branches + - proper storage of changelog and other metadata in UTF-8 + - log, annotate and grep '--follow' follow renames and copies + - date parsing is improved and log, update, and revert accept + --date ranges + - additional command options for log, status, addremove + - improved schema for hgweb URLs + - bundle can now use '-r' and '--base' removing the need of an + base repository + - support for git-style extended patches with --git option + - new debuginstall command to check for common installation issues + + + New contributions and extensions: + - mq + - support for quilt-style guards + - can import existing changesets into mq ('qimport -r') or + commit mq patches as regular changesets ('qdel -f') + - edit the log message with 'qrefresh -e' + - rename patches with 'qrename' + - qheader to display the patch header of particular patches, + and '--summary' for qseries, qapplied, qunapplied and qtop + - combine patches with 'qfold' + - qrefresh supports pattern options to import only a subset + of the changes into a patch, to help split changes into + multiple patches + - patch names for applied patches act like local tags, and can + be used in the revision arguments of any hg command + - hgk + - browse a subset of the history with '--limit' and revision range + arguments + - shows revision numbers as well as node hashes + - churn: graph lines of code changed per user over a range of history + - patchbomb: generate inline attachments with '-a' + + + Behavior changes: + - hg cat defaults to the working directory revision rather than tip + - hg manifest no longer shows internal file revision hashes by default + - hg revert now requires the -a flag to revert all files + + + Developer notes: + - new high-level API functions in the 'hg' module + - new context API simplifies many operations + - The changelog can now include arbitrary metadata in key: value form + * [debian]: include the churn extension and enable it by default + + -- Vincent Danjean Thu, 14 Dec 2006 13:05:01 +0100 + +mercurial (0.9.1+20061210+8c24b6fd5866-1) experimental; urgency=low + + * New upstream release + snapshot before 0.9.2 release + * [debian/control] : update maintainer field : I'am DD now :-) + + -- Vincent Danjean Sun, 10 Dec 2006 22:40:30 +0100 + +mercurial (0.9.1-1) unstable; urgency=low + + * New upstream release + Major changes between Mercurial 0.9 and 0.9.1: + + New features: + - You can now configure your 'hgweb' server to let remote users + 'push' changes over http. + - You can now 'import' a patch in a mail message by saving the mail + message, and importing it. This works for patches sent either + inline or as attachments. + - The 'diff' command now accepts '-rA:B' syntax as a synonym for + '-r A -r B', and adds '-b' and '-B' options. + + New contributions and extensions: + - The 'acl' extension lets you lock down parts of a repository + against incoming changes + - The 'extdiff' extension lets you run your favourite graphical + change viewer + - Comprehensive integration with the 'vim' editor + - A restricted shell for 'ssh'-hosted repositories + - An importer for 'darcs' repositories + + New hooks added: + - 'preupdate' is run before an update or merge in the working + directory. + - 'update' is run after an update or merge in the working + directory. + + Behaviour changes: + - NOTE: Mercurial as installed by the Windows binary + installer no longer performs automatic line-ending conversion for + Unix/Linux compatibility. To re-enable this feature, edit your + 'mercurial.ini' file after you upgrade. + - The Windows binary installer now automatically adds 'hg' to your + '%PATH%'. + - The 'backout' command now runs an editor by default, to let you + modify the commit message for a backed-out changeset. + - An earlier problem with parsing of tags has been fixed. + This makes tag parsing slower but more reliable. + + Memory usage and performance improvements: + - The 'remove' command has been rewritten to be hundreds of times + faster in large repositories. + - It is now possible to 'clone' a repository very quickly over a + LAN, if the server is configured to allow it. See the new 'server' + section in the 'hgrc' documentation. + + Other changes of note: + - Mercurial will now print help for an extension if you type 'hg + help EXT_NAME'. + - The usual array of bug fixes and documentation improvements. + - The integrated web server is now more WSGI-compliant. + - Work has begun to solidify Mercurial's API for use by third-party + packages. + + -- Vincent Danjean Tue, 25 Jul 2006 19:21:13 +0200 + +mercurial (0.9-9) unstable; urgency=low + + * Force the use of python2.4 with a sed command. A race condition on some + autobuilders makes that workaround needed. (Really closes: #378835) + + -- Vincent Danjean Thu, 20 Jul 2006 17:59:35 +0200 + +mercurial (0.9-8) unstable; urgency=low + + * do not use default python but python2.4 instead for hg : + most code is python2.3 compatible (so we still compile .py files for + pyhton2.3) but "hg help" need features for python2.4 + Closes: #378835 + Thanks David Douard for reporting this. + * adding missing manpage hgignore (Closes: #378502) + Thanks Baruch Even for reporting this. + * remove hack in postinst (dpkg not replacing directory by symlink) as it is + no more usefull (directory was in /usr/lib/python2.3, symlink in now in + /usr/lib/python2.4) + * Create symlinks for the templates directory within the mercurial directory + (and not in another python serch path) (Closes: #378538) + + -- Vincent Danjean Wed, 19 Jul 2006 12:25:30 +0200 + +mercurial (0.9-7) unstable; urgency=low + + * mercurial will use the default python interpreter + + -- Vincent Danjean Tue, 11 Jul 2006 23:12:14 +0200 + +mercurial (0.9-6) unstable; urgency=low + + * update to the new python policy + * reenable the fix for #362487 as python2.3 is useable again + + -- Vincent Danjean Tue, 4 Jul 2006 00:19:50 +0200 + +mercurial (0.9-5) unstable; urgency=low + + * call dh_python with -V 2.4 argument + + -- Vincent Danjean Mon, 29 May 2006 09:18:53 +0200 + +mercurial (0.9-4) unstable; urgency=low + + * [debian/copyright] add copyright for Debian packaging + * [debian/NEWS] talk about python2.3->python2.4 transition + + -- Vincent Danjean Wed, 17 May 2006 00:28:48 +0200 + +mercurial (0.9-3) unstable; urgency=low + + * [debian/compat] debhelper compat version dumped to 5 + + -- Vincent Danjean Sun, 14 May 2006 21:27:43 +0200 + +mercurial (0.9-2) unstable; urgency=low + + * fix a bug in update/revert (patch from Vadim Gelfer already applied + upstream) + * [debian/control] build-depend on python as dh_python require it + (package did not fail to build due to an indirect build-dependency + but it is safer like that) + + -- Vincent Danjean Fri, 12 May 2006 19:30:44 +0200 + +mercurial (0.9-1) unstable; urgency=low + + * New upstream release + Major changes between Mercurial 0.8.1 and 0.9: + - The repository file format has been improved. + - This has resulted in an average 40% reduction in disk space usage. + - The new format (called RevlogNG) is now the default. + - Mercurial works perfectly with both the old and new repository + file formats. It can transfer changes transparently between + repositories of either format. + - To use the new repository format, simply use `hg clone --pull` to + clone an existing repository. + - Note: Versions 0.8.1 and earlier of Mercurial cannot read + RevlogNG repositories directly, but they can `clone`, `pull` + from, and `push` to servers that are serving RevlogNG + repositories. + - Memory usage has been improved by over 50% for many common operations. + - Substantial performance improvements on large repositories. + - New commands: + - 'archive' - generate a directory tree snapshot, tarball, or zip + file of a revision + - Deprecated commands: + - 'addremove' - replaced by 'add' and 'remove --after' + - 'forget' - replaced by 'revert' + - 'undo' - replaced by 'rollback' + - New extensions: + - Bugzilla integration hook + - Email notification hook + - Nested repositories are now supported. Mercurial will not recurse + into a subdirectory that contains a '.hg' directory. It is treated + as a separate repository. + - The standalone web server, 'hg serve', is now threaded, so it can + talk to multiple clients at a time. + - The web server can now display a "message of the day". + - Support added for hooks written in Python. + - Many improvements and clarifications to built-in help. + * [debian/control] set Standard-Version to 3.7.2 (no changes required) + + -- Vincent Danjean Thu, 11 May 2006 01:00:03 +0200 + +mercurial (0.8.1-6) unstable; urgency=low + + * cleanup patches applied on top of upstream sources + send the interesting one to upstream before the 0.9 release + + -- Vincent Danjean Thu, 27 Apr 2006 03:20:24 +0200 + +mercurial (0.8.1-5) unstable; urgency=low + + * use python2.4 instead of standard python (2.3 for now): + this allows to use hglib backend with tailor + * several minor fixes so that tailor works with the 'hglib' backend + these are submitted upstream + * hardcode python interpreter in script instead of using /usr/bin/env + as suggested by the python policy + * remove previous hack (dpkg not replacing directory by symlink) as + it is no more usefull (directory was in /usr/lib/python2.3, symlink in now + in /usr/lib/python2.4) + + -- Vincent Danjean Mon, 17 Apr 2006 12:21:24 +0200 + +mercurial (0.8.1-4) unstable; urgency=low + + * directory doesn't get replaced by symlink (Closes: #362487) + and dpkg does not say anything ! Thanks Norbert Tretkowski + + -- Vincent Danjean Fri, 14 Apr 2006 00:38:10 +0200 + +mercurial (0.8.1-3) unstable; urgency=low + + * Really fix #361897 (Thanks Darren Salt again) + + -- Vincent Danjean Wed, 12 Apr 2006 20:33:45 +0200 + +mercurial (0.8.1-2) unstable; urgency=low + + * Fix new tag syntax for hgk. Thanks Darren Salt (Closes: #361897) + + -- Vincent Danjean Tue, 11 Apr 2006 13:25:04 +0200 + +mercurial (0.8.1-1) unstable; urgency=low + + * New upstream release + Major changes from 0.8 to 0.8.1: + - new extensions: + mq (manage a queue of patches, like quilt only better) (Closes: #343824) + email (send changes as series of email patches) + - new command: merge (replaces "update -m") + - improved commands: log (--limit option added), pull/push ("-r" works + on specific revisions), revert (rewritten, much better) + - comprehensive hook support + - output templating added, supporting e.g. GNU changelog style + - Windows, Mac OS X: prebuilt binary packages, better support + - many reliability, performance, and memory usage improvements + + -- Vincent Danjean Mon, 10 Apr 2006 22:09:16 +0200 + +mercurial (0.8-3) unstable; urgency=low + + * Fix typo in long description + + -- Vincent Danjean Tue, 4 Apr 2006 03:30:22 +0200 + +mercurial (0.8-2) unstable; urgency=low + + * Add documentation about extensions packaged for Debian. + + -- Vincent Danjean Tue, 31 Jan 2006 11:14:52 +0100 + +mercurial (0.8-1) unstable; urgency=low + + * New upstream release + Major changes from 0.7 to 0.8: + - faster status, diff, and commit + - reduced memory usage for push and pull + - improved extension API + - new bisect, gpg, hgk, and win32text extensions + - short URLs, binary file handling, and optional gitweb skin for hgweb + - numerous new command options including log --keyword and pull --rev + - improved hooks and file filtering + + -- Vincent Danjean Mon, 30 Jan 2006 16:06:34 +0100 + +mercurial (0.7+20060110+0d36e3d7e2ea-1) experimental; urgency=low + + * package test to try upstream sources before 0.8 + + -- Vincent Danjean Tue, 10 Jan 2006 22:47:38 +0100 + +mercurial (0.7-8) unstable; urgency=low + + * Closes: #343459: correct FAQ URL + * Closes: #343458: fix directory completion + * Closes: #343472: clone does not work with path aliases + (Thanks Daniel Kobras for these three bugreports with patch) + + -- Vincent Danjean Tue, 3 Jan 2006 21:13:23 +0100 + +mercurial (0.7-7) unstable; urgency=low + + * Add support for alias st for hg status (Closes: #340235) + (backport from tip, thanks Michael Gebetsroither ) + + -- Vincent Danjean Tue, 22 Nov 2005 13:01:39 +0100 + +mercurial (0.7-6) unstable; urgency=low + + * Backport of the patch "fix handling of daylight saving time" + from upstream (Closes: #336646) + + -- Vincent Danjean Wed, 2 Nov 2005 06:17:04 +0100 + +mercurial (0.7-5) unstable; urgency=low + + * Add hgweb.cgi and hgwebdir.cgi in examples (Closes: #332973) + + -- Vincent Danjean Sat, 15 Oct 2005 11:24:54 +0200 + +mercurial (0.7-4) unstable; urgency=low + + * backport from upstream of + - use of 'hgext' directory for extensions + - 'hgk.py' extension (was hgit before) + => 'hg view' works ;-) + * add 'Recommands: wish' for the hgk extension + + -- Vincent Danjean Fri, 23 Sep 2005 11:45:13 +0200 + +mercurial (0.7-3) unstable; urgency=low + + * Add system-wide config directory (so that extensions can be easyly added) + * Enable hgit extension + + -- Vincent Danjean Tue, 20 Sep 2005 02:47:16 +0200 + +mercurial (0.7-2) unstable; urgency=low + + * Correct changelog.Debian (I forgot to add upstream changes in the + previous entry) + + -- Vincent Danjean Sun, 18 Sep 2005 22:46:14 +0200 + +mercurial (0.7-1) unstable; urgency=low + + * New upstream release (Closes: #328725) + core + improved merge logic + improved copy/rename support (still experimental) + automatic binary file handling + generic file filtering support + various performance improvements + command line + new bundle/unbundle commands for exchanging native updates + more natural support for remove, copy, and rename + faster, more powerful log command + new grep command for searching entire history + support for plug-in extensions + improved exception handling and debugging facilities + hgweb + optional downloading of tarballs and zip files + Windows support + hardlinking support + newline conversion through file filtering + contrib + updated hgk + * New package (a bit delayed due to a crash disk and a new job) + * Upstream added support for options -h and --help (Closes: #324049) + * renamming conffile 'bash_completion' to 'mercurial' (Closes: #325266) + + -- Vincent Danjean Sat, 17 Sep 2005 16:54:37 +0200 + +mercurial (0.6c-1) unstable; urgency=low + + * New upstream release + What's new: + + core functionality + ability to use tags to identify branches + detect adding new heads with push + protocol versioning for push/pull + https: support + minor merge fixes + command line + much more powerful path handling + incoming/outgoing commands + smarter import/export + fewer long, confusing hashes to deal with + many new command options and settings + portability + improved portability of test suite and support scripts + improved Windows support + web interface + easy to set up multiple repository interface + several new hgrc config options + IPv6 support + documentation + improved built-in help and man pages + a steadily growing wiki + tutorial in multiple languages + extras + a highly functional bash auto-completion script + a new Emacs mode + + -- Vincent Danjean Tue, 23 Aug 2005 11:01:36 +0200 + +mercurial (0.6b-2) unstable; urgency=low + + * Adds proper python dependencies + * Recommends tkdiff or kdiff3 for merge purpose + * Suggests meld as this is another merging program that can be used by + mercurial (but this needs the user set the HGMERGE variable) + * Closes: #316347: Please Recommands: meld + + -- Vincent Danjean Wed, 17 Aug 2005 10:33:33 +0200 + +mercurial (0.6b-1) unstable; urgency=low + + * New upstream release + What's new: + + improved ui + new clone command replaces mkdir+init+pull+update + new revert command + add range support and -p option to log to show patches + tags command now supports local tags + improved push and pull + better exception and signal handling + improved option parsing + support for user-defined hooks (aka triggers) + performance updates + even faster import of large sets of patches + faster delta generation + faster annotate + faster status and ignore + improved web interface + more conformant and compatible HTML output + built-in RSS feeds + better tags handling + fast multiple keyword search + portability work + support for Windows is nearly complete + should easily compile and install on any modern UNIX + comes with RPM spec file and script + and more + doc and help updates + improved test suite + numerous bug fixes and cleanups + + -- Vincent Danjean Tue, 12 Jul 2005 11:45:13 +0200 + +mercurial (0.6-2) unstable; urgency=low + + * Add meld to Suggest as it is not used by default hgmerge + (Closes: #316347: Please Recommands: meld) + + -- Vincent Danjean Thu, 30 Jun 2005 16:30:33 +0200 + +mercurial (0.6-1) unstable; urgency=low + + * New upstream release + This release contains a huge number of improvements: + + improved source tracking + multi-head support + permission tracking + rename and copy tracking + improved tag handling + friendlier, more robust command line interface + integrated help + faster startup + better exception handling + smarter three-way merge helper + improved communication + faster outstanding changeset detection + SSH-based push support + non-transparent proxy support + improved configuration handling + support for .hgrc and .hg/hgrc files + save per-repo defaults for pull + new delta extension + faster, smaller, and simpler than GNU diff or xdiff + faster commit, push/pull, and annotate + improved interoperability + convert-repo framework for importing from other SCMs + can work with gitk and git-viz + portability improvements + tested on big and little-endian 32 and 64-bit UNIX platforms + Windows support is nearly complete + and much more + numerous performance tweaks and bugfixes + automated test suite + updated docs and FAQ + + -- Vincent Danjean Sat, 25 Jun 2005 00:15:13 +0200 + +mercurial (0.5b+20050618-1) unstable; urgency=low + + * New upstream sources (tip 396:8f8bb77d560e70bcc95577e4dfa877df18d876ab) + this fix a alignment bug reported on alpha + * many others fix and improvments from upstream + * Change short description + Closes: #314577: Please spell out the abbreviation in the synopsis + + -- Vincent Danjean Sat, 18 Jun 2005 10:02:39 +0200 + +mercurial (0.5b+20050612-2) unstable; urgency=low + + * Fix spelling mistake (thanks Emanuele Aina) + Closes: #314161: Small spelling error in documentation + * New package that should solve the FTBFS due to the use of the boggus + package debhelper 4.9.0 by autobuilders + Closes: #313491: mercurial_0.5b+20050612-1: FTBFS: syntax error at + /usr/bin/dh_strip line 191, near 'if' + * Closes: #314577: Please spell out the abbreviation in the synopsis + + -- Vincent Danjean Fri, 17 Jun 2005 11:14:06 +0200 + +mercurial (0.5b+20050612-1) unstable; urgency=low + + * New upstream sources + + -- Vincent Danjean Sun, 12 Jun 2005 11:40:02 +0200 + +mercurial (0.5b-5) unstable; urgency=low + + * manually fix wrong build-dependencies that have been previously generated + by cdbs (ie remove 'build-essential' and duplicates) + + -- Vincent Danjean Sat, 4 Jun 2005 09:16:40 +0200 + +mercurial (0.5b-4) unstable; urgency=low + + * remove automatic generation of control from control.in (with cdbs + dependencies) as requested by ftpmaster to accept this NEW package + (see still opened bugs #311724 for more information) + + -- Vincent Danjean Fri, 3 Jun 2005 08:57:06 +0200 + +mercurial (0.5b-3) unstable; urgency=low + + * First official Debian release. (Closes: #308873: ITP: mercurial -- scalable + distributed SCM) + + -- Vincent Danjean Thu, 2 Jun 2005 08:55:53 +0200 + +mercurial (0.5b-2) unstable; urgency=low + + * package description improved from the mercurial ML + * Add Homepage: to long description (thanks Anibal Monsalve Salazar) + * Change Architecture from all to any as mercurial sources now have C files + to compile (thanks Anibal Monsalve Salazar) + * Update copyright (thanks Anibal Monsalve Salazar) + * Add rcs and tkdiff to Recommands as hgmerge use it (only recommands and + not depends because if the user set HGMERGE to kdiff3, he does not need + them) + * use hgmerge if HGMERGE is not set (patch submitted upstream) + + -- Vincent Danjean Wed, 1 Jun 2005 11:35:20 +0200 + +mercurial (0.5b-1) unstable; urgency=low + + * New upstream release + + -- Vincent Danjean Tue, 31 May 2005 00:00:29 +0200 + +mercurial (0.5-1) unstable; urgency=low + + * New upstream release + + -- Vincent Danjean Sun, 29 May 2005 21:36:55 +0200 + +mercurial (0.4f-1) unstable; urgency=low + + * New upstream release + * english improved in description (thanks Jay Berkenbilt ) + + -- Vincent Danjean Sat, 14 May 2005 00:55:40 +0200 + +mercurial (0.4e-3) unstable; urgency=low + + * package description improved (thanks Bas Zoetekouw ) + + -- Vincent Danjean Fri, 13 May 2005 13:46:44 +0200 + +mercurial (0.4e-2) unstable; urgency=low + + * update description + + -- Vincent Danjean Thu, 12 May 2005 23:32:43 +0200 + +mercurial (0.4e-1) unstable; urgency=low + + * New upstream release + + -- Vincent Danjean Thu, 12 May 2005 23:13:54 +0200 + +mercurial (0.4b-2) unstable; urgency=low + + * add debian watch file + * add depend on tkdiff + * correct some lintian warnings + + -- Vincent Danjean Fri, 29 Apr 2005 12:59:33 +0200 + +mercurial (0.4b-1) unstable; urgency=low + + * Initial Release. + + -- Vincent Danjean Fri, 29 Apr 2005 08:54:25 +0200 + --- mercurial-1.3.1.orig/debian/patches/series +++ mercurial-1.3.1/debian/patches/series @@ -0,0 +1,9 @@ +for_upstream__force_C_locale.patch +deb_specific__mergetools +proposed_upstream__dont-install-i18n +deb_specific__install-templates-separately +proposed_upstream__python-module-not-script.patch +deb_specific__use_sensible-editor.patch +deb_specific__hgk.py.patch +deb_specific__optional-dependencies +proposed_upstream__correct-zeroconf-doc --- mercurial-1.3.1.orig/debian/patches/proposed_upstream__correct-zeroconf-doc +++ mercurial-1.3.1/debian/patches/proposed_upstream__correct-zeroconf-doc @@ -0,0 +1,27 @@ +Correct the documentation for the zeroconf extension. + +diff -r 151f1e65ad7b hgext/zeroconf/__init__.py +--- a/hgext/zeroconf/__init__.py ++++ b/hgext/zeroconf/__init__.py +@@ -7,9 +7,9 @@ + + '''discover and advertise repositories on the local network + +-Zeroconf enabled repositories will be announced in a network without +-the need to configure a server or a service. They can be discovered +-without knowing their actual IP address. ++The zeroconf extension will advertise "hg serve" instances over DNS-SD so ++that they can be discovered using the "hg paths" command without knowing ++the server's address. + + To allow other people to discover your repository using run "hg serve" + in your repository. +@@ -17,7 +17,7 @@ + $ cd test + $ hg serve + +-You can discover zeroconf enabled repositories by running "hg paths". ++You can discover Zeroconf-enabled repositories by running "hg paths". + + $ hg paths + zc-test = http://example.com:8000/test --- mercurial-1.3.1.orig/debian/patches/deb_specific__hgk.py.patch +++ mercurial-1.3.1/debian/patches/deb_specific__hgk.py.patch @@ -0,0 +1,15 @@ +Set default hgk path for hgk outside bin. + +Index: mercurial-1.1.2/hgext/hgk.py +=================================================================== +--- mercurial-1.1.2.orig/hgext/hgk.py ++++ mercurial-1.1.2/hgext/hgk.py +@@ -318,7 +318,7 @@ + "start interactive history viewer" + os.chdir(repo.root) + optstr = ' '.join(['--%s %s' % (k, v) for k, v in opts.iteritems() if v]) +- cmd = ui.config("hgk", "path", "hgk") + " %s %s" % (optstr, " ".join(etc)) ++ cmd = ui.config("hgk", "path", "/usr/share/mercurial/hgk") + " %s %s" % (optstr, " ".join(etc)) + ui.debug(_("running %s\n") % cmd) + util.system(cmd) + --- mercurial-1.3.1.orig/debian/patches/proposed_upstream__python-module-not-script.patch +++ mercurial-1.3.1/debian/patches/proposed_upstream__python-module-not-script.patch @@ -0,0 +1,21 @@ +Remove shebang line from non-executable Python modules. + +Index: mercurial-git/mercurial/lsprof.py +=================================================================== +--- mercurial-git.orig/mercurial/lsprof.py 2008-04-06 20:12:23.000000000 +0200 ++++ mercurial-git/mercurial/lsprof.py 2008-04-06 20:15:46.000000000 +0200 +@@ -1,5 +1,3 @@ +-#! /usr/bin/env python +- + import sys + from _lsprof import Profiler, profiler_entry + +Index: mercurial-git/mercurial/simplemerge.py +=================================================================== +--- mercurial-git.orig/mercurial/simplemerge.py 2008-04-06 20:12:00.000000000 +0200 ++++ mercurial-git/mercurial/simplemerge.py 2008-04-06 20:12:02.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # Copyright (C) 2004, 2005 Canonical Ltd + # + # This program is free software; you can redistribute it and/or modify --- mercurial-1.3.1.orig/debian/patches/for_upstream__force_C_locale.patch +++ mercurial-1.3.1/debian/patches/for_upstream__force_C_locale.patch @@ -0,0 +1,12 @@ +Force C local when generating the documentation +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -17,7 +17,7 @@ + touch hg.1.txt + + hg.1.gendoc.txt: ../mercurial/commands.py ../mercurial/help.py +- ${PYTHON} gendoc.py > $@ ++ env LC_ALL=C ${PYTHON} gendoc.py > $@ + + %: %.xml + xmlto man $*.xml && \ --- mercurial-1.3.1.orig/debian/patches/deb_specific__use_sensible-editor.patch +++ mercurial-1.3.1/debian/patches/deb_specific__use_sensible-editor.patch @@ -0,0 +1,86 @@ +Use sensible-editor as default instead of vi. + +diff -r 84488c99c405 doc/hgrc.5.txt +--- a/doc/hgrc.5.txt ++++ b/doc/hgrc.5.txt +@@ -715,7 +715,8 @@ + debug;; + Print debugging information. True or False. Default is False. + editor;; +- The editor to use during a commit. Default is `$EDITOR` or "vi". ++ The editor to use during a commit. Default is `$EDITOR` or ++ "sensible-editor". + fallbackencoding;; + Encoding to try if it's not possible to decode the changelog using + UTF-8. Default is ISO-8859-1. +diff -r 84488c99c405 doc/ja/hg.1.ja.txt +--- a/doc/ja/hg.1.ja.txt ++++ b/doc/ja/hg.1.ja.txt +@@ -813,7 +813,7 @@ + EDITOR:: + これは hgmerge スクリプト中で使われるエディタの名前です。もし + HGEDITOR が設定されていなければ、コミット時のメッセージに使わ +- れます。デフォルトは 'vi' です。 ++ れます。デフォルトは 'sensible-editor' です。 + + PYTHONPATH:: + これはインポートされるモジュールを見つけるために Python によっ +diff -r 84488c99c405 doc/ja/hgrc.5.ja.txt +--- a/doc/ja/hgrc.5.ja.txt ++++ b/doc/ja/hgrc.5.ja.txt +@@ -119,7 +119,7 @@ + では False です。 + editor;; + コミット中に使用するエディタです。デフォルトは $EDITOR か +- "vi" です。 ++ "sensible-editor" です。 + interactive;; + ユーザに対してプロンプトを出すようにします。True か False を取 + ります。デフォルトでは True です。 +diff -r 84488c99c405 hgeditor +--- a/hgeditor ++++ b/hgeditor +@@ -7,7 +7,7 @@ + # only for Mercurial, modify this: + case "${EDITOR}" in + "") +- EDITOR="vi" ++ EDITOR="sensible-editor" + ;; + emacs) + EDITOR="$EDITOR -nw" +diff -r 84488c99c405 mercurial/commands.py +--- a/mercurial/commands.py ++++ b/mercurial/commands.py +@@ -1005,8 +1005,8 @@ + editor = ui.geteditor() + cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0]) + if not cmdpath: +- if editor == 'vi': +- ui.write(_(" No commit editor set and can't find vi in PATH\n")) ++ if editor == 'sensible-editor': ++ ui.write(_(" No commit editor set and can't find sensible-editor in PATH\n")) + ui.write(_(" (specify a commit editor in your .hgrc file)\n")) + else: + ui.write(_(" Can't find editor '%s' in PATH\n") % editor) +diff -r 84488c99c405 mercurial/help.py +--- a/mercurial/help.py ++++ b/mercurial/help.py +@@ -252,7 +252,7 @@ + editor it uses is determined by looking at the environment + variables HGEDITOR, VISUAL and EDITOR, in that order. The first + non-empty one is chosen. If all of them are empty, the editor +- defaults to 'vi'. ++ defaults to 'sensible-editor'. + + PYTHONPATH:: + This is used by Python to find imported modules and may need to be +diff -r 84488c99c405 mercurial/ui.py +--- a/mercurial/ui.py ++++ b/mercurial/ui.py +@@ -343,4 +343,4 @@ + return (os.environ.get("HGEDITOR") or + self.config("ui", "editor") or + os.environ.get("VISUAL") or +- os.environ.get("EDITOR", "vi")) ++ os.environ.get("EDITOR", "sensible-editor")) --- mercurial-1.3.1.orig/debian/patches/deb_specific__mergetools +++ mercurial-1.3.1/debian/patches/deb_specific__mergetools @@ -0,0 +1,43 @@ +Remove merge tools irrelevant to a Debian system and RCS merge and add vimdiff + +diff -r 196d40e7c885 contrib/mergetools.hgrc +--- a/contrib/mergetools.hgrc ++++ b/contrib/mergetools.hgrc +@@ -12,8 +12,8 @@ + gvimdiff.regname=path + gvimdiff.priority=-9 + +-merge.checkconflicts=True +-merge.priority=-10 ++vimdiff.args=$local $other $base ++vimdiff.priority=-10 + + gpyfm.gui=True + +@@ -38,26 +38,11 @@ + p4merge.gui=True + p4merge.priority=-8 + +-tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output +-tortoisemerge.regkey=Software\TortoiseSVN +-tortoisemerge.checkchanged=True +-tortoisemerge.gui=True +- + ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output + ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge + ecmerge.gui=True + +-filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge +-filemerge.args=-left $other -right $local -ancestor $base -merge $output +-filemerge.gui=True +- + beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo + beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 + beyondcompare3.regname=ExePath + beyondcompare3.gui=True +- +-winmerge.args=/e /u /dl local /dr other /wr $local $other $output +-winmerge.regkey=Software\Thingamahoochie\WinMerge +-winmerge.regname=Executable +-winmerge.checkchanged=True +-winmerge.gui=True --- mercurial-1.3.1.orig/debian/patches/deb_specific__optional-dependencies +++ mercurial-1.3.1/debian/patches/deb_specific__optional-dependencies @@ -0,0 +1,169 @@ +Suggest Debian packages for some optional dependencies. + +diff -r 06d10c5c850e hgext/bugzilla.py +--- a/hgext/bugzilla.py ++++ b/hgext/bugzilla.py +@@ -308,7 +308,8 @@ + global MySQLdb + MySQLdb = mysql + except ImportError, err: +- raise util.Abort(_('python mysql support not available: %s') % err) ++ raise util.Abort(_('python mysql support not available: %s') % err + ++ _(' (try installing the %s package)') % 'python-mysqldb') + + if node is None: + raise util.Abort(_('hook type %s does not pass a changeset id') % +diff -r 06d10c5c850e hgext/convert/bzr.py +--- a/hgext/convert/bzr.py ++++ b/hgext/convert/bzr.py +@@ -31,7 +31,8 @@ + # access bzrlib stuff + branch + except NameError: +- raise NoRepo('Bazaar modules could not be loaded') ++ raise NoRepo('Bazaar modules could not be loaded' + ++ _(' (try installing the %s package)') % 'bzr') + + if not os.path.exists(os.path.join(path, '.bzr')): + raise NoRepo('%s does not look like a Bazaar repo' % path) +diff -r 06d10c5c850e hgext/convert/common.py +--- a/hgext/convert/common.py ++++ b/hgext/convert/common.py +@@ -20,11 +20,12 @@ + + class MissingTool(Exception): pass + +-def checktool(exe, name=None, abort=True): ++def checktool(exe, name=None, abort=True, debname=None): + name = name or exe + if not util.find_exe(exe): + exc = abort and util.Abort or MissingTool +- raise exc(_('cannot find required "%s" tool') % name) ++ raise exc(_('cannot find required "%s" tool') % name + ++ (debname and _(' (try installing the %s package)') % debname or '')) + + class NoRepo(Exception): pass + +diff -r 06d10c5c850e hgext/convert/cvs.py +--- a/hgext/convert/cvs.py ++++ b/hgext/convert/cvs.py +@@ -16,7 +16,7 @@ + if not os.path.exists(cvs): + raise NoRepo("%s does not look like a CVS checkout" % path) + +- checktool('cvs') ++ checktool('cvs', debname='cvs') + self.cmd = ui.config('convert', 'cvsps', 'builtin') + cvspsexe = self.cmd.split(None, 1)[0] + self.builtin = cvspsexe == 'builtin' +diff -r 06d10c5c850e hgext/convert/darcs.py +--- a/hgext/convert/darcs.py ++++ b/hgext/convert/darcs.py +@@ -27,10 +27,11 @@ + if not os.path.exists(os.path.join(path, '_darcs')): + raise NoRepo("%s does not look like a darcs repo" % path) + +- checktool('darcs') ++ checktool('darcs', debname='darcs') + + if ElementTree is None: +- raise util.Abort(_("Python ElementTree module is not available")) ++ raise util.Abort(_("Python ElementTree module is not available") + ++ _(" (try installing the %s package)") % 'python-celementtree') + + if not os.path.exists(os.path.join(path, '_darcs', 'inventory')): + raise NoRepo("%s does not look like a darcs repo" % path) +diff -r 06d10c5c850e hgext/convert/git.py +--- a/hgext/convert/git.py ++++ b/hgext/convert/git.py +@@ -32,7 +32,7 @@ + if not os.path.exists(path + "/objects"): + raise NoRepo("%s does not look like a Git repo" % path) + +- checktool('git', 'git') ++ checktool('git', 'git', debname='git-core') + + self.path = path + +diff -r 06d10c5c850e hgext/convert/gnuarch.py +--- a/hgext/convert/gnuarch.py ++++ b/hgext/convert/gnuarch.py +@@ -33,7 +33,8 @@ + if util.find_exe('tla'): + self.execmd = 'tla' + else: +- raise util.Abort(_('cannot find a GNU Arch tool')) ++ raise util.Abort(_('cannot find a GNU Arch tool') + ++ _(' (try installing the %s package)') % 'tla') + + commandline.__init__(self, ui, self.execmd) + +diff -r 06d10c5c850e hgext/convert/monotone.py +--- a/hgext/convert/monotone.py ++++ b/hgext/convert/monotone.py +@@ -43,7 +43,7 @@ + if not os.path.exists(path): + raise norepo + +- checktool('mtn', abort=False) ++ checktool('mtn', abort=False, debname='monotone') + + # test if there are any revisions + self.rev = None +diff -r 06d10c5c850e hgext/convert/subversion.py +--- a/hgext/convert/subversion.py ++++ b/hgext/convert/subversion.py +@@ -34,6 +34,7 @@ + + from common import NoRepo, MissingTool, commit, encodeargs, decodeargs + from common import commandline, converter_source, converter_sink, mapfile ++from common import checktool + + try: + from svn.core import SubversionException, Pool +@@ -155,16 +156,19 @@ + try: + SubversionException + except NameError: +- raise MissingTool(_('Subversion python bindings could not be loaded')) ++ raise MissingTool(_('Subversion python bindings could not be loaded') + ++ _(' (try installing the %s package)') % 'python-subversion') + + try: + version = svn.core.SVN_VER_MAJOR, svn.core.SVN_VER_MINOR + if version < (1, 4): + raise MissingTool(_('Subversion python bindings %d.%d found, ' +- '1.4 or later required') % version) ++ '1.4 or later required') % version + ++ _(' (try upgrading the %s package)') % 'python-subversion') + except AttributeError: + raise MissingTool(_('Subversion python bindings are too old, 1.4 ' +- 'or later required')) ++ 'or later required') + ++ _(' (try upgrading the %s package)') % 'python-subversion') + + self.encoding = locale.getpreferredencoding() + self.lastrevs = {} +@@ -960,6 +964,9 @@ + return self.join('hg-authormap') + + def __init__(self, ui, path): ++ checktool('svn', debname='subversion') ++ checktool('svnadmin', debname='subversion') ++ + converter_sink.__init__(self, ui, path) + commandline.__init__(self, ui, 'svn') + self.delete = [] +diff -r 06d10c5c850e mercurial/hgweb/server.py +--- a/mercurial/hgweb/server.py ++++ b/mercurial/hgweb/server.py +@@ -259,7 +259,8 @@ + from OpenSSL import SSL + ctx = SSL.Context(SSL.SSLv23_METHOD) + except ImportError: +- raise util.Abort(_("SSL support is unavailable")) ++ raise util.Abort(_("SSL support is unavailable") + ++ _(" (try installing the %s package)") % 'python-openssl') + ctx.use_privatekey_file(ssl_cert) + ctx.use_certificate_file(ssl_cert) + sock = socket.socket(self.address_family, self.socket_type) --- mercurial-1.3.1.orig/debian/patches/deb_specific__install-templates-separately +++ mercurial-1.3.1/debian/patches/deb_specific__install-templates-separately @@ -0,0 +1,26 @@ +Support installation of templates handled by mercurial-common.install. + +diff -r b042642c1393 mercurial/templater.py +--- a/mercurial/templater.py ++++ b/mercurial/templater.py +@@ -9,7 +9,7 @@ + import re, sys, os + import util, config, templatefilters + +-path = ['templates', '../templates'] ++path = ['templates', '../templates', '/usr/share/mercurial/templates'] + stringify = templatefilters.stringify + + def parsestring(s, quoted=True): +diff -r b042642c1393 setup.py +--- a/setup.py ++++ b/setup.py +@@ -246,7 +246,7 @@ + packages.extend(['hgext.inotify', 'hgext.inotify.linux']) + + datafiles = [] +-for root in ('templates',): ++for root in (): + for dir, dirs, files in os.walk(root): + datafiles.append((os.path.join('mercurial', dir), + [os.path.join(dir, file_) for file_ in files])) --- mercurial-1.3.1.orig/debian/patches/proposed_upstream__dont-install-i18n +++ mercurial-1.3.1/debian/patches/proposed_upstream__dont-install-i18n @@ -0,0 +1,15 @@ +Don't install the i18n folder; it's pointless to do so since the compiled +translations are in the locale folder. + +diff -r 8c9d9d659637 setup.py +--- a/setup.py ++++ b/setup.py +@@ -222,7 +222,7 @@ + pass + + datafiles = [] +-for root in ('templates', 'i18n'): ++for root in ('templates',): + for dir, dirs, files in os.walk(root): + datafiles.append((os.path.join('mercurial', dir), + [os.path.join(dir, file_) for file_ in files]))