aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authoramdmi3 <amdmi3@FreeBSD.org>2011-06-11 16:54:08 +0800
committeramdmi3 <amdmi3@FreeBSD.org>2011-06-11 16:54:08 +0800
commit3edb6613874e6f4926ea2f457f702490daeaf88e (patch)
treeeaccf7f4ff68a9549c862000c4dac0c903033f00 /devel
parent3b580f427d0323a9e08818ec62ef900e76b5b323 (diff)
downloadfreebsd-ports-gnome-3edb6613874e6f4926ea2f457f702490daeaf88e.tar.gz
freebsd-ports-gnome-3edb6613874e6f4926ea2f457f702490daeaf88e.tar.zst
freebsd-ports-gnome-3edb6613874e6f4926ea2f457f702490daeaf88e.zip
- Port cleanup
- Add conflict with upcoming devel/tortoisehg2 Submitted by: maintainer (via private xmpp)
Diffstat (limited to 'devel')
-rw-r--r--devel/tortoisehg1/Makefile21
-rw-r--r--devel/tortoisehg1/files/patch-setup.py19
-rw-r--r--devel/tortoisehg1/pkg-message1
-rw-r--r--devel/tortoisehg1/pkg-plist78
4 files changed, 104 insertions, 15 deletions
diff --git a/devel/tortoisehg1/Makefile b/devel/tortoisehg1/Makefile
index 4e8621dbc7b7..0a082321a215 100644
--- a/devel/tortoisehg1/Makefile
+++ b/devel/tortoisehg1/Makefile
@@ -18,10 +18,13 @@ RUN_DEPENDS= hg:${PORTSDIR}/devel/mercurial \
OPTIONS= NAUTILUS "Install TortoiseHG Nautilus extension" off
+CONFLICTS= tortoisehg-2*
+
USE_GNOME= pygtk2 pygobject
INSTALLS_ICONS= yes
USE_PYTHON= yes
+USE_PYDISTUTILS=yes
INSTALLS_EGGINFO=yes
.include <bsd.port.options.mk>
@@ -42,24 +45,20 @@ PLIST_SUB+= NAUTILUS=""
post-patch:
@${REINPLACE_CMD} -e '/_path/ s|/usr|${PREFIX}|' ${WRKSRC}/${PYSETUP}
.if defined(WITHOUT_NLS)
- @${REINPLACE_CMD} -e '150,152 s|^|# |' ${WRKSRC}/${PYSETUP}
+ @${REINPLACE_CMD} -e 's/^%%NLS%%/# /' ${WRKSRC}/${PYSETUP}
+.else
+ @${REINPLACE_CMD} -e 's/^%%NLS%%//' ${WRKSRC}/${PYSETUP}
.endif
.if defined(WITHOUT_NAUTILUS)
- @${REINPLACE_CMD} -e '153,154 s|^|# |' ${WRKSRC}/${PYSETUP}
+ @${REINPLACE_CMD} -e 's/^%%NAUTILUS%%/# /' ${WRKSRC}/${PYSETUP}
+.else
+ @${REINPLACE_CMD} -e 's/^%%NAUTILUS%%//' ${WRKSRC}/${PYSETUP}
.endif
-do-configure:
- @${DO_NADA}
-
-do-build:
- cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} build
-
-do-install:
- cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} install --prefix=${PREFIX}
+post-install:
${MKDIR} ${PREFIX}/share/tortoisehg
${INSTALL_DATA} ${WRKSRC}/contrib/mergetools.rc ${PREFIX}/share/tortoisehg/
-post-install:
@${ECHO_MSG}
@${CAT} pkg-message
@${ECHO_MSG}
diff --git a/devel/tortoisehg1/files/patch-setup.py b/devel/tortoisehg1/files/patch-setup.py
new file mode 100644
index 000000000000..c288746acfeb
--- /dev/null
+++ b/devel/tortoisehg1/files/patch-setup.py
@@ -0,0 +1,19 @@
+--- setup.py.orig 2011-05-14 11:28:04.810695095 +0100
++++ setup.py 2011-05-14 11:29:33.105770244 +0100
+@@ -147,11 +147,11 @@
+ _data_files = [(os.path.join('share/pixmaps/tortoisehg', root),
+ [os.path.join(root, file_) for file_ in files])
+ for root, dirs, files in os.walk('icons')]
+- _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 += [('lib/nautilus/extensions-2.0/python',
+- ['contrib/nautilus-thg.py'])]
++%%NLS%% _data_files += [(os.path.join('share', root),
++%%NLS%% [os.path.join(root, file_) for file_ in files])
++%%NLS%% for root, dirs, files in os.walk('locale')]
++%%NAUTILUS%% _data_files += [('lib/nautilus/extensions-2.0/python',
++%%NAUTILUS%% ['contrib/nautilus-thg.py'])]
+
+ # Create a config.py. Distributions will need to supply their own
+ cfgfile = os.path.join('tortoisehg', 'util', 'config.py')
diff --git a/devel/tortoisehg1/pkg-message b/devel/tortoisehg1/pkg-message
index a8e72435418b..49fe79919554 100644
--- a/devel/tortoisehg1/pkg-message
+++ b/devel/tortoisehg1/pkg-message
@@ -2,4 +2,3 @@ It is recommended %include TortoiseHG's mergetools.rc into your ~/.hgrc file,
especially if you use textproc/kdiff3 as your merge tool.
%include /usr/local/share/tortoisehg/mergetools.rc
-
diff --git a/devel/tortoisehg1/pkg-plist b/devel/tortoisehg1/pkg-plist
index a9f76d31e6ff..e427eb854e62 100644
--- a/devel/tortoisehg1/pkg-plist
+++ b/devel/tortoisehg1/pkg-plist
@@ -2,150 +2,223 @@ bin/hgtk
%%NAUTILUS%%lib/nautilus/extensions-2.0/python/nautilus-thg.py
%%PYTHON_SITELIBDIR%%/tortoisehg/__init__.py
%%PYTHON_SITELIBDIR%%/tortoisehg/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/__init__.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/__init__.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/__init__.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/about.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/about.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/about.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/archive.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/archive.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/archive.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/backout.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/backout.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/backout.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/bookmark.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/bookmark.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/bookmark.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/browse.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/browse.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/browse.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/bugreport.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/bugreport.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/bugreport.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/bugtraq.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/bugtraq.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/bugtraq.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/changeset.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/changeset.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/changeset.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/chunks.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/chunks.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/chunks.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/clone.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/clone.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/clone.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/commit.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/commit.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/commit.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/csinfo.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/csinfo.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/csinfo.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/cslist.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/cslist.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/cslist.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/datamine.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/datamine.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/datamine.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/dialog.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/dialog.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/dialog.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/gdialog.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/gdialog.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/gdialog.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/gorev.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/gorev.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/gorev.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/gtklib.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/gtklib.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/gtklib.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/guess.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/guess.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/guess.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/hgcmd.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/hgcmd.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/hgcmd.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/hgemail.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/hgemail.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/hgemail.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/hgignore.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/hgignore.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/hgignore.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/hginit.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/hginit.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/hginit.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/hgthread.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/hgthread.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/hgthread.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/hgtk.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/hgtk.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/hgtk.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/histdetails.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/histdetails.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/histdetails.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/history.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/history.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/history.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/logview/__init__.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/logview/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/logview/__init__.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/logview/colormap.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/logview/colormap.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/logview/colormap.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/logview/graphcell.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/logview/graphcell.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/logview/graphcell.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/logview/revgraph.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/logview/revgraph.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/logview/revgraph.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/logview/treemodel.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/logview/treemodel.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/logview/treemodel.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/logview/treeview.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/logview/treeview.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/logview/treeview.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/merge.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/merge.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/merge.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/p4pending.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/p4pending.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/p4pending.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/quickop.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/quickop.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/quickop.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/recovery.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/recovery.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/recovery.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/rename.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/rename.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/rename.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/serve.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/serve.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/serve.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/shellconf.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/shellconf.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/shellconf.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/status.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/status.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/status.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/statusact.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/statusact.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/statusact.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/statusbar.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/statusbar.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/statusbar.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/synch.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/synch.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/synch.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/tagadd.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/tagadd.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/tagadd.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/textview.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/textview.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/textview.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/thgconfig.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/thgconfig.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/thgconfig.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/thgimport.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/thgimport.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/thgimport.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/thgmq.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/thgmq.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/thgmq.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/thgpbranch.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/thgpbranch.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/thgpbranch.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/thgshelve.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/thgshelve.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/thgshelve.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/thgstrip.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/thgstrip.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/thgstrip.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/update.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/update.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/update.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/visdiff.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/visdiff.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgtk/visdiff.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/util/__init__.py
%%PYTHON_SITELIBDIR%%/tortoisehg/util/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/__init__.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/util/__version__.py
%%PYTHON_SITELIBDIR%%/tortoisehg/util/__version__.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/__version__.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/util/cachethg.py
%%PYTHON_SITELIBDIR%%/tortoisehg/util/cachethg.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/cachethg.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/util/config.py
%%PYTHON_SITELIBDIR%%/tortoisehg/util/config.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/config.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/util/debugthg.py
%%PYTHON_SITELIBDIR%%/tortoisehg/util/debugthg.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/debugthg.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/util/hglib.py
%%PYTHON_SITELIBDIR%%/tortoisehg/util/hglib.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/hglib.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/util/hgshelve.py
%%PYTHON_SITELIBDIR%%/tortoisehg/util/hgshelve.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/hgshelve.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/util/hgversion.py
%%PYTHON_SITELIBDIR%%/tortoisehg/util/hgversion.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/hgversion.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/util/i18n.py
%%PYTHON_SITELIBDIR%%/tortoisehg/util/i18n.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/i18n.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/util/menuthg.py
%%PYTHON_SITELIBDIR%%/tortoisehg/util/menuthg.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/menuthg.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/util/paths.py
%%PYTHON_SITELIBDIR%%/tortoisehg/util/paths.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/paths.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/util/prej.py
%%PYTHON_SITELIBDIR%%/tortoisehg/util/prej.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/prej.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/util/settings.py
%%PYTHON_SITELIBDIR%%/tortoisehg/util/settings.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/settings.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/util/shlib.py
%%PYTHON_SITELIBDIR%%/tortoisehg/util/shlib.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/shlib.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/util/thgstatus.py
%%PYTHON_SITELIBDIR%%/tortoisehg/util/thgstatus.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/thgstatus.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/util/thread2.py
%%PYTHON_SITELIBDIR%%/tortoisehg/util/thread2.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/thread2.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/util/version.py
%%PYTHON_SITELIBDIR%%/tortoisehg/util/version.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/util/version.pyo
%%NLS%%share/locale/ca/LC_MESSAGES/tortoisehg.mo
%%NLS%%share/locale/cs/LC_MESSAGES/tortoisehg.mo
%%NLS%%share/locale/da/LC_MESSAGES/tortoisehg.mo
@@ -236,11 +309,11 @@ 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/mergetools.rc
+%%DATADIR%%/mergetools.rc
@dirrm share/pixmaps/tortoisehg/icons/svg
@dirrm share/pixmaps/tortoisehg/icons
@dirrm share/pixmaps/tortoisehg
-@dirrm share/tortoisehg
+@dirrm %%DATADIR%%
%%NLS%%@dirrmtry share/locale/oc/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/oc
@dirrm %%PYTHON_SITELIBDIR%%/tortoisehg/util
@@ -250,4 +323,3 @@ share/tortoisehg/mergetools.rc
%%NAUTILUS%%@dirrmtry lib/nautilus/extensions-2.0/python
%%NAUTILUS%%@dirrmtry lib/nautilus/extensions-2.0
%%NAUTILUS%%@dirrmtry lib/nautilus
-