diff options
| author | Juergen Daubert <jue@jue.li> | 2020-11-19 15:19:09 +0000 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2020-11-19 15:19:09 +0000 |
| commit | 071aa58a46615ab3725a49ee987893d54205acd8 (patch) | |
| tree | 9892ebb179d9c867eb73b48a4de065e6ef3a9119 /mercurial | |
| parent | 71e00d88efd371016987ec327ff80f68a99ca276 (diff) | |
| parent | 0df5e07a9f13025389f3a614628c50b3c2569f2b (diff) | |
| download | contrib-071aa58a46615ab3725a49ee987893d54205acd8.tar.gz contrib-071aa58a46615ab3725a49ee987893d54205acd8.tar.xz | |
Merge branch '3.5' into 3.6
Conflicts:
highlight/.signature
mercurial/.footprint
mercurial/.signature
picard/.footprint
picard/.signature
picard/Pkgfile
python3-gpgme/.footprint
python3-gpgme/.signature
youtube-dl/.footprint
youtube-dl/.signature
Diffstat (limited to 'mercurial')
| -rw-r--r-- | mercurial/.footprint | 41 | ||||
| -rw-r--r-- | mercurial/.signature | 4 |
2 files changed, 42 insertions, 3 deletions
diff --git a/mercurial/.footprint b/mercurial/.footprint index 0a1f9fa11..9e96aeaeb 100644 --- a/mercurial/.footprint +++ b/mercurial/.footprint @@ -345,7 +345,7 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/hgext3rd/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/hgext3rd/__init__.py drwxr-xr-x root/root usr/lib/python3.9/site-packages/hgext3rd/__pycache__/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/hgext3rd/__pycache__/__init__.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial-5.5.2-py3.9.egg-info +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial-5.6-py3.9.egg-info drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__init__.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__modulepolicy__.py @@ -367,6 +367,7 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/color.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/commands.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/commandserver.cpython-39.pyc +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/commit.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/config.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/configitems.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/context.cpython-39.pyc @@ -395,6 +396,7 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/filesetlang.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/formatter.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/graphmod.cpython-39.pyc +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/grep.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/hbisect.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/help.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/hg.cpython-39.pyc @@ -442,6 +444,7 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/repair.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/repocache.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/repoview.cpython-39.pyc +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/requirements.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/revlog.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/revset.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/__pycache__/revsetlang.cpython-39.pyc @@ -534,6 +537,7 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/cffi/__pycache__/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/color.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/commands.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/commandserver.py +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/commit.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/config.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/configitems.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/context.py @@ -568,6 +572,7 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/defaultrc/__pycac -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/filesetlang.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/formatter.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/graphmod.py +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/grep.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/hbisect.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/help.py drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/helptext/ @@ -713,6 +718,7 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/pure/__pycache__/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/repair.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/repocache.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/repoview.py +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/requirements.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/revlog.py drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/revlogutils/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/revlogutils/__init__.py @@ -758,7 +764,13 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/revlogutils/__pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templatekw.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templater.py drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/__init__.py (EMPTY) +drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/__pycache__/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/__pycache__/__init__.cpython-39.pyc drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/atom/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/atom/__init__.py (EMPTY) +drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/atom/__pycache__/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/atom/__pycache__/__init__.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/atom/bookmarkentry.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/atom/bookmarks.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/atom/branchentry.tmpl @@ -772,9 +784,15 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/atom/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/atom/tagentry.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/atom/tags.tmpl drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/coal/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/coal/__init__.py (EMPTY) +drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/coal/__pycache__/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/coal/__pycache__/__init__.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/coal/header.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/coal/map drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/gitweb/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/gitweb/__init__.py (EMPTY) +drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/gitweb/__pycache__/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/gitweb/__pycache__/__init__.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/gitweb/bookmarks.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/gitweb/branches.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/gitweb/changelog.tmpl @@ -801,6 +819,9 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/gitweb/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/gitweb/summary.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/gitweb/tags.tmpl drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/json/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/json/__init__.py (EMPTY) +drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/json/__pycache__/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/json/__pycache__/__init__.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/json/changelist.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/json/graph.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/json/map @@ -813,6 +834,9 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/json/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/map-cmdline.status -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/map-cmdline.xml drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/monoblue/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/monoblue/__init__.py (EMPTY) +drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/monoblue/__pycache__/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/monoblue/__pycache__/__init__.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/monoblue/bookmarks.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/monoblue/branches.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/monoblue/changelog.tmpl @@ -839,6 +863,9 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/monoblu -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/monoblue/summary.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/monoblue/tags.tmpl drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/paper/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/paper/__init__.py (EMPTY) +drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/paper/__pycache__/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/paper/__pycache__/__init__.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/paper/bookmarks.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/paper/branches.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/paper/changeset.tmpl @@ -865,6 +892,9 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/paper/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/paper/shortlogentry.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/paper/tags.tmpl drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/raw/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/raw/__init__.py (EMPTY) +drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/raw/__pycache__/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/raw/__pycache__/__init__.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/raw/changelog.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/raw/changeset.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/raw/error.tmpl @@ -880,6 +910,9 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/raw/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/raw/notfound.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/raw/search.tmpl drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/rss/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/rss/__init__.py (EMPTY) +drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/rss/__pycache__/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/rss/__pycache__/__init__.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/rss/bookmarkentry.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/rss/bookmarks.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/rss/branchentry.tmpl @@ -894,6 +927,9 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/rss/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/rss/tagentry.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/rss/tags.tmpl drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/spartan/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/spartan/__init__.py (EMPTY) +drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/spartan/__pycache__/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/spartan/__pycache__/__init__.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/spartan/branches.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/spartan/changelog.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/spartan/changelogentry.tmpl @@ -917,6 +953,9 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/spartan -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/spartan/shortlogentry.tmpl -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/spartan/tags.tmpl drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/static/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/static/__init__.py (EMPTY) +drwxr-xr-x root/root usr/lib/python3.9/site-packages/mercurial/templates/static/__pycache__/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/static/__pycache__/__init__.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/static/background.png -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/static/coal-file.png -rw-r--r-- root/root usr/lib/python3.9/site-packages/mercurial/templates/static/coal-folder.png diff --git a/mercurial/.signature b/mercurial/.signature index b44dac1d3..79ce5717e 100644 --- a/mercurial/.signature +++ b/mercurial/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3yRpPEgh9GTS4zhRgmFiLkDc09Nv3B3QASy5kz3MzUbxSUvsUy/bgOLaDBF4Nz+d6NJFiS0SZnKdVmhM44VhUAo= +RWSagIOpLGJF3w6LqkEWw8ybG+XgVkEkU+ehHLEWIjTywq+Zulky9APhT43iET4gyK4+hWoWqnuauzQ2I1jdYAkiSUKgkZ2v3Qc= SHA256 (Pkgfile) = 0d1b763476a4a100892509695ecf6e29e3c8399fc6c88f926da45c7380d01909 -SHA256 (.footprint) = 6df8b43b759910c21d657639fa4de12b907b9c34b807084e28fd25c7e852b740 +SHA256 (.footprint) = 8a24583a64f06c434c45f39749f0aaadbcb00712465ac87812cff78d657cbf65 SHA256 (mercurial-5.6.tar.gz) = dfa7b3b5082783763710504f242ec487a5d801dc4bcd701cdad4b6ffc1f062c2 |