Hi,
these are the diff to update mercurial and tortoisehg to latest releases.
Ok?
Cheers,
Remi.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.63
diff -u -p -u -p -r1.63 Makefile
--- Makefile 12 Aug 2015 06:13:56 -0000 1.63
+++ Makefile 9 Sep 2015 05:52:54 -0000
@@ -3,8 +3,7 @@
COMMENT-main = fast, lightweight source control management
COMMENT-x11 = graphical tooling for mercurial
-MODPY_EGG_VERSION = 3.2.3
-REVISION-main = 0
+MODPY_EGG_VERSION = 3.5.1
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
@@ -36,7 +35,7 @@ FILES = hgeditor hgweb.cgi
CONTRIBFILES = bash_completion mercurial.el \
tcsh_completion zsh_completion \
- mergetools.hgrc mq.el
+ mq.el
CONTRIBDIRS = hgsh vim
SCRIPTS = hg-ssh hgk \
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.43
diff -u -p -u -p -r1.43 distinfo
--- distinfo 21 Dec 2014 20:44:08 -0000 1.43
+++ distinfo 9 Sep 2015 05:52:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (mercurial-3.2.3.tar.gz) = xDaTIOJ214qtobWTbpbHu7u4FUz7pyXvTodX3O3q8e8=
-SIZE (mercurial-3.2.3.tar.gz) = 4078011
+SHA256 (mercurial-3.5.1.tar.gz) = mX2kXaMD45lnjFvM1745sPq/KcfgL9PIdRwv+IyKJZ0=
+SIZE (mercurial-3.5.1.tar.gz) = 4414284
Index: patches/patch-mercurial_sshpeer_py
===================================================================
RCS file: patches/patch-mercurial_sshpeer_py
diff -N patches/patch-mercurial_sshpeer_py
--- patches/patch-mercurial_sshpeer_py 1 Jun 2015 13:40:56 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-mercurial_sshpeer_py,v 1.1 2015/06/01 13:40:56 jasper Exp $
-
-Security fix for CVE-2014-9462
-https://selenic.com/hg/rev/e3f30068d2eb
-http://chargen.matasano.com/chargen/2015/3/17/this-new-vulnerability-mercurial-command-injection-cve-2014-9462.html
-
---- mercurial/sshpeer.py.orig Thu Dec 18 21:59:22 2014
-+++ mercurial/sshpeer.py Mon Jun 1 14:11:37 2015
-@@ -20,6 +20,8 @@ class remotelock(object):
- self.release()
-
- def _serverquote(s):
-+ if not s:
-+ return s
- '''quote a string for the remote shell ... which we assume is sh'''
- if re.match('[a-zA-Z0-9@%_+=:,./-]*$', s):
- return s
-@@ -45,7 +47,10 @@ class sshpeer(wireproto.wirepeer):
- sshcmd = self.ui.config("ui", "ssh", "ssh")
- remotecmd = self.ui.config("ui", "remotecmd", "hg")
-
-- args = util.sshargs(sshcmd, self.host, self.user, self.port)
-+ args = util.sshargs(sshcmd,
-+ _serverquote(self.host),
-+ _serverquote(self.user),
-+ _serverquote(self.port))
-
- if create:
- cmd = '%s %s %s' % (sshcmd, args,
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST-main
--- pkg/PLIST-main 21 Dec 2014 20:44:08 -0000 1.4
+++ pkg/PLIST-main 9 Sep 2015 05:52:54 -0000
@@ -10,6 +10,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/hgext/blackbox.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.py
lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/censor.py
+lib/python${MODPY_VERSION}/site-packages/hgext/censor.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/children.py
lib/python${MODPY_VERSION}/site-packages/hgext/children.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/churn.py
@@ -168,10 +170,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/context.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/copies.py
lib/python${MODPY_VERSION}/site-packages/mercurial/copies.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/crecord.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/crecord.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/dagparser.py
lib/python${MODPY_VERSION}/site-packages/mercurial/dagparser.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/dagutil.py
lib/python${MODPY_VERSION}/site-packages/mercurial/dagutil.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/default.d/
+lib/python${MODPY_VERSION}/site-packages/mercurial/default.d/mergetools.rc
lib/python${MODPY_VERSION}/site-packages/mercurial/demandimport.py
lib/python${MODPY_VERSION}/site-packages/mercurial/demandimport.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/diffhelpers.so
@@ -226,6 +232,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/help/phases.txt
lib/python${MODPY_VERSION}/site-packages/mercurial/help/revisions.txt
lib/python${MODPY_VERSION}/site-packages/mercurial/help/revsets.txt
+lib/python${MODPY_VERSION}/site-packages/mercurial/help/scripting.txt
lib/python${MODPY_VERSION}/site-packages/mercurial/help/subrepos.txt
lib/python${MODPY_VERSION}/site-packages/mercurial/help/templates.txt
lib/python${MODPY_VERSION}/site-packages/mercurial/help/urls.txt
@@ -267,8 +274,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/httppeer.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/i18n.py
lib/python${MODPY_VERSION}/site-packages/mercurial/i18n.pyc
-lib/python${MODPY_VERSION}/site-packages/mercurial/ignore.py
-lib/python${MODPY_VERSION}/site-packages/mercurial/ignore.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/keepalive.py
lib/python${MODPY_VERSION}/site-packages/mercurial/keepalive.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/locale/
@@ -329,6 +334,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/minirst.py
lib/python${MODPY_VERSION}/site-packages/mercurial/minirst.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/mpatch.so
+lib/python${MODPY_VERSION}/site-packages/mercurial/namespaces.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/namespaces.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/node.py
lib/python${MODPY_VERSION}/site-packages/mercurial/node.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/obsolete.py
@@ -347,6 +354,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/phases.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/posix.py
lib/python${MODPY_VERSION}/site-packages/mercurial/posix.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/progress.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/progress.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/pushkey.py
lib/python${MODPY_VERSION}/site-packages/mercurial/pushkey.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/pvec.py
@@ -439,11 +448,15 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/gitweb/shortlog.tmpl
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/gitweb/summary.tmpl
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/gitweb/tags.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/json/
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/json/changelist.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/json/map
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/map-cmdline.bisect
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/map-cmdline.changelog
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/map-cmdline.compact
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/map-cmdline.default
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/map-cmdline.phases
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/map-cmdline.status
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/map-cmdline.xml
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/monoblue/
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/monoblue/bookmarks.tmpl
@@ -595,7 +608,7 @@ share/mercurial/hgsh/Makefile
share/mercurial/hgsh/hgsh.c
share/mercurial/hgweb.cgi
share/mercurial/mercurial.el
-share/mercurial/mergetools.hgrc
+share/mercurial/mergetools.rc
share/mercurial/mq.el
share/mercurial/simplemerge
share/mercurial/tcsh_completion
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/tortoisehg/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- Makefile 1 Mar 2015 14:07:34 -0000 1.17
+++ Makefile 9 Sep 2015 05:52:36 -0000
@@ -2,7 +2,7 @@
COMMENT = series of applications for Mercurial
-MODPY_EGG_VERSION = 3.3
+MODPY_EGG_VERSION = 3.5
DISTNAME = tortoisehg-${MODPY_EGG_VERSION}
CATEGORIES = devel
@@ -23,7 +23,7 @@ BUILD_DEPENDS = x11/py-qt4 \
RUN_DEPENDS = ${BUILD_DEPENDS} \
editors/py-qscintilla \
- devel/mercurial>=3.2,<3.4 \
+ devel/mercurial>=3.4,<3.6 \
devel/py-iniparse
NO_TEST = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/tortoisehg/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- distinfo 1 Mar 2015 14:07:34 -0000 1.14
+++ distinfo 9 Sep 2015 05:52:36 -0000
@@ -1,2 +1,2 @@
-SHA256 (tortoisehg-3.3.tar.gz) = CHrwKLtUohYqMaLdgaFKPx8eEurd5CiQpImrEfcgHNs=
-SIZE (tortoisehg-3.3.tar.gz) = 8210712
+SHA256 (tortoisehg-3.5.tar.gz) = sHIYCthRxsBLADp17plabhpsvn16JuhjmP0LMvVRlN4=
+SIZE (tortoisehg-3.5.tar.gz) = 7395688
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/devel/tortoisehg/patches/patch-setup_py,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-setup_py
--- patches/patch-setup_py 8 Sep 2012 08:03:03 -0000 1.1
+++ patches/patch-setup_py 9 Sep 2015 05:52:36 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-setup_py,v 1.1 2012/09/08 08:03:03 rpointel Exp $
---- setup.py.orig Wed Sep 5 17:36:36 2012
-+++ setup.py Thu Sep 6 09:01:24 2012
-@@ -421,7 +421,7 @@ def setup_posix():
- _data_files += [(os.path.join('share', root),
- [os.path.join(root, file_) for file_ in files])
- for root, dirs, files in os.walk('locale')]
-- _data_files += [('/usr/share/nautilus-python/extensions/',
+--- setup.py.orig Thu Aug 6 03:30:23 2015
++++ setup.py Wed Sep 9 07:25:00 2015
+@@ -569,7 +569,7 @@ def setup_posix():
+ [os.path.join(root, f) for f in files]))
+ _data_files.extend((os.path.join('share', modir), [mofile])
+ for pofile, modir, mofile in _walklocales())
+- _data_files += [('share/nautilus-python/extensions',
+ _data_files += [('lib/nautilus/extensions-3.0',
['contrib/nautilus-thg.py'])]
- # Create a config.py. Distributions will need to supply their own
+ return _scripts, _packages, _data_files, _extra
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/tortoisehg/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 PLIST
--- pkg/PLIST 1 Mar 2015 14:07:35 -0000 1.11
+++ pkg/PLIST 9 Sep 2015 05:52:36 -0000
@@ -80,8 +80,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/htmldelegate.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/htmlui.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/htmlui.pyc
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/icons_rc.py
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/icons_rc.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/infobar.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/infobar.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/lexers.py
@@ -253,8 +251,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/wconfig.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/win32ill.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/win32ill.pyc
-share/tortoisehg/
-share/tortoisehg/COPYING.txt
share/locale/ar/LC_MESSAGES/tortoisehg.mo
share/locale/ca/LC_MESSAGES/tortoisehg.mo
share/locale/cs/LC_MESSAGES/tortoisehg.mo
@@ -295,12 +291,18 @@ share/pixmaps/
share/pixmaps/tortoisehg/
share/pixmaps/tortoisehg/icons/
share/pixmaps/tortoisehg/icons/16x16/
+share/pixmaps/tortoisehg/icons/16x16/actions/
+share/pixmaps/tortoisehg/icons/16x16/actions/hg-add.png
+share/pixmaps/tortoisehg/icons/16x16/actions/thg-repoconfig.png
+share/pixmaps/tortoisehg/icons/16x16/actions/thg-userconfig.png
share/pixmaps/tortoisehg/icons/16x16/apps/
share/pixmaps/tortoisehg/icons/16x16/apps/gnupg.png
share/pixmaps/tortoisehg/icons/16x16/apps/kiln.png
share/pixmaps/tortoisehg/icons/16x16/apps/reviewboard.png
share/pixmaps/tortoisehg/icons/16x16/mimetypes/
share/pixmaps/tortoisehg/icons/16x16/mimetypes/text-x-generic.png
+share/pixmaps/tortoisehg/icons/16x16/status/
+share/pixmaps/tortoisehg/icons/16x16/status/hg-removed.png
share/pixmaps/tortoisehg/icons/22x22/
share/pixmaps/tortoisehg/icons/22x22/actions/
share/pixmaps/tortoisehg/icons/22x22/actions/window-close.png
@@ -312,18 +314,18 @@ share/pixmaps/tortoisehg/icons/24x24/act
share/pixmaps/tortoisehg/icons/24x24/actions/hg-push.png
share/pixmaps/tortoisehg/icons/32x32/
share/pixmaps/tortoisehg/icons/32x32/actions/
-share/pixmaps/tortoisehg/icons/32x32/actions/hg-bookmarks.png
+share/pixmaps/tortoisehg/icons/32x32/actions/hg-add.png
+share/pixmaps/tortoisehg/icons/32x32/actions/hg-branch.png
share/pixmaps/tortoisehg/icons/32x32/actions/hg-sign.png
+share/pixmaps/tortoisehg/icons/32x32/actions/thg-repoconfig.png
+share/pixmaps/tortoisehg/icons/32x32/actions/thg-userconfig.png
+share/pixmaps/tortoisehg/icons/32x32/status/
+share/pixmaps/tortoisehg/icons/32x32/status/hg-removed.png
share/pixmaps/tortoisehg/icons/README.txt
share/pixmaps/tortoisehg/icons/TortoiseMerge.ico
-share/pixmaps/tortoisehg/icons/branch.ico
share/pixmaps/tortoisehg/icons/detect_rename.ico
share/pixmaps/tortoisehg/icons/expander-close.png
share/pixmaps/tortoisehg/icons/expander-open.png
-share/pixmaps/tortoisehg/icons/fallback.svg
-share/pixmaps/tortoisehg/icons/fileadd.ico
-share/pixmaps/tortoisehg/icons/filedelete.ico
-share/pixmaps/tortoisehg/icons/filemodify.ico
share/pixmaps/tortoisehg/icons/general.ico
share/pixmaps/tortoisehg/icons/hg.ico
share/pixmaps/tortoisehg/icons/hgB.ico
@@ -336,16 +338,9 @@ share/pixmaps/tortoisehg/icons/menuclone
share/pixmaps/tortoisehg/icons/menucommit.ico
share/pixmaps/tortoisehg/icons/menucreaterepos.ico
share/pixmaps/tortoisehg/icons/menudelete.ico
-share/pixmaps/tortoisehg/icons/menudiff.ico
-share/pixmaps/tortoisehg/icons/menuhelp.ico
-share/pixmaps/tortoisehg/icons/menuimport.ico
share/pixmaps/tortoisehg/icons/menulog.ico
-share/pixmaps/tortoisehg/icons/menumerge.ico
-share/pixmaps/tortoisehg/icons/menupatch.ico
share/pixmaps/tortoisehg/icons/menurepobrowse.ico
share/pixmaps/tortoisehg/icons/menurevert.ico
-share/pixmaps/tortoisehg/icons/menurevisiongraph.ico
-share/pixmaps/tortoisehg/icons/menusettings.ico
share/pixmaps/tortoisehg/icons/menushowchanged.ico
share/pixmaps/tortoisehg/icons/menusynch.ico
share/pixmaps/tortoisehg/icons/proxy.ico
@@ -374,6 +369,7 @@ share/pixmaps/tortoisehg/icons/scalable/
share/pixmaps/tortoisehg/icons/scalable/actions/hg-bisect-bad-good.svg
share/pixmaps/tortoisehg/icons/scalable/actions/hg-bisect-good-bad.svg
share/pixmaps/tortoisehg/icons/scalable/actions/hg-bisect.svg
+share/pixmaps/tortoisehg/icons/scalable/actions/hg-bookmarks.svg
share/pixmaps/tortoisehg/icons/scalable/actions/hg-bundle.svg
share/pixmaps/tortoisehg/icons/scalable/actions/hg-clone.svg
share/pixmaps/tortoisehg/icons/scalable/actions/hg-commit.svg
@@ -404,7 +400,10 @@ share/pixmaps/tortoisehg/icons/scalable/
share/pixmaps/tortoisehg/icons/scalable/actions/hg-remove.svg
share/pixmaps/tortoisehg/icons/scalable/actions/hg-rename.svg
share/pixmaps/tortoisehg/icons/scalable/actions/hg-revert.svg
+share/pixmaps/tortoisehg/icons/scalable/actions/hg-serve.svg
+share/pixmaps/tortoisehg/icons/scalable/actions/hg-shelve.svg
share/pixmaps/tortoisehg/icons/scalable/actions/hg-status.svg
+share/pixmaps/tortoisehg/icons/scalable/actions/hg-strip.svg
share/pixmaps/tortoisehg/icons/scalable/actions/hg-tag.svg
share/pixmaps/tortoisehg/icons/scalable/actions/hg-transplant.svg
share/pixmaps/tortoisehg/icons/scalable/actions/hg-unbundle.svg
@@ -422,6 +421,8 @@ share/pixmaps/tortoisehg/icons/scalable/
share/pixmaps/tortoisehg/icons/scalable/actions/tasktab-refresh.svg
share/pixmaps/tortoisehg/icons/scalable/actions/thg-add-subrepo.svg
share/pixmaps/tortoisehg/icons/scalable/actions/thg-console.svg
+share/pixmaps/tortoisehg/icons/scalable/actions/thg-guess.svg
+share/pixmaps/tortoisehg/icons/scalable/actions/thg-ignore.svg
share/pixmaps/tortoisehg/icons/scalable/actions/thg-log-load-all.svg
share/pixmaps/tortoisehg/icons/scalable/actions/thg-mq.svg
share/pixmaps/tortoisehg/icons/scalable/actions/thg-password.svg
@@ -437,6 +438,7 @@ share/pixmaps/tortoisehg/icons/scalable/
share/pixmaps/tortoisehg/icons/scalable/actions/thg-shelve-move-right-all.svg
share/pixmaps/tortoisehg/icons/scalable/actions/thg-shelve-move-right-chunks.svg
share/pixmaps/tortoisehg/icons/scalable/actions/thg-shelve-move-right-file.svg
+share/pixmaps/tortoisehg/icons/scalable/actions/thg-sync-bookmarks.svg
share/pixmaps/tortoisehg/icons/scalable/actions/thg-sync.svg
share/pixmaps/tortoisehg/icons/scalable/actions/view-annotate.svg
share/pixmaps/tortoisehg/icons/scalable/actions/view-at-revision.svg
@@ -449,9 +451,10 @@ share/pixmaps/tortoisehg/icons/scalable/
share/pixmaps/tortoisehg/icons/scalable/apps/
share/pixmaps/tortoisehg/icons/scalable/apps/help-browser.svg
share/pixmaps/tortoisehg/icons/scalable/apps/help-readme.svg
+share/pixmaps/tortoisehg/icons/scalable/apps/hg.svg
share/pixmaps/tortoisehg/icons/scalable/apps/preferences-desktop-font.svg
share/pixmaps/tortoisehg/icons/scalable/apps/system-file-manager.svg
-share/pixmaps/tortoisehg/icons/scalable/apps/thg-logo.svg
+share/pixmaps/tortoisehg/icons/scalable/apps/thg.svg
share/pixmaps/tortoisehg/icons/scalable/apps/tools-hooks.svg
share/pixmaps/tortoisehg/icons/scalable/apps/tools-spanner-hammer.svg
share/pixmaps/tortoisehg/icons/scalable/apps/utilities-terminal.svg
@@ -459,6 +462,7 @@ share/pixmaps/tortoisehg/icons/scalable/
share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-both.svg
share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-p1.svg
share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-p2.svg
+share/pixmaps/tortoisehg/icons/scalable/status/hg-modified.svg
share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-applied.svg
share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-guarded.svg
share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-unguarded.svg
@@ -475,23 +479,7 @@ share/pixmaps/tortoisehg/icons/scalable/
share/pixmaps/tortoisehg/icons/settings_repo.ico
share/pixmaps/tortoisehg/icons/settings_user.ico
share/pixmaps/tortoisehg/icons/shelve.ico
-share/pixmaps/tortoisehg/icons/svg/
-share/pixmaps/tortoisehg/icons/svg/add.svg
-share/pixmaps/tortoisehg/icons/svg/checkout.svg
-share/pixmaps/tortoisehg/icons/svg/clone.svg
-share/pixmaps/tortoisehg/icons/svg/commit.svg
-share/pixmaps/tortoisehg/icons/svg/detect_rename.svg
-share/pixmaps/tortoisehg/icons/svg/ignore.svg
-share/pixmaps/tortoisehg/icons/svg/init.svg
-share/pixmaps/tortoisehg/icons/svg/log.svg
-share/pixmaps/tortoisehg/icons/svg/merge.svg
-share/pixmaps/tortoisehg/icons/svg/proxy.svg
-share/pixmaps/tortoisehg/icons/svg/recovery.svg
-share/pixmaps/tortoisehg/icons/svg/refresh_overlays.svg
-share/pixmaps/tortoisehg/icons/svg/remove.svg
-share/pixmaps/tortoisehg/icons/svg/repobrowse.svg
-share/pixmaps/tortoisehg/icons/svg/shelve.svg
-share/pixmaps/tortoisehg/icons/svg/sync.svg
-share/pixmaps/tortoisehg/icons/svg/thg_logo.svg
share/pixmaps/tortoisehg/icons/thg_logo.ico
share/pixmaps/tortoisehg/icons/thg_logo_92x50.png
+share/tortoisehg/
+share/tortoisehg/COPYING.txt
