Presenting GNOME 2.20.1 and all related works for FreeBSD. The official

GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338

3 files changed, 145 insertions, 102 deletions

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 7a52ae6b44af..008cc868983f 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/editors/gedit/Makefile,v 1.58 2007/03/11 17:00:31 marcus Exp $
+#   $MCom: ports/editors/gedit/Makefile,v 1.72 2007/10/18 17:08:10 mezz Exp $
 #
 
 PORTNAME=	gedit
-PORTVERSION=	2.18.2
+PORTVERSION=	2.20.3
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -28,11 +28,11 @@ USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack \
-		libgnomeprintui libgnomeui eel2 gtksourceview desktopfileutils
+		libgnomeprintui libgnomeui eel2 gtksourceview2 desktopfileutils
 WANT_GNOME=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-PLIST_SUB=	VERSION="2.16"
+PLIST_SUB=	VERSION="2.20"
 
 MAN1=		gedit.1
 GCONF_SCHEMAS=	gedit.schemas gedit-file-browser.schemas
@@ -44,10 +44,10 @@ WITH_GNOME=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mpygnomedesktop}!=""
+.if ${HAVE_GNOME:Mpygtksourceview}!=""
 USE_PYTHON=	yes
 .include "${PORTSDIR}/Mk/bsd.python.mk"
-USE_GNOME+=	pygnomedesktop
+USE_GNOME+=	pygtksourceview
 CONFIGURE_ARGS+=--enable-python
 PLIST_SUB+=	PYTHON=""
 .else
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index b1363a5e697a..21ac4dc98f5c 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gedit-2.18.2.tar.bz2) = 7e8bf29bd6bf0d17ceaf42d9bd5d94e6
-SHA256 (gnome2/gedit-2.18.2.tar.bz2) = 12e4c2e15c1449e92f9f6c7966f4e1829290d5af35b9ec0b9274d8f167a89f44
-SIZE (gnome2/gedit-2.18.2.tar.bz2) = 3454560
+MD5 (gnome2/gedit-2.20.3.tar.bz2) = afc7bb5327c0cba393af4b1f6fa096c1
+SHA256 (gnome2/gedit-2.20.3.tar.bz2) = d8159e6a3442a3bcf8dba5aab5b8d4b79faa5f2d14d9df9b43fa0e9186922df0
+SIZE (gnome2/gedit-2.20.3.tar.bz2) = 3812377
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index b77169ded8fd..31b00b2ab69f 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -15,8 +15,6 @@ include/gedit-%%VERSION%%/gedit/gedit-panel.h
 include/gedit-%%VERSION%%/gedit/gedit-plugin.h
 include/gedit-%%VERSION%%/gedit/gedit-prefs-manager-app.h
 include/gedit-%%VERSION%%/gedit/gedit-prefs-manager.h
-include/gedit-%%VERSION%%/gedit/gedit-print-job-preview.h
-include/gedit-%%VERSION%%/gedit/gedit-print.h
 include/gedit-%%VERSION%%/gedit/gedit-progress-message-area.h
 include/gedit-%%VERSION%%/gedit/gedit-statusbar.h
 include/gedit-%%VERSION%%/gedit/gedit-tab.h
@@ -59,8 +57,8 @@ lib/gedit-2/plugins/libfilebrowser.la
 lib/gedit-2/plugins/libfilebrowser.so
 lib/gedit-2/plugins/libindent.la
 lib/gedit-2/plugins/libindent.so
-%%PYTHON%%lib/gedit-2/plugins/libmodelines.la
-%%PYTHON%%lib/gedit-2/plugins/libmodelines.so
+lib/gedit-2/plugins/libmodelines.la
+lib/gedit-2/plugins/libmodelines.so
 lib/gedit-2/plugins/libsample.la
 lib/gedit-2/plugins/libsample.so
 lib/gedit-2/plugins/libsort.la
@@ -71,7 +69,7 @@ lib/gedit-2/plugins/libtaglist.la
 lib/gedit-2/plugins/libtaglist.so
 lib/gedit-2/plugins/libtime.la
 lib/gedit-2/plugins/libtime.so
