Update MC-ports to GNOME 3.12.

Dragons beware! Although most of them should be sleeping.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19571 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 291 insertions, 363 deletions

diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index f360adeeb..fe8c14f4c 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -1,9 +1,9 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11/gnome-menus3/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#   $MCom: ports-experimental/trunk/x11/gnome-menus/Makefile 19199 2014-03-19 15:51:05Z gusi $
 
 PORTNAME=	gnome-menus
-PORTVERSION=	3.6.2
+PORTVERSION=	3.10.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -11,36 +11,27 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Implementation of the FreeDesktop Desktop Menu Spec
 
-USES=		gettext gmake pathfix pkgconfig
-USE_XZ=		yes
-USE_GNOME=	glib20 gnomehier gnomeprefix intlhack introspection:build \
-		ltverhack
-USE_AUTOTOOLS=	libtool
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME=	glib20 gnomehier gnomeprefix intlhack \
+		introspection:build
+GNU_CONFIGURE=	yes
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|applications.menu||' \
-		${WRKSRC}/layout/Makefile.in
-	@${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \
-		${WRKSRC}/util/test-menu-spec.c
-	@${REINPLACE_CMD} -e 's|/usr/share/gnome|${LOCALBASE}/share/gnome|g' \
-		${WRKSRC}/layout/applications.menu
 	@${SED} -e 's|/usr/local|${LOCALBASE}|g' \
 		< ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/simple-editor/GMenuSimpleEditor/menutreemodel.py
 	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
 	    	${WRKSRC}/util/Makefile.in
 
 post-install:
 	@${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/xdg/menus/ 
-	@${INSTALL_DATA} ${WRKSRC}/layout/applications.menu \
+	@${INSTALL_DATA} ${WRKSRC}/layout/gnome-applications.menu \
 		${STAGEDIR}${PREFIX}/etc/xdg/menus/gnome-applications.menu
 	@${INSTALL_DATA} ${WRKSRC}/KDE.directory \
 		${STAGEDIR}${PREFIX}/share/desktop-directories
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnome-menu-3.so.0
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnome-menu-3.so*
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo
index 98119ce84..e88dd1d98 100644
--- a/x11/gnome-menus/distinfo
+++ b/x11/gnome-menus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-menus-3.6.2.tar.xz) = f6cefb25ce3ca2a0e4cb43894089cc6079bf948230e99bc0e244b380fa84bf4f
-SIZE (gnome3/gnome-menus-3.6.2.tar.xz) = 423948
+SHA256 (gnome3/gnome-menus-3.10.1.tar.xz) = 46950aba274c1ad58234374fa9b235258650737307f3bc396af48eb983668a71
+SIZE (gnome3/gnome-menus-3.10.1.tar.xz) = 423052
diff --git a/x11/gnome-menus/files/patch-layout::applications.menu b/x11/gnome-menus/files/patch-layout::applications.menu
deleted file mode 100644
index 9a0719a38..000000000
--- a/x11/gnome-menus/files/patch-layout::applications.menu
+++ /dev/null
@@ -1,306 +0,0 @@
---- layout/applications.menu.orig	2012-07-10 01:54:30.000000000 +0000
-+++ layout/applications.menu	2013-03-30 10:41:37.311882486 +0000
-@@ -6,10 +6,9 @@
-   <Name>Applications</Name>
-   <Directory>X-GNOME-Menu-Applications.directory</Directory>
- 
--  <!-- Scan legacy dirs first, as later items take priority -->
--  <KDELegacyDirs/>
--  <LegacyDir>/etc/X11/applnk</LegacyDir>
--  <LegacyDir>/usr/share/gnome/apps</LegacyDir>
-+  <!-- Scan legacy dirs first, as later items take priority
-+  <LegacyDir>/etc/X11/applnk</LegacyDir> -->
-+  <LegacyDir>/usr/local/share/gnome/apps</LegacyDir>
- 
-   <!-- Read standard .directory and .desktop file locations -->
-   <DefaultAppDirs/>
-@@ -31,6 +30,8 @@
- 	     applications here -->
-         <Not><Category>Accessibility</Category></Not>
-         <Not><Category>System</Category></Not>
-+	<Not><Category>Qt</Category></Not>
-+	<Not><Category>KDE</Category></Not>
-       </And>
-     </Include>
-   </Menu> <!-- End Accessories -->
-@@ -43,6 +44,8 @@
-       <And>
-         <Category>Accessibility</Category>
-         <Not><Category>Settings</Category></Not>
-+	<Not><Category>Qt</Category></Not>
-+	<Not><Category>KDE</Category></Not>
-       </And>
-     </Include>
-   </Menu> <!-- End Accessibility -->
-@@ -54,6 +57,8 @@
-     <Include>
-       <And>
-         <Category>Development</Category>
-+        <Not><Category>Qt</Category></Not>
-+        <Not><Category>KDE</Category></Not>
-       </And>
-       <Filename>emacs.desktop</Filename>
-     </Include>
-@@ -66,6 +71,8 @@
-     <Include>
-       <And>
-         <Category>Education</Category>
-+	<Not><Category>Qt</Category></Not>
-+	<Not><Category>KDE</Category></Not>
-       </And>
-     </Include>
-   </Menu> <!-- End Education -->
-@@ -77,6 +84,8 @@
-     <Include>
-       <And>
-         <Category>Game</Category>
-+	<Not><Category>Qt</Category></Not>
-+	<Not><Category>KDE</Category></Not>
-       </And>
-     </Include>
-   </Menu> <!-- End Games -->
-@@ -88,6 +97,8 @@
-     <Include>
-       <And>
-         <Category>Graphics</Category>
-+	<Not><Category>Qt</Category></Not>
-+	<Not><Category>KDE</Category></Not>
-       </And>
-     </Include>
-   </Menu> <!-- End Graphics -->
-@@ -99,6 +110,8 @@
-     <Include>
-       <And>
-         <Category>Network</Category>
-+        <Not><Category>Qt</Category></Not>
-+        <Not><Category>KDE</Category></Not>
- 	<Not>
- 	  <Category>X-GNOME-WebApplication</Category>
- 	</Not>
-@@ -125,6 +138,8 @@
-     <Include>
-       <And>
-         <Category>AudioVideo</Category>
-+	<Not><Category>Qt</Category></Not>
-+	<Not><Category>KDE</Category></Not>
-       </And>
-     </Include>
-   </Menu>   <!-- End Multimedia -->
-@@ -136,6 +151,8 @@
-     <Include>
-       <And>
-         <Category>Office</Category>
-+	<Not><Category>Qt</Category></Not>
-+	<Not><Category>KDE</Category></Not>
-       </And>
-     </Include>
-   </Menu> <!-- End Office -->
-@@ -148,6 +165,8 @@
-       <And>
-         <Category>System</Category>
-         <Not><Category>Settings</Category></Not>
-+	<Not><Category>Qt</Category></Not>
-+	<Not><Category>KDE</Category></Not>
-       </And>
-     </Include>
-   </Menu>   <!-- End System Tools -->
-@@ -162,10 +181,199 @@
-         <Not><Category>Core</Category></Not>
-         <Not><Category>Screensaver</Category></Not>
-         <Not><Category>X-GNOME-Settings-Panel</Category></Not>
-+        <Not><Category>Qt</Category></Not>
-+        <Not><Category>KDE</Category></Not>
-       </And>
-     </Include>
-   </Menu> <!-- End Other -->
- 
-+  <!-- Read in overrides and child menus from applications-merged/ -->
-+  <DefaultMergeDirs/>
-+
-+  <!-- KDE -->
-+  <Menu>
-+    <KDELegacyDirs/>
-+    <Name>KDE</Name>
-+    <Directory>KDE.directory</Directory>
-+
-+    <!-- KAccessories submenu -->
-+    <Menu>
-+      <Name>Accessories</Name>
-+      <Directory>Accessories.directory</Directory>
-+      <Include>
-+        <And>
-+          <Or>
-+            <Category>Qt</Category>
-+            <Category>KDE</Category>
-+          </Or>
-+          <Category>Utility</Category>
-+          <Not>
-+            <Category>System</Category>
-+          </Not>
-+        </And>
-+      </Include>
-+    </Menu> <!-- End KAccessories -->
-+
-+    <!-- KAccessibility submenu -->
-+    <Menu>
-+      <Name>Accessibility</Name>
-+      <Directory>Accessibility.directory</Directory>
-+      <Include>
-+        <And>
-+          <Or>
-+            <Category>Qt</Category>
-+            <Category>KDE</Category>
-+          </Or>
-+          <Category>Accessibility</Category>
-+          <Not>
-+            <Category>Settings</Category>
-+          </Not>
-+        </And>
-+      </Include>
-+    </Menu> <!-- End KAccessibility -->
-+
-+    <!-- KDevelopment Tools -->
-+    <Menu>
-+      <Name>Development</Name>
-+      <Directory>Development.directory</Directory>
-+      <Include>
-+        <And>
-+          <Or>
-+            <Category>Qt</Category>
-+            <Category>KDE</Category>
-+          </Or>
-+          <Category>Development</Category>
-+        </And>
-+      </Include>
-+    </Menu> <!-- End KDevelopment Tools -->
-+
-+    <!-- KEducation -->
-+    <Menu>
-+     <Name>Education</Name>
-+      <Directory>Education.directory</Directory>
-+      <Include>
-+        <And>
-+          <Or>
-+            <Category>Qt</Category>
-+            <Category>KDE</Category>
-+          </Or>
-+          <Category>Education</Category>
-+        </And>
-+      </Include>
-+    </Menu> <!-- End KEducation -->
-+
-+    <!-- KGames -->
-+    <Menu>
-+      <Name>Games</Name>
-+      <Directory>Games.directory</Directory>
-+      <Include>
-+        <And>
-+          <Or>
-+           <Category>Qt</Category>
-+            <Category>KDE</Category>
-+          </Or>
-+          <Category>Game</Category>
-+        </And>
-+      </Include>
-+    </Menu> <!-- End KGames -->
-+
-+    <!-- KGraphics -->
-+    <Menu>
-+      <Name>Graphics</Name>
-+      <Directory>Graphics.directory</Directory>
-+      <Include>
-+        <And>
-+          <Or>
-+            <Category>Qt</Category>
-+            <Category>KDE</Category>
-+          </Or>
-+          <Category>Graphics</Category>
-+        </And>
-+      </Include>
-+    </Menu> <!-- End KGraphics -->
-+
-+    <!-- KInternet -->
-+    <Menu>
-+      <Name>Internet</Name>
-+      <Directory>Internet.directory</Directory>
-+      <Include>
-+        <And>
-+          <Or>
-+            <Category>Qt</Category>
-+            <Category>KDE</Category>
-+          </Or>
-+          <Category>Network</Category>
-+        </And>
-+      </Include>
-+    </Menu> <!-- End KInternet -->
-+
-+    <!-- KMultimedia -->
-+    <Menu>
-+      <Name>Multimedia</Name>
-+      <Directory>Multimedia.directory</Directory>
-+      <Include>
-+        <And>
-+          <Or>
-+            <Category>Qt</Category>
-+            <Category>KDE</Category>
-+          </Or>
-+          <Category>AudioVideo</Category>
-+        </And>
-+      </Include>
-+    </Menu> <!-- End KMultimedia -->
-+
-+    <!-- KOffice -->
-+    <Menu>
-+      <Name>Office</Name>
-+      <Directory>Office.directory</Directory>
-+      <Include>
-+        <And>
-+          <Or>
-+            <Category>Qt</Category>
-+            <Category>KDE</Category>
-+          </Or>
-+          <Or>
-+            <Category>Office</Category>
-+          </Or>
-+        </And>
-+      </Include>
-+    </Menu><!-- End KOffice -->
-+
-+    <!-- KSystem Tools-->
-+    <Menu>
-+      <Name>System</Name>
-+      <Directory>System-Tools.directory</Directory>
-+      <Include>
-+        <And>
-+          <Or>
-+            <Category>Qt</Category>
-+            <Category>KDE</Category>
-+          </Or>
-+          <Category>System</Category>
-+          <Not><Category>Settings</Category></Not>
-+        </And>
-+      </Include>
-+    </Menu>   <!-- End KSystem Tools -->
-+
-+    <!-- KOther -->
-+    <Menu>
-+      <Name>Other</Name>
-+      <Directory>Other.directory</Directory>
-+      <OnlyUnallocated/>
-+      <Include>
-+        <And>
-+          <Or>
-+            <Category>Qt</Category>
-+            <Category>KDE</Category>
-+          </Or>
-+          <Category>Application</Category>
-+          <Not><Category>Core</Category></Not>
-+          <Not><Category>Settings</Category></Not>
-+        </And>
-+      </Include>
-+    </Menu> <!-- End KOther -->
-+  </Menu> <!-- KDE -->
-+
-    <Layout>
-      <Merge type="menus" />
-      <Menuname>Other</Menuname>
diff --git a/x11/gnome-menus/files/patch-layout_gnome-applications.menu b/x11/gnome-menus/files/patch-layout_gnome-applications.menu
new file mode 100644
index 000000000..d18b8d415
--- /dev/null
+++ b/x11/gnome-menus/files/patch-layout_gnome-applications.menu
@@ -0,0 +1,273 @@
+--- layout/gnome-applications.menu.orig	2013-10-15 13:05:34.000000000 +0000
++++ layout/gnome-applications.menu	2014-03-11 17:10:07.109670897 +0000
+@@ -6,10 +6,9 @@
+   <Name>Applications</Name>
+   <Directory>X-GNOME-Menu-Applications.directory</Directory>
+ 
+-  <!-- Scan legacy dirs first, as later items take priority -->
+-  <KDELegacyDirs/>
+-  <LegacyDir>/etc/X11/applnk</LegacyDir>
+-  <LegacyDir>/usr/share/gnome/apps</LegacyDir>
++  <!-- Scan legacy dirs first, as later items take priority
++  <LegacyDir>/etc/X11/applnk</LegacyDir> -->
++  <LegacyDir>/usr/local/share/gnome/apps</LegacyDir>
+ 
+   <!-- Read standard .directory and .desktop file locations -->
+   <DefaultAppDirs/>
+@@ -32,6 +31,8 @@
+         <Not><Category>Accessibility</Category></Not>
+         <Not><Category>System</Category></Not>
+         <Not><Category>X-GNOME-Utilities</Category></Not>
++	<Not><Category>Qt</Category></Not>
++        <Not><Category>KDE</Category></Not>
+       </And>
+     </Include>
+     <Exclude>
+@@ -68,6 +69,8 @@
+       <And>
+         <Category>Accessibility</Category>
+         <Not><Category>Settings</Category></Not>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
+       </And>
+     </Include>
+ 
+@@ -84,6 +87,8 @@
+     <Include>
+       <And>
+         <Category>Development</Category>
++        <Not><Category>Qt</Category></Not>
++        <Not><Category>KDE</Category></Not>
+       </And>
+       <Filename>emacs.desktop</Filename>
+     </Include>
+@@ -105,6 +110,8 @@
+     <Include>
+       <And>
+         <Category>Education</Category>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Education -->
+@@ -116,6 +123,8 @@
+     <Include>
+       <And>
+         <Category>Game</Category>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Games -->
+@@ -130,6 +139,8 @@
+         <Not><Filename>eog.desktop</Filename></Not>
+         <Not><Filename>gnome-eog.desktop</Filename></Not>
+         <Not><Filename>evince.desktop</Filename></Not>
++        <Not><Category>Qt</Category></Not>
++        <Not><Category>KDE</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Graphics -->
+@@ -173,6 +184,8 @@
+     <Include>
+       <And>
+         <Category>AudioVideo</Category>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
+       </And>
+     </Include>
+   </Menu>   <!-- End Multimedia -->
+@@ -316,6 +329,193 @@
+     </Include>
+   </Menu> <!-- End Other -->
+ 
++   <!-- Read in overrides and child menus from applications-merged/ -->
++   <DefaultMergeDirs/>
++ 
++   <!-- KDE -->
++   <Menu>
++     <KDELegacyDirs/>
++     <Name>KDE</Name>
++     <Directory>KDE.directory</Directory>
++ 
++     <!-- KAccessories submenu -->
++     <Menu>
++       <Name>Accessories</Name>
++       <Directory>Accessories.directory</Directory>
++       <Include>
++         <And>
++           <Or>
++             <Category>Qt</Category>
++             <Category>KDE</Category>
++           </Or>
++           <Category>Utility</Category>
++           <Not>
++             <Category>System</Category>
++           </Not>
++         </And>
++       </Include>
++     </Menu> <!-- End KAccessories -->
++ 
++     <!-- KAccessibility submenu -->
++     <Menu>
++       <Name>Accessibility</Name>
++       <Directory>Accessibility.directory</Directory>
++       <Include>
++         <And>
++           <Or>
++             <Category>Qt</Category>
++             <Category>KDE</Category>
++           </Or>
++           <Category>Accessibility</Category>
++           <Not>
++             <Category>Settings</Category>
++           </Not>
++         </And>
++       </Include>
++     </Menu> <!-- End KAccessibility -->
++ 
++     <!-- KDevelopment Tools -->
++     <Menu>
++       <Name>Development</Name>
++       <Directory>Development.directory</Directory>
++       <Include>
++         <And>
++           <Or>
++             <Category>Qt</Category>
++             <Category>KDE</Category>
++           </Or>
++           <Category>Development</Category>
++         </And>
++       </Include>
++     </Menu> <!-- End KDevelopment Tools -->
++ 
++     <!-- KEducation -->
++     <Menu>
++      <Name>Education</Name>
++       <Directory>Education.directory</Directory>
++       <Include>
++         <And>
++           <Or>
++             <Category>Qt</Category>
++             <Category>KDE</Category>
++           </Or>
++           <Category>Education</Category>
++         </And>
++       </Include>
++     </Menu> <!-- End KEducation -->
++ 
++     <!-- KGames -->
++     <Menu>
++       <Name>Games</Name>
++       <Directory>Games.directory</Directory>
++       <Include>
++         <And>
++           <Or>
++            <Category>Qt</Category>
++             <Category>KDE</Category>
++           </Or>
++           <Category>Game</Category>
++         </And>
++       </Include>
++     </Menu> <!-- End KGames -->
++ 
++     <!-- KGraphics -->
++     <Menu>
++       <Name>Graphics</Name>
++       <Directory>Graphics.directory</Directory>
++       <Include>
++         <And>
++           <Or>
++             <Category>Qt</Category>
++             <Category>KDE</Category>
++           </Or>
++           <Category>Graphics</Category>
++         </And>
++       </Include>
++     </Menu> <!-- End KGraphics -->
++ 
++     <!-- KInternet -->
++     <Menu>
++       <Name>Internet</Name>
++       <Directory>Internet.directory</Directory>
++       <Include>
++         <And>
++           <Or>
++             <Category>Qt</Category>
++             <Category>KDE</Category>
++           </Or>
++           <Category>Network</Category>
++         </And>
++       </Include>
++     </Menu> <!-- End KInternet -->
++ 
++     <!-- KMultimedia -->
++     <Menu>
++       <Name>Multimedia</Name>
++       <Directory>Multimedia.directory</Directory>
++       <Include>
++         <And>
++           <Or>
++             <Category>Qt</Category>
++             <Category>KDE</Category>
++           </Or>
++           <Category>AudioVideo</Category>
++         </And>
++       </Include>
++     </Menu> <!-- End KMultimedia -->
++ 
++     <!-- KOffice -->
++     <Menu>
++       <Name>Office</Name>
++       <Directory>Office.directory</Directory>
++       <Include>
++         <And>
++           <Or>
++             <Category>Qt</Category>
++             <Category>KDE</Category>
++           </Or>
++           <Or>
++             <Category>Office</Category>
++           </Or>
++         </And>
++       </Include>
++     </Menu><!-- End KOffice -->
++ 
++     <!-- KSystem Tools-->
++     <Menu>
++       <Name>System</Name>
++       <Directory>System-Tools.directory</Directory>
++       <Include>
++         <And>
++           <Or>
++             <Category>Qt</Category>
++             <Category>KDE</Category>
++           </Or>
++           <Category>System</Category>
++           <Not><Category>Settings</Category></Not>
++         </And>
++       </Include>
++     </Menu>   <!-- End KSystem Tools -->
++ 
++     <!-- KOther -->
++     <Menu>
++       <Name>Other</Name>
++       <Directory>Other.directory</Directory>
++       <OnlyUnallocated/>
++       <Include>
++         <And>
++           <Or>
++             <Category>Qt</Category>
++             <Category>KDE</Category>
++           </Or>
++           <Category>Application</Category>
++           <Not><Category>Core</Category></Not>
++           <Not><Category>Settings</Category></Not>
++         </And>
++       </Include>
++     </Menu> <!-- End KOther -->
++   </Menu> <!-- KDE -->
++
+    <Layout>
+      <Merge type="menus" />
+      <Menuname>Other</Menuname>
diff --git a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
deleted file mode 100644
index d57d4f523..000000000
--- a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- simple-editor/GMenuSimpleEditor/menutreemodel.py.orig	2011-08-16 14:04:56.000000000 +0200
-+++ simple-editor/GMenuSimpleEditor/menutreemodel.py	2011-09-17 13:01:18.000000000 +0200
-@@ -29,7 +29,7 @@ def lookup_system_menu_file (menu_file):
-     if os.environ.has_key ("XDG_CONFIG_DIRS"):
-         conf_dirs = os.environ["XDG_CONFIG_DIRS"]
-     if not conf_dirs:
--        conf_dirs = "/etc/xdg"
-+	conf_dirs = "%%LOCALBASE%%/etc/xdg"
- 
-     for conf_dir in conf_dirs.split (":"):
-         menu_file_path = os.path.join (conf_dir, "menus", menu_file)
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
index 0cf3d0476..a7614681d 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -1,4 +1,3 @@
-bin/gmenu-simple-editor
 etc/xdg/menus/gnome-applications.menu
 include/gnome-menus-3.0/gmenu-tree.h
 lib/girepository-1.0/GMenu-3.0.typelib
@@ -6,45 +5,26 @@ lib/libgnome-menu-3.a
 lib/libgnome-menu-3.la
 lib/libgnome-menu-3.so
 lib/libgnome-menu-3.so.0
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/__init__.py
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/__init__.pyc
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/__init__.pyo
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/config.py
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/config.pyc
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/config.pyo
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/main.py
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/main.pyc
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/main.pyo
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/maindialog.py
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/maindialog.pyc
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/maindialog.pyo
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menufilewriter.py
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menufilewriter.pyc
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menufilewriter.pyo
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menutreemodel.py
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menutreemodel.pyc
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menutreemodel.pyo
+lib/libgnome-menu-3.so.0.0.1
 libdata/pkgconfig/libgnome-menu-3.0.pc
-share/applications/gmenu-simple-editor.desktop
 share/desktop-directories/AudioVideo.directory
 share/desktop-directories/Development.directory
 share/desktop-directories/Education.directory
 share/desktop-directories/Game.directory
 share/desktop-directories/Graphics.directory
-share/desktop-directories/Hardware.directory
 share/desktop-directories/KDE.directory
 share/desktop-directories/Network.directory
 share/desktop-directories/Office.directory
-share/desktop-directories/Personal.directory
 share/desktop-directories/System-Tools.directory
-share/desktop-directories/System.directory
 share/desktop-directories/Utility-Accessibility.directory
 share/desktop-directories/Utility.directory
 share/desktop-directories/X-GNOME-Menu-Applications.directory
 share/desktop-directories/X-GNOME-Other.directory
+share/desktop-directories/X-GNOME-Sundry.directory
+share/desktop-directories/X-GNOME-SystemSettings.directory
+share/desktop-directories/X-GNOME-Utilities.directory
 share/desktop-directories/X-GNOME-WebApplications.directory
 share/gir-1.0/GMenu-3.0.gir
-share/gnome-menus/ui/gmenu-simple-editor.ui
 share/locale/af/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/an/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/ar/LC_MESSAGES/gnome-menus-3.0.mo
@@ -90,6 +70,7 @@ share/locale/hi/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/hr/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/hu/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/hy/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/ia/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/id/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/ig/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/io/LC_MESSAGES/gnome-menus-3.0.mo
@@ -139,6 +120,7 @@ share/locale/sv/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/szl/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/ta/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/te/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/tg/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/th/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/tr/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/ug/LC_MESSAGES/gnome-menus-3.0.mo
@@ -151,10 +133,7 @@ share/locale/zh_CN/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/zu/LC_MESSAGES/gnome-menus-3.0.mo
-@dirrm share/gnome-menus/ui
-@dirrm share/gnome-menus
 @dirrmtry share/desktop-directories
-@dirrm %%PYTHON_SITELIBDIR%%/GMenuSimpleEditor
 @dirrm include/gnome-menus-3.0
 @dirrmtry etc/xdg/menus
 @dirrmtry share/locale/zu/LC_MESSAGES
@@ -207,6 +186,8 @@ share/locale/zu/LC_MESSAGES/gnome-menus-3.0.mo
 @dirrmtry share/locale/io
 @dirrmtry share/locale/ig/LC_MESSAGES
 @dirrmtry share/locale/ig
+@dirrmtry share/locale/ia/LC_MESSAGES
+@dirrmtry share/locale/ia
 @dirrmtry share/locale/hy/LC_MESSAGES
 @dirrmtry share/locale/hy
 @dirrmtry share/locale/ha/LC_MESSAGES