contrib/packaging/debian/control
author Pulkit Goyal <7895pulkit@gmail.com>
Mon, 14 Sep 2020 14:31:23 +0530
changeset 45582 b9d6ab6cdeb4
parent 43332 8fda98a68427
child 46572 c82d6363bc9e
permissions -rw-r--r--
configitems: add a new config option to control new filenode functionality This series is adding functionality where we can force create a new filenode for some files on a merge-commit. This is meant to represent an explicit choice made by user and hence distingusing the file in the merged commit with the file in parent by creating a new filenode instead of using the parent one. This introduces a experimental config option under which this functionality will be hidden. A new testcase is added in tests/test-merge-criss-cross.t to test the new functionality while making the option does not break other scenarios. Differential Revision: https://phab.mercurial-scm.org/D9026
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
26148
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
     1
Source: mercurial
24971
ab75baaf81d5 builddeb: new script for building a deb package
Augie Fackler <augie@google.com>
parents:
diff changeset
     2
Section: vcs
ab75baaf81d5 builddeb: new script for building a deb package
Augie Fackler <augie@google.com>
parents:
diff changeset
     3
Priority: optional
30864
dc22729b4ebd debian: update mailing list address
Anton Shestakov <av6@dwimlabs.net>
parents: 29091
diff changeset
     4
Maintainer: Mercurial Developers <mercurial-devel@mercurial-scm.org>
26148
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
     5
Build-Depends:
29047
9a98d0e5b07f debian: fix lintian warning about debhelper
Sean Farley <sean@farley.io>
parents: 28985
diff changeset
     6
 debhelper (>= 9),
26148
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
     7
 dh-python,
32130
387a76cac28e debian: add less as a build dependency
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents: 30864
diff changeset
     8
 less,
28985
d2b29c848fcd debian: add missing netbase dependency
Sean Farley <sean@farley.io>
parents: 28984
diff changeset
     9
 netbase,
43310
7574ccd87200 packaging: upgrade Debian packaging to build with Python 3
Denis Laxalde <denis@laxalde.org>
parents: 38051
diff changeset
    10
 python3-all,
7574ccd87200 packaging: upgrade Debian packaging to build with Python 3
Denis Laxalde <denis@laxalde.org>
parents: 38051
diff changeset
    11
 python3-all-dev,
7574ccd87200 packaging: upgrade Debian packaging to build with Python 3
Denis Laxalde <denis@laxalde.org>
parents: 38051
diff changeset
    12
 python3-docutils,
29048
f85de28eae32 debian: alphabetize build deps
Sean Farley <sean@farley.io>
parents: 29047
diff changeset
    13
 unzip,
f85de28eae32 debian: alphabetize build deps
Sean Farley <sean@farley.io>
parents: 29047
diff changeset
    14
 zip
26148
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
    15
Standards-Version: 3.9.4
43310
7574ccd87200 packaging: upgrade Debian packaging to build with Python 3
Denis Laxalde <denis@laxalde.org>
parents: 38051
diff changeset
    16
X-Python3-Version: >= 3.5
26148
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
    17
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
    18
Package: mercurial
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
    19
Depends:
43320
7b638d25b8e4 packaging: ship only a single binary Debian package
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 43311
diff changeset
    20
 sensible-utils,
26148
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
    21
 ${shlibs:Depends},
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
    22
 ${misc:Depends},
43310
7574ccd87200 packaging: upgrade Debian packaging to build with Python 3
Denis Laxalde <denis@laxalde.org>
parents: 38051
diff changeset
    23
 ${python3:Depends},
43320
7b638d25b8e4 packaging: ship only a single binary Debian package
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 43311
diff changeset
    24
Recommends: ca-certificates
7b638d25b8e4 packaging: ship only a single binary Debian package
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 43311
diff changeset
    25
Suggests: wish
43332
8fda98a68427 packaging: remove version info from Breaks+Replaces in Debian package
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 43320
diff changeset
    26
Replaces: mercurial-common
8fda98a68427 packaging: remove version info from Breaks+Replaces in Debian package
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 43320
diff changeset
    27
Breaks: mercurial-common
26148
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
    28
Architecture: any
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
    29
Description: fast, easy to use, distributed revision control tool.
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
    30
 Mercurial is a fast, lightweight Source Control Management system designed
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
    31
 for efficient handling of very large distributed projects.
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
    32
 .
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
    33
 Its features include:
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
    34
  * O(1) delta-compressed file storage and retrieval scheme
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
    35
  * Complete cross-indexing of files and changesets for efficient exploration
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
    36
    of project history
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
    37
  * Robust SHA1-based integrity checking and append-only storage model
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
    38
  * Decentralized development model with arbitrary merging between trees
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
    39
  * Easy-to-use command-line interface
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
    40
  * Integrated stand-alone web interface
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 24971
diff changeset
    41
  * Small Python codebase