-%%PYTHON%%lib/gedit-2/plugins/modelines.gedit-plugin
+lib/gedit-2/plugins/modelines.gedit-plugin
 %%PYTHON%%lib/gedit-2/plugins/pythonconsole.gedit-plugin
 %%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.py
 %%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.pyc
@@ -81,42 +79,55 @@ lib/gedit-2/plugins/libtime.so
 %%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.pyo
 lib/gedit-2/plugins/sample.gedit-plugin
 %%PYTHON%%lib/gedit-2/plugins/snippets.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/snippets/Document.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/Document.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/Document.pyo
 %%PYTHON%%lib/gedit-2/plugins/snippets/ElementTree.py
 %%PYTHON%%lib/gedit-2/plugins/snippets/ElementTree.pyc
 %%PYTHON%%lib/gedit-2/plugins/snippets/ElementTree.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/Exporter.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/Exporter.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/Exporter.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/Helper.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/Helper.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/Helper.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/Importer.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/Importer.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/Importer.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/Library.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/Library.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/Library.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/Manager.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/Manager.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/Manager.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/Parser.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/Parser.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/Parser.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/Placeholder.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/Placeholder.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/Placeholder.pyo
 %%PYTHON%%lib/gedit-2/plugins/snippets/Snippet.py
 %%PYTHON%%lib/gedit-2/plugins/snippets/Snippet.pyc
 %%PYTHON%%lib/gedit-2/plugins/snippets/Snippet.pyo
 %%PYTHON%%lib/gedit-2/plugins/snippets/SnippetComplete.py
 %%PYTHON%%lib/gedit-2/plugins/snippets/SnippetComplete.pyc
 %%PYTHON%%lib/gedit-2/plugins/snippets/SnippetComplete.pyo
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetController.py
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetController.pyc
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetController.pyo
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetPlaceholders.py
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetPlaceholders.pyc
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetPlaceholders.pyo
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetPluginInstance.py
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetPluginInstance.pyc
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetPluginInstance.pyo
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetsDialog.py
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetsDialog.pyc
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetsDialog.pyo
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetsLibrary.py
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetsLibrary.pyc
-%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetsLibrary.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/SubstitutionParser.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/SubstitutionParser.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/SubstitutionParser.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/WindowHelper.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/WindowHelper.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/WindowHelper.pyo
 %%PYTHON%%lib/gedit-2/plugins/snippets/__init__.py
 %%PYTHON%%lib/gedit-2/plugins/snippets/__init__.pyc
 %%PYTHON%%lib/gedit-2/plugins/snippets/__init__.pyo
-%%PYTHON%%lib/gedit-2/plugins/snippets/functions.py
-%%PYTHON%%lib/gedit-2/plugins/snippets/functions.pyc
-%%PYTHON%%lib/gedit-2/plugins/snippets/functions.pyo
 %%PYTHON%%lib/gedit-2/plugins/snippets/snippets.glade
 lib/gedit-2/plugins/sort.gedit-plugin
 lib/gedit-2/plugins/spell.gedit-plugin
 lib/gedit-2/plugins/taglist.gedit-plugin
 lib/gedit-2/plugins/time.gedit-plugin
 libdata/pkgconfig/gedit-%%VERSION%%.pc
+share/applications/gedit.desktop
 %%DOCSDIR%%/GeditApp.html
 %%DOCSDIR%%/GeditDocument.html
 %%DOCSDIR%%/GeditEncodingsOptionMenu.html
