diff options
Diffstat (limited to 'databases/mergeant')
-rw-r--r-- | databases/mergeant/Makefile | 13 | ||||
-rw-r--r-- | databases/mergeant/distinfo | 4 | ||||
-rw-r--r-- | databases/mergeant/files/patch-configure | 14 | ||||
-rw-r--r-- | databases/mergeant/files/patch-doc_libmergeant_C_Makefile.in | 11 | ||||
-rw-r--r-- | databases/mergeant/files/patch-libmergeant_graph_mg-canvas-field.c | 17 | ||||
-rw-r--r-- | databases/mergeant/files/patch-libmergeant_mg-form.c | 19 | ||||
-rw-r--r-- | databases/mergeant/files/patch-libmergeant_mg-parameter.c | 13 | ||||
-rw-r--r-- | databases/mergeant/files/patch-libmergeant_mg-query.c | 25 | ||||
-rw-r--r-- | databases/mergeant/files/patch-libmergeant_mg-work-grid.c | 14 | ||||
-rw-r--r-- | databases/mergeant/pkg-plist | 231 |
10 files changed, 21 insertions, 340 deletions
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile index 8bba8332b0c4..838cc78cc49a 100644 --- a/databases/mergeant/Makefile +++ b/databases/mergeant/Makefile @@ -3,14 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/databases/mergeant/Makefile,v 1.15 2005/08/07 21:55:46 marcus Exp $ # PORTNAME= mergeant -PORTVERSION= 0.52 -PORTREVISION= 3 +PORTVERSION= 0.62 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.52 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -21,14 +21,11 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gnomehack libgnomedb libgnomeprintui USE_PERL5= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 INSTALLS_OMF= yes INSTALLS_SHLIB= yes +USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|Icon=|Icon=${PREFIX}/share/gnome/pixmaps/|g' \ - ${WRKSRC}/mergeant.desktop.in - .include <bsd.port.mk> diff --git a/databases/mergeant/distinfo b/databases/mergeant/distinfo index 9289ea8c7364..07d3c52b3df0 100644 --- a/databases/mergeant/distinfo +++ b/databases/mergeant/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/mergeant-0.52.tar.bz2) = e9f96b824e452e9b9406b4c11f005b95 -SIZE (gnome2/mergeant-0.52.tar.bz2) = 2058623 +MD5 (gnome2/mergeant-0.62.tar.bz2) = acd5dd8d888f8dde8ca0768d081828e3 +SIZE (gnome2/mergeant-0.62.tar.bz2) = 1005279 diff --git a/databases/mergeant/files/patch-configure b/databases/mergeant/files/patch-configure index 371191c940a7..baf457654c1b 100644 --- a/databases/mergeant/files/patch-configure +++ b/databases/mergeant/files/patch-configure @@ -1,15 +1,11 @@ ---- configure.orig Wed May 28 19:35:54 2003 -+++ configure Wed May 28 23:22:14 2003 -@@ -9407,13 +9408,13 @@ +--- configure.orig Sun Aug 7 17:40:05 2005 ++++ configure Sun Aug 7 17:40:37 2005 +@@ -22920,9 +22920,9 @@ MERGEANT_Pixmapdir=${datadir}/pixmaps/${PACKAGE} --MERGEANT_Appdir=${datadir}/gnome/apps/Applications -+MERGEANT_Appdir=${datadir}/apps/Applications - - MERGEANT_DTDdir=${datadir}/${PACKAGE}/dtd - - MERGEANT_Plugdir=${libdir}/${PACKAGE}/plugins +-MERGEANT_Appdir=${datadir}/gnome/applications ++MERGEANT_Appdir=${datadir}/applications -MERGEANT_Helpdir=${datadir}/gnome/help/${PACKAGE} +MERGEANT_Helpdir=${datadir}/help/${PACKAGE} diff --git a/databases/mergeant/files/patch-doc_libmergeant_C_Makefile.in b/databases/mergeant/files/patch-doc_libmergeant_C_Makefile.in deleted file mode 100644 index 52e62979ef48..000000000000 --- a/databases/mergeant/files/patch-doc_libmergeant_C_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/libmergeant/C/Makefile.in.orig Sat Aug 14 04:12:49 2004 -+++ doc/libmergeant/C/Makefile.in Sat Aug 14 04:13:07 2004 -@@ -214,7 +214,7 @@ - - # The name of the module. - DOC_MODULE = libmergeant --HTML_DIR = $(datadir)/gtk-doc/html -+HTML_DIR = $(prefix)/share/doc - - # The top-level SGML file. - DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml diff --git a/databases/mergeant/files/patch-libmergeant_graph_mg-canvas-field.c b/databases/mergeant/files/patch-libmergeant_graph_mg-canvas-field.c deleted file mode 100644 index 15005003ecdb..000000000000 --- a/databases/mergeant/files/patch-libmergeant_graph_mg-canvas-field.c +++ /dev/null @@ -1,17 +0,0 @@ ---- libmergeant/graph/mg-canvas-field.c.orig Sat Aug 14 04:04:07 2004 -+++ libmergeant/graph/mg-canvas-field.c Sat Aug 14 04:04:40 2004 -@@ -146,13 +146,13 @@ - gpointer ptr; - GString *string; - MgServerDataType *dtype; -+ MgEntity *ent; - - cf = MG_CANVAS_FIELD (object); - - switch (param_id) { - case PROP_FIELD: - ptr = g_value_get_pointer (value); -- MgEntity *ent; - g_return_if_fail (IS_MG_FIELD (ptr)); - - /* signals management */ diff --git a/databases/mergeant/files/patch-libmergeant_mg-form.c b/databases/mergeant/files/patch-libmergeant_mg-form.c deleted file mode 100644 index 168e15c413d3..000000000000 --- a/databases/mergeant/files/patch-libmergeant_mg-form.c +++ /dev/null @@ -1,19 +0,0 @@ ---- libmergeant/mg-form.c.orig Thu Aug 12 22:24:32 2004 -+++ libmergeant/mg-form.c Thu Aug 12 22:24:48 2004 -@@ -586,6 +586,7 @@ - { - PangoAttrList *attrs = NULL; - PangoAttribute *att; -+ GSList *list; - - if (show_mark) { - attrs = pango_attr_list_new (); -@@ -595,7 +596,7 @@ - pango_attr_list_insert (attrs, att); - } - -- GSList *list = form->priv->not_null_labels; -+ list = form->priv->not_null_labels; - while (list) { - gtk_label_set_attributes (GTK_LABEL (list->data), attrs); - list = g_slist_next (list); diff --git a/databases/mergeant/files/patch-libmergeant_mg-parameter.c b/databases/mergeant/files/patch-libmergeant_mg-parameter.c deleted file mode 100644 index 60bfe9b4205c..000000000000 --- a/databases/mergeant/files/patch-libmergeant_mg-parameter.c +++ /dev/null @@ -1,13 +0,0 @@ ---- libmergeant/mg-parameter.c.orig Thu Aug 12 22:25:38 2004 -+++ libmergeant/mg-parameter.c Thu Aug 12 22:25:53 2004 -@@ -608,9 +608,9 @@ - mg_parameter_set_value (MgParameter *param, const GdaValue *value) - { - gboolean changed = TRUE; -+ const GdaValue *current_val; - g_return_if_fail (param && IS_MG_PARAMETER (param)); - g_return_if_fail (param->priv); -- const GdaValue *current_val; - - param->priv->invalid_forced = FALSE; - diff --git a/databases/mergeant/files/patch-libmergeant_mg-query.c b/databases/mergeant/files/patch-libmergeant_mg-query.c deleted file mode 100644 index 41bf5bf1a138..000000000000 --- a/databases/mergeant/files/patch-libmergeant_mg-query.c +++ /dev/null @@ -1,25 +0,0 @@ ---- libmergeant/mg-query.c.orig Sun Aug 8 11:20:06 2004 -+++ libmergeant/mg-query.c Wed Jan 5 02:07:47 2005 -@@ -44,7 +44,7 @@ - #include "mg-server-aggregate.h" - #include "mg-data-handler.h" - --#include <libgda/sql/sql_parser.h> -+#include <libgda-1.2/sql/sql_parser.h> - #include "mg-qf-func.h" - - /* -@@ -5117,9 +5117,11 @@ - if (!cond) - has_error = TRUE; - else { -+ MgQfield *field_left; -+ MgQfield *field_right; - g_assert (mg_condition_get_cond_type (cond) == MG_CONDITION_LEAF_EQUAL); -- MgQfield *field_left = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_LEFT); -- MgQfield *field_right = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_RIGHT); -+ field_left = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_LEFT); -+ field_right = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_RIGHT); - - if (IS_MG_QF_FIELD (field_left)) { - g_object_set (G_OBJECT (field_left), "value_provider", field_right, NULL); diff --git a/databases/mergeant/files/patch-libmergeant_mg-work-grid.c b/databases/mergeant/files/patch-libmergeant_mg-work-grid.c deleted file mode 100644 index b9a36b2e18d2..000000000000 --- a/databases/mergeant/files/patch-libmergeant_mg-work-grid.c +++ /dev/null @@ -1,14 +0,0 @@ ---- libmergeant/mg-work-grid.c.orig Sat Aug 14 03:59:47 2004 -+++ libmergeant/mg-work-grid.c Sat Aug 14 04:00:02 2004 -@@ -2299,10 +2299,10 @@ - GtkTreeModel *tree_model, GtkTreeIter *iter, - MgWorkCore *core, MgDataEntryAttribute requested_status) - { -- g_return_if_fail (user_modif); - guint attrs; - GtkTreePath *path; - gint row; -+ g_return_if_fail (user_modif); - - switch (requested_status) { - case MG_DATA_ENTRY_IS_NULL: diff --git a/databases/mergeant/pkg-plist b/databases/mergeant/pkg-plist index 75d763c41237..53fe7bdf3854 100644 --- a/databases/mergeant/pkg-plist +++ b/databases/mergeant/pkg-plist @@ -1,209 +1,5 @@ bin/mergeant -bin/mg-db-browser -bin/mg-test-dyn -bin/mg-test-graph -bin/mg-test-grapher -bin/mg-test-handlers -bin/mg-test-selector -bin/mg-test-sqlquery -bin/mg-test1 -bin/mg-test2 -bin/mg-test3 -bin/mg-verify-file -include/libmergeant/graph/mg-canvas-cursor.h -include/libmergeant/graph/mg-canvas-db-relations.h -include/libmergeant/graph/mg-canvas-entity.h -include/libmergeant/graph/mg-canvas-field.h -include/libmergeant/graph/mg-canvas-fkconstraint.h -include/libmergeant/graph/mg-canvas-item.h -include/libmergeant/graph/mg-canvas-text.h -include/libmergeant/graph/mg-canvas-tip.h -include/libmergeant/graph/mg-canvas.h -include/libmergeant/graph/mg-graph-item.h -include/libmergeant/graph/mg-graph.h -include/libmergeant/handlers/mg-data-cell-renderer-boolean.h -include/libmergeant/handlers/mg-data-cell-renderer-combo.h -include/libmergeant/handlers/mg-data-cell-renderer-info.h -include/libmergeant/handlers/mg-data-cell-renderer-textual.h -include/libmergeant/handlers/mg-entry-boolean.h -include/libmergeant/handlers/mg-entry-combo.h -include/libmergeant/handlers/mg-entry-none.h -include/libmergeant/handlers/mg-entry-shell.h -include/libmergeant/handlers/mg-entry-string.h -include/libmergeant/handlers/mg-entry-time.h -include/libmergeant/handlers/mg-entry-wrapper.h -include/libmergeant/handlers/mg-handler-boolean.h -include/libmergeant/handlers/mg-handler-none.h -include/libmergeant/handlers/mg-handler-numerical.h -include/libmergeant/handlers/mg-handler-string.h -include/libmergeant/handlers/mg-handler-time.h -include/libmergeant/libmergeant.h -include/libmergeant/marshal.h -include/libmergeant/mg-base.h -include/libmergeant/mg-condition.h -include/libmergeant/mg-conf.h -include/libmergeant/mg-context.h -include/libmergeant/mg-custom-layout.h -include/libmergeant/mg-data-entry.h -include/libmergeant/mg-data-handler.h -include/libmergeant/mg-database.h -include/libmergeant/mg-db-constraint.h -include/libmergeant/mg-db-field.h -include/libmergeant/mg-db-table.h -include/libmergeant/mg-dbms-update-viewer.h -include/libmergeant/mg-defs.h -include/libmergeant/mg-entity.h -include/libmergeant/mg-enums.h -include/libmergeant/mg-field.h -include/libmergeant/mg-form.h -include/libmergeant/mg-graphviz.h -include/libmergeant/mg-join.h -include/libmergeant/mg-parameter.h -include/libmergeant/mg-qf-all.h -include/libmergeant/mg-qf-field.h -include/libmergeant/mg-qf-func.h -include/libmergeant/mg-qf-value.h -include/libmergeant/mg-qfield.h -include/libmergeant/mg-query.h -include/libmergeant/mg-ref-base.h -include/libmergeant/mg-referer.h -include/libmergeant/mg-renderer.h -include/libmergeant/mg-result-set.h -include/libmergeant/mg-selector-private.h -include/libmergeant/mg-selector.h -include/libmergeant/mg-server-aggregate.h -include/libmergeant/mg-server-data-type.h -include/libmergeant/mg-server-function.h -include/libmergeant/mg-server.h -include/libmergeant/mg-target.h -include/libmergeant/mg-util.h -include/libmergeant/mg-work-core.h -include/libmergeant/mg-work-form.h -include/libmergeant/mg-work-grid.h -include/libmergeant/mg-work-layout.h -include/libmergeant/mg-work-matrix.h -include/libmergeant/mg-work-widget.h -include/libmergeant/mg-xml-storage.h -include/libmergeant/missing.h -include/libmergeant/sel-aggregates.h -include/libmergeant/sel-data-types.h -include/libmergeant/sel-forms.h -include/libmergeant/sel-functions.h -include/libmergeant/sel-graphs.h -include/libmergeant/sel-onequery.h -include/libmergeant/sel-onetable.h -include/libmergeant/sel-onetarget.h -include/libmergeant/sel-queries.h -include/libmergeant/sel-tables.h -include/libmergeant/utility.h -lib/libmergeant-2.a -lib/libmergeant-2.so -lib/libmergeant-2.so.1 -lib/libmergeant_graph-2.a -lib/libmergeant_graph-2.so -lib/libmergeant_graph-2.so.1 -lib/libmergeant_handlers-2.a -lib/libmergeant_handlers-2.so -lib/libmergeant_handlers-2.so.1 libdata/bonobo/servers/GNOME_Mergeant.server -libdata/pkgconfig/libmergeant.pc -share/doc/libmergeant/MgBase.html -share/doc/libmergeant/MgCanvas.html -share/doc/libmergeant/MgCanvasCursor.html -share/doc/libmergeant/MgCanvasDbRelations.html -share/doc/libmergeant/MgCanvasEntity.html -share/doc/libmergeant/MgCanvasField.html -share/doc/libmergeant/MgCanvasItem.html -share/doc/libmergeant/MgCanvasText.html -share/doc/libmergeant/MgCanvasTip.html -share/doc/libmergeant/MgCondition.html -share/doc/libmergeant/MgConf.html -share/doc/libmergeant/MgContext.html -share/doc/libmergeant/MgCustomLayout.html -share/doc/libmergeant/MgDataCellRendererBoolean.html -share/doc/libmergeant/MgDataCellRendererInfo.html -share/doc/libmergeant/MgDataCellRendererTextual.html -share/doc/libmergeant/MgDataEntry.html -share/doc/libmergeant/MgDataHandler.html -share/doc/libmergeant/MgDatabase.html -share/doc/libmergeant/MgDbConstraint.html -share/doc/libmergeant/MgDbField.html -share/doc/libmergeant/MgDbTable.html -share/doc/libmergeant/MgDbmsUpdateViewer.html -share/doc/libmergeant/MgEntity.html -share/doc/libmergeant/MgEntryBoolean.html -share/doc/libmergeant/MgEntryCidr.html -share/doc/libmergeant/MgEntryCombo.html -share/doc/libmergeant/MgEntryNone.html -share/doc/libmergeant/MgEntryPassmd5.html -share/doc/libmergeant/MgEntryShell.html -share/doc/libmergeant/MgEntryString.html -share/doc/libmergeant/MgEntryTime.html -share/doc/libmergeant/MgEntryWrapper.html -share/doc/libmergeant/MgField.html -share/doc/libmergeant/MgForm.html -share/doc/libmergeant/MgGraph.html -share/doc/libmergeant/MgGraphItem.html -share/doc/libmergeant/MgGraphviz.html -share/doc/libmergeant/MgHandlerBoolean.html -share/doc/libmergeant/MgHandlerCidr.html -share/doc/libmergeant/MgHandlerNone.html -share/doc/libmergeant/MgHandlerNumerical.html -share/doc/libmergeant/MgHandlerPassmd5.html -share/doc/libmergeant/MgHandlerString.html -share/doc/libmergeant/MgHandlerText.html -share/doc/libmergeant/MgHandlerTime.html -share/doc/libmergeant/MgJoin.html -share/doc/libmergeant/MgParameter.html -share/doc/libmergeant/MgQfAll.html -share/doc/libmergeant/MgQfField.html -share/doc/libmergeant/MgQfFunc.html -share/doc/libmergeant/MgQfValue.html -share/doc/libmergeant/MgQfield.html -share/doc/libmergeant/MgQuery.html -share/doc/libmergeant/MgRefBase.html -share/doc/libmergeant/MgReferer.html -share/doc/libmergeant/MgRenderer.html -share/doc/libmergeant/MgResultSet.html -share/doc/libmergeant/MgSelector.html -share/doc/libmergeant/MgServer.html -share/doc/libmergeant/MgServerAggregate.html -share/doc/libmergeant/MgServerDataType.html -share/doc/libmergeant/MgServerFunction.html -share/doc/libmergeant/MgTarget.html -share/doc/libmergeant/MgWorkCore.html -share/doc/libmergeant/MgWorkForm.html -share/doc/libmergeant/MgWorkGrid.html -share/doc/libmergeant/MgWorkLayout.html -share/doc/libmergeant/MgWorkMatrix.html -share/doc/libmergeant/MgWorkWidget.html -share/doc/libmergeant/MgXmlStorage.html -share/doc/libmergeant/ch01.html -share/doc/libmergeant/ch02.html -share/doc/libmergeant/ch03.html -share/doc/libmergeant/ch04.html -share/doc/libmergeant/ch04s02.html -share/doc/libmergeant/ch05.html -share/doc/libmergeant/ch06.html -share/doc/libmergeant/ch07.html -share/doc/libmergeant/ch08.html -share/doc/libmergeant/ch08s02.html -share/doc/libmergeant/ch09.html -share/doc/libmergeant/ch09s02.html -share/doc/libmergeant/ch09s03.html -share/doc/libmergeant/ch10.html -share/doc/libmergeant/ch11.html -share/doc/libmergeant/ch12.html -share/doc/libmergeant/example_bad.png -share/doc/libmergeant/example_result.png -share/doc/libmergeant/home.png -share/doc/libmergeant/index.html -share/doc/libmergeant/index.sgml -share/doc/libmergeant/left.png -share/doc/libmergeant/libmergeant.devhelp -share/doc/libmergeant/query01.png -share/doc/libmergeant/right.png -share/doc/libmergeant/up.png share/gnome/application-registry/mergeant.applications share/gnome/applications/mergeant.desktop share/gnome/help/mergeant/C/book1.html @@ -214,6 +10,7 @@ share/gnome/help/mergeant/C/c76.html share/gnome/help/mergeant/C/c8.html share/gnome/help/mergeant/C/c84.html share/gnome/help/mergeant/C/c94.html +share/gnome/help/mergeant/C/docbook.css share/gnome/help/mergeant/C/images/datasources.png share/gnome/help/mergeant/C/images/dba_properties.png share/gnome/help/mergeant/C/images/workspace-data-types.png @@ -236,17 +33,8 @@ share/gnome/help/mergeant/C/stylesheet-images/warning.gif share/gnome/help/mergeant/C/topic.dat share/gnome/help/mergeant/C/x19.html share/gnome/help/mergeant/C/x40.html -share/gnome/mergeant/dtd/libmergeant.dtd -share/gnome/mergeant/plugins/libmergeant_handler_cidr.so -share/gnome/mergeant/plugins/libmergeant_handler_cidr.so.1 -share/gnome/mergeant/plugins/libmergeant_handler_passmd5.so -share/gnome/mergeant/plugins/libmergeant_handler_passmd5.so.1 -share/gnome/mergeant/plugins/libmergeant_handler_text.so -share/gnome/mergeant/plugins/libmergeant_handler_text.so.1 -share/gnome/mergeant/ui/mergeant.xml share/gnome/mime-info/mergeant.keys share/gnome/mime-info/mergeant.mime -share/gnome/omf/libmergeant/libmergeant-C.omf share/gnome/omf/mergeant/mergeant-C.omf share/gnome/pixmaps/document-icons/gnome-application-x-mergeant.png share/gnome/pixmaps/mergeant/mergeant.png @@ -278,15 +66,21 @@ share/locale/fa/LC_MESSAGES/mergeant.mo share/locale/fr/LC_MESSAGES/mergeant.mo share/locale/hr/LC_MESSAGES/mergeant.mo share/locale/it/LC_MESSAGES/mergeant.mo +share/locale/ja/LC_MESSAGES/mergeant.mo +share/locale/lt/LC_MESSAGES/mergeant.mo share/locale/ml/LC_MESSAGES/mergeant.mo share/locale/ms/LC_MESSAGES/mergeant.mo +share/locale/nb/LC_MESSAGES/mergeant.mo +share/locale/ne/LC_MESSAGES/mergeant.mo share/locale/nl/LC_MESSAGES/mergeant.mo share/locale/no/LC_MESSAGES/mergeant.mo share/locale/pl/LC_MESSAGES/mergeant.mo share/locale/pt/LC_MESSAGES/mergeant.mo share/locale/pt_BR/LC_MESSAGES/mergeant.mo share/locale/ru/LC_MESSAGES/mergeant.mo +share/locale/rw/LC_MESSAGES/mergeant.mo share/locale/sk/LC_MESSAGES/mergeant.mo +share/locale/sq/LC_MESSAGES/mergeant.mo share/locale/sr/LC_MESSAGES/mergeant.mo share/locale/sr@Latn/LC_MESSAGES/mergeant.mo share/locale/sv/LC_MESSAGES/mergeant.mo @@ -294,18 +88,11 @@ share/locale/tr/LC_MESSAGES/mergeant.mo share/locale/uk/LC_MESSAGES/mergeant.mo share/locale/vi/LC_MESSAGES/mergeant.mo share/locale/zh_CN/LC_MESSAGES/mergeant.mo +@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/rw 2> /dev/null || true @dirrm share/gnome/pixmaps/mergeant @dirrm share/gnome/omf/mergeant -@dirrm share/gnome/omf/libmergeant -@dirrm share/gnome/mergeant/ui -@dirrm share/gnome/mergeant/plugins -@dirrm share/gnome/mergeant/dtd -@dirrm share/gnome/mergeant @dirrm share/gnome/help/mergeant/C/stylesheet-images @dirrm share/gnome/help/mergeant/C/images @dirrm share/gnome/help/mergeant/C @dirrm share/gnome/help/mergeant -@dirrm share/doc/libmergeant -@dirrm include/libmergeant/handlers -@dirrm include/libmergeant/graph -@dirrm include/libmergeant |