@@ -150,47 +161,48 @@ libdata/pkgconfig/gedit-%%VERSION%%.pc
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
-share/gnome/applications/gedit.desktop
-share/gnome/gedit-2/glade/docinfo.glade2
-share/gnome/gedit-2/glade/gedit-encodings-dialog.glade
-share/gnome/gedit-2/glade/gedit-open-location-dialog.glade
-share/gnome/gedit-2/glade/gedit-page-setup-dialog.glade
-share/gnome/gedit-2/glade/gedit-preferences-dialog.glade
-share/gnome/gedit-2/glade/gedit-search-dialog.glade
-share/gnome/gedit-2/glade/languages-dialog.glade2
-share/gnome/gedit-2/glade/sort.glade2
-share/gnome/gedit-2/glade/spell-checker.glade2
-share/gnome/gedit-2/glade/time.glade2
-share/gnome/gedit-2/icons/gedit-plugin.png
-share/gnome/gedit-2/logo/gedit-logo.png
-share/gnome/gedit-2/plugins/filebrowser/gedit-file-browser-widget-ui.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/c++.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/c.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/css.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/docbook.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/global.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/haskell.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/html.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/idl.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/java.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/javascript.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/latex.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/perl.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/php.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/python.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/ruby.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/sh.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/tcl.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/snippets/xml.xml
-%%PYTHON%%share/gnome/gedit-2/plugins/tools/build
-%%PYTHON%%share/gnome/gedit-2/plugins/tools/open-terminal-here
-%%PYTHON%%share/gnome/gedit-2/plugins/tools/remove-trailing-spaces
-%%PYTHON%%share/gnome/gedit-2/plugins/tools/run-command
-share/gnome/gedit-2/taglist/HTML.tags.gz
-share/gnome/gedit-2/taglist/Latex.tags.gz
-share/gnome/gedit-2/taglist/XSLT.tags.gz
-share/gnome/gedit-2/taglist/XUL.tags.gz
-share/gnome/gedit-2/ui/gedit-ui.xml
+share/gedit-2/glade/docinfo.glade2
+share/gedit-2/glade/gedit-encodings-dialog.glade
+share/gedit-2/glade/gedit-open-location-dialog.glade
+share/gedit-2/glade/gedit-page-setup-dialog.glade
+share/gedit-2/glade/gedit-preferences-dialog.glade
+share/gedit-2/glade/gedit-search-dialog.glade
+share/gedit-2/glade/languages-dialog.glade2
+share/gedit-2/glade/sort.glade2
+share/gedit-2/glade/spell-checker.glade2
+share/gedit-2/glade/time.glade2
+share/gedit-2/icons/gedit-plugin.png
+share/gedit-2/logo/gedit-logo.png
+share/gedit-2/plugins/filebrowser/gedit-file-browser-widget-ui.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/c++.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/c.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/css.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/docbook.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/global.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/haskell.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/html.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/idl.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/java.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/javascript.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/lang/snippets.lang
+%%PYTHON%%share/gedit-2/plugins/snippets/latex.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/perl.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/php.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/python.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/ruby.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/sh.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/snippets.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/tcl.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/xml.xml
+%%PYTHON%%share/gedit-2/plugins/tools/build
+%%PYTHON%%share/gedit-2/plugins/tools/open-terminal-here
+%%PYTHON%%share/gedit-2/plugins/tools/remove-trailing-spaces
+%%PYTHON%%share/gedit-2/plugins/tools/run-command
+share/gedit-2/taglist/HTML.tags.gz
+share/gedit-2/taglist/Latex.tags.gz
+share/gedit-2/taglist/XSLT.tags.gz
+share/gedit-2/taglist/XUL.tags.gz
+share/gedit-2/ui/gedit-ui.xml
 share/gnome/help/gedit/C/figures/gedit_format_bold.png
 share/gnome/help/gedit/C/figures/gedit_format_italic.png
 share/gnome/help/gedit/C/figures/gedit_format_strikethrough.png
@@ -235,6 +247,14 @@ share/gnome/help/gedit/fr/figures/gedit_recent_files_menu_icon.png
 share/gnome/help/gedit/fr/figures/gedit_window.png
 share/gnome/help/gedit/fr/gedit.xml
 share/gnome/help/gedit/fr/legal.xml
+share/gnome/help/gedit/hu/figures/gedit_format_bold.png
+share/gnome/help/gedit/hu/figures/gedit_format_italic.png
+share/gnome/help/gedit/hu/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/hu/figures/gedit_format_underline.png
+share/gnome/help/gedit/hu/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/hu/figures/gedit_window.png
+share/gnome/help/gedit/hu/gedit.xml
+share/gnome/help/gedit/hu/legal.xml
 share/gnome/help/gedit/it/figures/gedit_format_bold.png
 share/gnome/help/gedit/it/figures/gedit_format_italic.png
 share/gnome/help/gedit/it/figures/gedit_format_strikethrough.png
@@ -251,10 +271,22 @@ share/gnome/help/gedit/ja/figures/gedit_recent_files_menu_icon.png
 share/gnome/help/gedit/ja/figures/gedit_window.png
 share/gnome/help/gedit/ja/gedit.xml
 share/gnome/help/gedit/ja/legal.xml
+share/gnome/help/gedit/ko/figures/gedit_format_bold.png
+share/gnome/help/gedit/ko/figures/gedit_format_italic.png
+share/gnome/help/gedit/ko/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/ko/figures/gedit_format_underline.png
 share/gnome/help/gedit/ko/figures/gedit_recent_files_menu_icon.png
 share/gnome/help/gedit/ko/figures/gedit_window.png
 share/gnome/help/gedit/ko/gedit.xml
 share/gnome/help/gedit/ko/legal.xml
+share/gnome/help/gedit/oc/figures/gedit_format_bold.png
+share/gnome/help/gedit/oc/figures/gedit_format_italic.png
+share/gnome/help/gedit/oc/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/oc/figures/gedit_format_underline.png
+share/gnome/help/gedit/oc/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/oc/figures/gedit_window.png
+share/gnome/help/gedit/oc/gedit.xml
+share/gnome/help/gedit/oc/legal.xml
 share/gnome/help/gedit/ro/figures/gedit_window.png
 share/gnome/help/gedit/ro/gedit.xml
 share/gnome/help/gedit/ro/legal.xml
@@ -306,27 +338,12 @@ share/gnome/help/gedit/zh_TW/figures/gedit_recent_files_menu_icon.png
 share/gnome/help/gedit/zh_TW/figures/gedit_window.png
 share/gnome/help/gedit/zh_TW/gedit.xml
 share/gnome/help/gedit/zh_TW/legal.xml
-share/gnome/omf/gedit/gedit-C.omf
-share/gnome/omf/gedit/gedit-bg.omf
-share/gnome/omf/gedit/gedit-de.omf
-share/gnome/omf/gedit/gedit-es.omf
-share/gnome/omf/gedit/gedit-eu.omf
-share/gnome/omf/gedit/gedit-fr.omf
-share/gnome/omf/gedit/gedit-it.omf
-share/gnome/omf/gedit/gedit-ja.omf
-share/gnome/omf/gedit/gedit-ko.omf
-share/gnome/omf/gedit/gedit-ro.omf
-share/gnome/omf/gedit/gedit-ru.omf
-share/gnome/omf/gedit/gedit-sv.omf
-share/gnome/omf/gedit/gedit-uk.omf
-share/gnome/omf/gedit/gedit-zh_CN.omf
-share/gnome/omf/gedit/gedit-zh_HK.omf
-share/gnome/omf/gedit/gedit-zh_TW.omf
 share/locale/af/LC_MESSAGES/gedit.mo
 share/locale/am/LC_MESSAGES/gedit.mo
 share/locale/ar/LC_MESSAGES/gedit.mo
 share/locale/az/LC_MESSAGES/gedit.mo
 share/locale/be/LC_MESSAGES/gedit.mo
+share/locale/be@latin/LC_MESSAGES/gedit.mo
 share/locale/bg/LC_MESSAGES/gedit.mo
 share/locale/bn/LC_MESSAGES/gedit.mo
 share/locale/bn_IN/LC_MESSAGES/gedit.mo
@@ -404,7 +421,25 @@ share/locale/xh/LC_MESSAGES/gedit.mo
 share/locale/zh_CN/LC_MESSAGES/gedit.mo
 share/locale/zh_HK/LC_MESSAGES/gedit.mo
 share/locale/zh_TW/LC_MESSAGES/gedit.mo
-@dirrm share/gnome/omf/gedit
+share/omf/gedit/gedit-C.omf
+share/omf/gedit/gedit-bg.omf
+share/omf/gedit/gedit-de.omf
+share/omf/gedit/gedit-es.omf
+share/omf/gedit/gedit-eu.omf
+share/omf/gedit/gedit-fr.omf
+share/omf/gedit/gedit-hu.omf
+share/omf/gedit/gedit-it.omf
+share/omf/gedit/gedit-ja.omf
+share/omf/gedit/gedit-ko.omf
+share/omf/gedit/gedit-oc.omf
+share/omf/gedit/gedit-ro.omf
+share/omf/gedit/gedit-ru.omf
+share/omf/gedit/gedit-sv.omf
+share/omf/gedit/gedit-uk.omf
+share/omf/gedit/gedit-zh_CN.omf
+share/omf/gedit/gedit-zh_HK.omf
+share/omf/gedit/gedit-zh_TW.omf
+@dirrm share/omf/gedit
 @dirrm share/gnome/help/gedit/zh_TW/figures
 @dirrm share/gnome/help/gedit/zh_TW
 @dirrm share/gnome/help/gedit/zh_HK/figures
@@ -419,12 +454,16 @@ share/locale/zh_TW/LC_MESSAGES/gedit.mo
 @dirrm share/gnome/help/gedit/ru
 @dirrm share/gnome/help/gedit/ro/figures
 @dirrm share/gnome/help/gedit/ro
+@dirrm share/gnome/help/gedit/oc/figures
+@dirrm share/gnome/help/gedit/oc
 @dirrm share/gnome/help/gedit/ko/figures
 @dirrm share/gnome/help/gedit/ko
 @dirrm share/gnome/help/gedit/ja/figures
 @dirrm share/gnome/help/gedit/ja
 @dirrm share/gnome/help/gedit/it/figures
 @dirrm share/gnome/help/gedit/it
+@dirrm share/gnome/help/gedit/hu/figures
+@dirrm share/gnome/help/gedit/hu
 @dirrm share/gnome/help/gedit/fr/figures
 @dirrm share/gnome/help/gedit/fr
 @dirrm share/gnome/help/gedit/eu/figures
@@ -438,22 +477,23 @@ share/locale/zh_TW/LC_MESSAGES/gedit.mo
 @dirrm share/gnome/help/gedit/C/figures
 @dirrm share/gnome/help/gedit/C
 @dirrm share/gnome/help/gedit
-@dirrm share/gnome/gedit-2/ui
-@dirrm share/gnome/gedit-2/taglist
-%%PYTHON%%@dirrm share/gnome/gedit-2/plugins/tools
-%%PYTHON%%@dirrm share/gnome/gedit-2/plugins/snippets
-@dirrm share/gnome/gedit-2/plugins/filebrowser
-@dirrm share/gnome/gedit-2/plugins
-@dirrm share/gnome/gedit-2/logo
-@dirrm share/gnome/gedit-2/icons
-@dirrm share/gnome/gedit-2/glade
-@dirrm share/gnome/gedit-2
+@dirrm share/gedit-2/ui
+@dirrm share/gedit-2/taglist
+%%PYTHON%%@dirrm share/gedit-2/plugins/tools
+%%PYTHON%%@dirrm share/gedit-2/plugins/snippets/lang
+%%PYTHON%%@dirrm share/gedit-2/plugins/snippets
+@dirrm share/gedit-2/plugins/filebrowser
+@dirrm share/gedit-2/plugins
+@dirrm share/gedit-2/logo
+@dirrm share/gedit-2/icons
+@dirrm share/gedit-2/glade
+@dirrm share/gedit-2
 @dirrm %%DOCSDIR%%
 %%PYTHON%%@dirrm lib/gedit-2/plugins/snippets
 %%PYTHON%%@dirrm lib/gedit-2/plugins/pythonconsole
 %%PYTHON%%@dirrm lib/gedit-2/plugins/externaltools
-@dirrm lib/gedit-2/plugins
-@dirrm lib/gedit-2
+@dirrmtry lib/gedit-2/plugins
+@dirrmtry lib/gedit-2
 @dirrm include/gedit-%%VERSION%%/gedit
 @dirrm include/gedit-%%VERSION%%
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@@ -484,3 +524,6 @@ share/locale/zh_TW/LC_MESSAGES/gedit.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/applications