packages: cinnamon/cinnamon-favourite-apps-firefox.patch (NEW), cinnamon/ci...
glen
glen at pld-linux.org
Sat Apr 28 23:28:32 CEST 2012
Author: glen Date: Sat Apr 28 21:28:32 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- new, based on src.rpm:
http://repos.fedorapeople.org/repos/leigh123linux/cinnamon/fedora-17/SRPMS/cinnamon-1.4.0-3.fc17.src.rpm
---- Files affected:
packages/cinnamon:
cinnamon-favourite-apps-firefox.patch (NONE -> 1.1) (NEW), cinnamon.desktop (NONE -> 1.1) (NEW), cinnamon.session (NONE -> 1.1) (NEW), cinnamon.spec (NONE -> 1.1) (NEW), gir_bluetooth.patch (NONE -> 1.1) (NEW), logout_theme.patch (NONE -> 1.1) (NEW), menu.patch (NONE -> 1.1) (NEW), menu.png (NONE -> 1.1) (NEW), settings.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/cinnamon/cinnamon-favourite-apps-firefox.patch
diff -u /dev/null packages/cinnamon/cinnamon-favourite-apps-firefox.patch:1.1
--- /dev/null Sat Apr 28 23:28:32 2012
+++ packages/cinnamon/cinnamon-favourite-apps-firefox.patch Sat Apr 28 23:28:26 2012
@@ -0,0 +1,20 @@
+--- cinnamon-1.1.3/data/org.cinnamon.gschema1.xml.in 2012-01-02 12:03:30.000000000 +0000
++++ cinnamon-1.1.3/data/org.cinnamon.gschema.xml.in 2012-01-02 16:41:39.242419968 +0000
+@@ -231,7 +231,7 @@
+ </key>
+
+ <key name="panel-launchers" type="as">
+- <default>[ 'firefox.desktop', 'gnome-terminal.desktop', 'nautilus.desktop']</default>
++ <default>[ 'mozilla-firefox.desktop', 'gnome-terminal.desktop', 'nautilus.desktop']</default>
+ <_summary>Desktop files of the applications to put in the panel launchers applet</_summary>
+ <_description>
+ Cinnamon allows to show applications launchers on the panel.
+@@ -251,7 +251,7 @@
+ </key>
+
+ <key name="favorite-apps" type="as">
+- <default>[ 'firefox.desktop', 'mintInstall.desktop', 'cinnamon-settings.desktop', 'xchat.desktop', 'gnome-terminal.desktop', 'nautilus.desktop' ]</default>
++ <default>[ 'cinnamon-settings.desktop', 'mozilla-firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]</default>
+ <_summary>List of desktop file IDs for favorite applications</_summary>
+ <_description>
+ The applications corresponding to these identifiers
================================================================
Index: packages/cinnamon/cinnamon.desktop
diff -u /dev/null packages/cinnamon/cinnamon.desktop:1.1
--- /dev/null Sat Apr 28 23:28:32 2012
+++ packages/cinnamon/cinnamon.desktop Sat Apr 28 23:28:26 2012
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Cinnamon
+Name[en_GB]=Cinnamon
+Comment=This session logs you into Cinnamon
+Comment[en_GB]=This session logs you into Cinnamon
+Exec=/usr/bin/gnome-session --session=cinnamon
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application
================================================================
Index: packages/cinnamon/cinnamon.session
diff -u /dev/null packages/cinnamon/cinnamon.session:1.1
--- /dev/null Sat Apr 28 23:28:32 2012
+++ packages/cinnamon/cinnamon.session Sat Apr 28 23:28:26 2012
@@ -0,0 +1,6 @@
+[GNOME Session]
+Name=Cinnamon
+RequiredComponents=cinnamon;gnome-settings-daemon;
+IsRunnableHelper=/usr/libexec/gnome-session-check-accelerated
+FallbackSession=gnome-fallback
+DesktopName=GNOME
================================================================
Index: packages/cinnamon/cinnamon.spec
diff -u /dev/null packages/cinnamon/cinnamon.spec:1.1
--- /dev/null Sat Apr 28 23:28:32 2012
+++ packages/cinnamon/cinnamon.spec Sat Apr 28 23:28:26 2012
@@ -0,0 +1,274 @@
+# $Revision$, $Date$
+%define _internel_version a8b1a03
+%define clutter_version 1.4.0
+%define gobject_introspection_version 0.10.1
+%define muffin_version 1.0.2
+%define eds_version 2.91.6
+%define json_glib_version 0.13.2
+Summary: Window management and application launching for GNOME
+Name: cinnamon
+Version: 1.4.0
+Release: 0.2
+License: GPL v2+
+Group: X11/Applications
+URL: http://cinnamon.linuxmint.com/
+Source0: https://github.com/linuxmint/Cinnamon/tarball/1.4/%{name}-%{version}.tar.gz
+# Source0-md5: 2afb656fb8834571c902ba74f1f5116c
+Source1: %{name}.desktop
+Source2: %{name}.session
+Source3: menu.png
+# Replace mint favorites with fedora gnome-shell defaults
+Patch0: %{name}-favourite-apps-firefox.patch
+Patch1: menu.patch
+Patch2: settings.patch
+Patch3: logout_theme.patch
+Patch4: gir_bluetooth.patch
+BuildRequires: GConf2
+BuildRequires: NetworkManager-devel
+BuildRequires: ca-certificates
+BuildRequires: clutter-devel >= %{clutter_version}
+BuildRequires: dbus-glib-devel
+BuildRequires: desktop-file-utils
+BuildRequires: evolution-data-server-devel >= %{eds_version}
+BuildRequires: gjs-devel >= 0.7.14-6
+BuildRequires: glib2-devel
+BuildRequires: gnome-desktop-devel
+BuildRequires: gnome-menus-devel >= 3.1.5-2.fc16
+BuildRequires: gobject-introspection >= %{gobject_introspection_version}
+BuildRequires: json-glib-devel >= %{json_glib_version}
+BuildRequires: polkit-devel
+BuildRequires: telepathy-glib-devel
+BuildRequires: telepathy-logger-devel >= 0.2.6
+BuildRequires: udev-glib-devel
+BuildRequires: upower-devel
+# for screencast recorder functionality
+BuildRequires: folks-devel
+BuildRequires: gstreamer-devel
+BuildRequires: gtk+3-devel
+BuildRequires: intltool
+BuildRequires: libcanberra-devel
+BuildRequires: libcroco-devel
+# for barriers
+BuildRequires: xorg-lib-libXfixes-devel >= 5.0
+# used in unused BigThemeImage
+BuildRequires: librsvg-devel
+BuildRequires: muffin-devel >= %{muffin_version}
+BuildRequires: pulseaudio-devel
+%ifnarch s390 s390x
+#BuildRequires: gnome-bluetooth >= 2.91
+#BuildRequires: gnome-bluetooth-libs-devel >= 2.91
+%endif
+# Bootstrap requirements
+BuildRequires: gnome-common
+BuildRequires: gtk-doc
+Requires: gnome-menus >= 3.0.0-2
+# wrapper script uses to restart old GNOME session if run --replace
+# from the command line
+Requires: gobject-introspection >= %{gobject_introspection_version}
+# needed for loading SVG's via gdk-pixbuf
+Requires: librsvg
+# needed as it is now split from Clutter
+Requires: json-glib >= %{json_glib_version}
+# might be still be needed.
+Requires: muffin >= %{muffin_version}
+Requires: polkit >= 0.100
+Requires: upower
+# needed for session files
+Requires: gnome-session
+# needed for schemas
+Requires: at-spi2-atk
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
+# needed for on-screen keyboard
+Requires: caribou
+# needed for settings
+Requires: python-dbus
+Requires: python-pygobject
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+Cinnamon is a Linux desktop which provides advanced innovative
+features and a traditional user experience.
+
+The desktop layout is similar to Gnome 2.
+
+The underlying technology is forked from Gnome Shell.
+
+The emphasis is put on making users feel at home and providing them
+with an easy to use and comfortable desktop experience.
+
+%prep
+%setup -q -n linuxmint-Cinnamon-%{_internel_version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+# cleanup backups after patching
+find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+
+# make changes for settings move to %{_datadir}
+mv files%{_prefix}/lib/cinnamon-settings files%{_datadir}
+sed -i -e 's@/usr/lib@/usr/share at g' files/usr/bin/cinnamon-settings \
+ files%{_datadir}/cinnamon-settings/cinnamon-settings.py
+
+# make changes for menu-editor move to %{_datadir}
+mv files%{_prefix}/lib/cinnamon-menu-editor files%{_datadir}
+rm -rf files%{_prefix}/lib
+sed -i -e 's@/usr/lib@/usr/share at g' files/usr/bin/cinnamon-menu-editor \
+ files%{_datadir}/cinnamon-menu-editor/Alacarte/MainWindow.py
+
+# replace menu image
+rm -f data/theme/menu.png
+cp %{SOURCE3} data/theme/menu.png
+
+# remove and replace the session files as they don't work with fedora (can't be bothered to patch it)
+rm -f files%{_bindir}/gnome-session-cinnamon \
+ files%{_datadir}/xsessions/cinnamon.desktop \
+ files%{_datadir}/gnome-session/sessions/cinnamon.session
+cp %{SOURCE1} files%{_datadir}/xsessions/
+cp %{SOURCE2} files%{_datadir}/gnome-session/sessions/
+
+# files replaced with fedora files
+rm -f files%{_datadir}/desktop-directories/cinnamon-menu-applications.directory \
+ files%{_datadir}/desktop-directories/cinnamon-utility.directory \
+ files%{_datadir}/desktop-directories/cinnamon-utility-accessibility.directory \
+ files%{_datadir}/desktop-directories/cinnamon-development.directory \
+ files%{_datadir}/desktop-directories/cinnamon-education.directory \
+ files%{_datadir}/desktop-directories/cinnamon-game.directory \
+ files%{_datadir}/desktop-directories/cinnamon-graphics.directory \
+ files%{_datadir}/desktop-directories/cinnamon-network.directory \
+ files%{_datadir}/desktop-directories/cinnamon-audio-video.directory \
+ files%{_datadir}/desktop-directories/cinnamon-office.directory \
+ files%{_datadir}/desktop-directories/cinnamon-system-tools.directory \
+ files%{_datadir}/desktop-directories/cinnamon-other.directory
+# adjust font size
+sed -i -e 's,font-size: 9.5pt,font-size: 10pt,g' data/theme/cinnamon.css
+sed -i -e 's,font-size: 9pt,font-size: 10pt,g' data/theme/cinnamon.css
+sed -i -e 's,font-size: 8.5pt,font-size: 10pt,g' data/theme/cinnamon.css
+sed -i -e 's,font-size: 8pt,font-size: 10pt,g' data/theme/cinnamon.css
+sed -i -e 's,font-size: 7.5pt,font-size: 10pt,g' data/theme/cinnamon.css
+
+rm -rf debian
+rm configure
+
+%build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+#CFLAGS="%{rpmcflags} -Wno-error=deprecated-declarations"
+%configure \
+ --with-ca-certificates=/etc/certs/ca-certificates.crt \
+ --disable-static \
+ --enable-compile-warnings=yes \
+
+%{__make} V=1
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__make} install \
+ GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
+ DESTDIR=$RPM_BUILD_ROOT
+
+# Remove .la file
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/cinnamon/libcinnamon.la
+
+# Remove firefox plugin
+rm -rf $RPM_BUILD_ROOT%{_libdir}/mozilla
+
+desktop-file-install \
+ --add-category="Utility" \
+ --remove-category="DesktopSettings" \
+ --remove-key="Encoding" \
+ --add-only-show-in="GNOME" \
+ --delete-original \
+ --dir=$RPM_BUILD_ROOT%{_desktopdir} \
+ $RPM_BUILD_ROOT%{_desktopdir}/cinnamon-settings.desktop
+
+desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/cinnamon.desktop
+
+#%find_lang %{name}
+touch %{name}.lang
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%gconf_schema_install cinnamon.schemas
+
+%preun
+%gconf_schema_uninstall cinnamon.schemas
+
+%postun
+%glib_compile_schemas
+
+%posttrans
+%glib_compile_schemas
+
+%files -f %{name}.lang
+%defattr(644,root,root,755)
+%doc README
+%attr(755,root,root) %{_bindir}/cinnamon
+%attr(755,root,root) %{_bindir}/cinnamon-settings
+%attr(755,root,root) %{_bindir}/cinnamon-extension-tool
+%{_sysconfdir}/gconf/schemas/cinnamon.schemas
+%{_sysconfdir}/xdg/menus/cinnamon-applications.menu
+%{_sysconfdir}/xdg/menus/cinnamon-settings.menu
+%{_datadir}/desktop-directories/cinnamon-*.directory
+%{_datadir}/glib-2.0/schemas/*.xml
+%{_desktopdir}/cinnamon.desktop
+%{_desktopdir}/cinnamon-settings.desktop
+%{_datadir}/xsessions/cinnamon.desktop
+%{_datadir}/gnome-session/sessions/cinnamon.session
+
+%dir %{_datadir}/cinnamon
+%{_datadir}/cinnamon/applets
+%{_datadir}/cinnamon/js
+%{_datadir}/cinnamon/search_providers
+%{_datadir}/cinnamon/shaders
+%{_datadir}/cinnamon/theme
+%attr(755,root,root) %{_libdir}/cinnamon/libcinnamon.so
+
+%dir %{_datadir}/cinnamon-settings
+%{_datadir}/cinnamon-settings/cinnamon-settings.py
+%{_datadir}/cinnamon-settings/cinnamon-settings.ui
+%{_datadir}/cinnamon-settings/data
+
+%{_datadir}/dbus-1/services/org.Cinnamon.CalendarServer.service
+%{_datadir}/dbus-1/services/org.Cinnamon.HotplugSniffer.service
+
+%dir %{_libdir}/cinnamon
+%{_libdir}/cinnamon/Cinnamon-0.1.typelib
+%{_libdir}/cinnamon/Gvc-1.0.typelib
+%{_libdir}/cinnamon/St-1.0.typelib
+%attr(755,root,root) %{_libdir}/cinnamon-calendar-server
+%attr(755,root,root) %{_libdir}/cinnamon-perf-helper
+%attr(755,root,root) %{_libdir}/cinnamon-hotplug-sniffer
+%{_mandir}/man1/%{name}.1*
+
+# i wonder why excluded?
+#%exclude %{_bindir}/cinnamon-menu-editor
+#%exclude %{_datadir}/cinnamon-menu-editor/
+%attr(755,root,root) %{_bindir}/cinnamon-menu-editor
+%dir %{_datadir}/cinnamon-menu-editor
+%dir %{_datadir}/cinnamon-menu-editor/Alacarte
+%{_datadir}/cinnamon-menu-editor/Alacarte/MainWindow.py
+%{_datadir}/cinnamon-menu-editor/Alacarte/MenuEditor.py
+%{_datadir}/cinnamon-menu-editor/Alacarte/__init__.py
+%{_datadir}/cinnamon-menu-editor/Alacarte/config.py
+%{_datadir}/cinnamon-menu-editor/Alacarte/util.py
+%{_datadir}/cinnamon-menu-editor/cinnamon-menu-editor.ui
+
+%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* %{date} PLD Team <feedback at pld-linux.org>
+All persons listed below can be reached at <cvs_login>@pld-linux.org
+
+$Log$
+Revision 1.1 2012/04/28 21:28:26 glen
+- new, based on src.rpm:
+ http://repos.fedorapeople.org/repos/leigh123linux/cinnamon/fedora-17/SRPMS/cinnamon-1.4.0-3.fc17.src.rpm
================================================================
Index: packages/cinnamon/gir_bluetooth.patch
diff -u /dev/null packages/cinnamon/gir_bluetooth.patch:1.1
--- /dev/null Sat Apr 28 23:28:32 2012
+++ packages/cinnamon/gir_bluetooth.patch Sat Apr 28 23:28:26 2012
@@ -0,0 +1,21 @@
+--- a/configure.ac 2012-03-13 16:15:41.000000000 +0000
++++ b/configure.ac 2012-03-31 08:39:24.489010332 +0100
+@@ -130,6 +130,7 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >=
+ [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
+ BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
+ AC_SUBST([BLUETOOTH_LIBS],["$BLUETOOTH_LIBS"])
++ AC_SUBST([BLUETOOTH_DIR],["$BLUETOOTH_DIR"])
+ AC_DEFINE_UNQUOTED([BLUETOOTH_DIR],["$BLUETOOTH_DIR"],[Path to installed GnomeBluetooth typelib and library])
+ AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
+ AC_SUBST([HAVE_BLUETOOTH],[1])
+--- a/src/Makefile.am 2012-03-13 16:15:41.000000000 +0000
++++ b/src/Makefile.am 2012-03-31 08:41:42.958012667 +0100
+@@ -277,7 +277,7 @@ Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_
+ Cinnamon_0_1_gir_LIBS = libcinnamon.la
+ Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)
+ Cinnamon_0_1_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/St-1.0.gir \
+- --add-include-path=$(MUFFIN_GIR_DIR)
++ --add-include-path=$(MUFFIN_GIR_DIR) $(if $(BLUETOOTH_DIR),-L $(BLUETOOTH_DIR),)
+ INTROSPECTION_GIRS += Cinnamon-0.1.gir
+ CLEANFILES += Cinnamon-0.1.gir
+
================================================================
Index: packages/cinnamon/logout_theme.patch
diff -u /dev/null packages/cinnamon/logout_theme.patch:1.1
--- /dev/null Sat Apr 28 23:28:32 2012
+++ packages/cinnamon/logout_theme.patch Sat Apr 28 23:28:26 2012
@@ -0,0 +1,113 @@
+--- a/data/theme/cinnamon.css 2012-03-13 19:58:16.000000000 +0000
++++ b/data/theme/cinnamon.css 2012-03-14 18:41:22.097504815 +0000
+@@ -919,7 +919,7 @@ StTooltip StLabel {
+ .end-session-dialog-subject {
+ font-size: 12pt;
+ font-weight: bold;
+- color: #666666;
++ color: #cccccc;
+ padding-top: 10px;
+ padding-left: 17px;
+ padding-bottom: 30px;
+--- a/js/ui/endSessionDialog.js 2012-03-13 16:15:41.000000000 +0000
++++ b/js/ui/endSessionDialog.js 2012-03-14 18:34:32.676510248 +0000
+@@ -29,8 +29,9 @@ const Gtk = imports.gi.Gtk;
+ const Pango = imports.gi.Pango;
+ const St = imports.gi.St;
+ const Cinnamon = imports.gi.Cinnamon;
+-
+-const GnomeSession = imports.misc.gnomeSession
++const UPowerGlib = imports.gi.UPowerGlib;
++const ScreenSaver = imports.misc.screenSaver;
++const GnomeSession = imports.misc.gnomeSession;
+ const ModalDialog = imports.ui.modalDialog;
+ const Tweener = imports.ui.tweener;
+
+@@ -83,7 +84,11 @@ const shutdownDialogContent = {
+ seconds).format(seconds);
+ },
+ endDescription: _("Powering off the system."),
+- confirmButtons: [{ signal: 'ConfirmedReboot',
++ confirmButtons: [{ signal: 'ConfirmedSuspend',
++ label: _("Suspend") },
++ { signal: 'ConfirmedHibernate',
++ label: _("Hibernate") },
++ { signal: 'ConfirmedReboot',
+ label: _("Restart") },
+ { signal: 'ConfirmedShutdown',
+ label: _("Power Off") }],
+@@ -251,6 +256,9 @@ EndSessionDialog.prototype = {
+ _init: function() {
+ ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'end-session-dialog' });
+
++ this._upClient = new UPowerGlib.Client();
++ this._screenSaverProxy = new ScreenSaver.ScreenSaverProxy();
++
+ this._user = AccountsService.UserManager.get_default().get_user(GLib.get_user_name());
+
+ this._secondsLeft = 0;
+@@ -427,9 +435,27 @@ EndSessionDialog.prototype = {
+ for (let i = 0; i < dialogContent.confirmButtons.length; i++) {
+ let signal = dialogContent.confirmButtons[i].signal;
+ let label = dialogContent.confirmButtons[i].label;
+- buttons.push({ action: Lang.bind(this, function() {
+- this._confirm(signal);
+- }),
++ let action = null;
++
++ switch (signal) {
++ case 'ConfirmedSuspend':
++ if (this._upClient.get_can_suspend())
++ action = Lang.bind(this, this._doSuspend);
++ break;
++ case 'ConfirmedHibernate':
++ if (this._upClient.get_can_hibernate())
++ action = Lang.bind(this, this._doHibernate);
++ break;
++ default:
++ action = Lang.bind(this, function() {
++ this._confirm(signal);
++ });
++ }
++
++ if (action == null)
++ continue;
++
++ buttons.push({ action: action,
+ label: label });
+ }
+
+@@ -459,6 +485,22 @@ EndSessionDialog.prototype = {
+ signal, '', []);
+ },
+
++ _doSuspend: function() {
++ this.cancel(); //cancel auto-shutdown and close dialog
++
++ this._screenSaverProxy.LockRemote(Lang.bind(this, function() {
++ this._upClient.suspend_sync(null);
++ }));
++ },
++
++ _doHibernate: function() {
++ this.cancel(); //cancel auto-shutdown and close dialog
++
++ this._screenSaverProxy.LockRemote(Lang.bind(this, function() {
++ this._upClient.hibernate_sync(null);
++ }));
++ },
++
+ _onOpened: function() {
+ if (this._inhibitors.length == 0)
+ this._startTimer();
+--- a/src/main.c 2012-03-07 02:56:24.000000000 +0000
++++ b/src/main.c 2012-03-07 12:56:10.400750499 +0000
+@@ -30,7 +30,7 @@
+
+ extern GType gnome_cinnamon_plugin_get_type (void);
+
+-#define CINNAMON_DBUS_SERVICE "org.Cinnamon"
++#define CINNAMON_DBUS_SERVICE "org.gnome.Shell"
+ #define MAGNIFIER_DBUS_SERVICE "org.gnome.Magnifier"
+
+ static gboolean is_gdm_mode = FALSE;
================================================================
Index: packages/cinnamon/menu.patch
diff -u /dev/null packages/cinnamon/menu.patch:1.1
--- /dev/null Sat Apr 28 23:28:32 2012
+++ packages/cinnamon/menu.patch Sat Apr 28 23:28:26 2012
@@ -0,0 +1,158 @@
+--- a/files/etc/xdg/menus/cinnamon-applications.menu
++++ b/files/etc/xdg/menus/cinnamon-applications.menu
+@@ -4,12 +4,12 @@
+ <Menu>
+
+ <Name>Applications</Name>
+- <Directory>cinnamon-menu-applications.directory</Directory>
++ <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/cinnamon/apps</LegacyDir>
++ <LegacyDir>/usr/share/gnome/apps</LegacyDir>
+
+ <!-- Read standard .directory and .desktop file locations -->
+ <DefaultAppDirs/>
+@@ -21,7 +21,7 @@
+ <!-- Accessories submenu -->
+ <Menu>
+ <Name>Accessories</Name>
+- <Directory>cinnamon-utility.directory</Directory>
++ <Directory>Utility.directory</Directory>
+ <Include>
+ <And>
+ <Category>Utility</Category>
+@@ -38,7 +38,7 @@
+ <!-- Accessibility submenu -->
+ <Menu>
+ <Name>Universal Access</Name>
+- <Directory>cinnamon-utility-accessibility.directory</Directory>
++ <Directory>Utility-Accessibility.directory</Directory>
+ <Include>
+ <And>
+ <Category>Accessibility</Category>
+@@ -50,7 +50,7 @@
+ <!-- Development Tools -->
+ <Menu>
+ <Name>Development</Name>
+- <Directory>cinnamon-development.directory</Directory>
++ <Directory>Development.directory</Directory>
+ <Include>
+ <And>
+ <Category>Development</Category>
+@@ -62,7 +62,7 @@
+ <!-- Education -->
+ <Menu>
+ <Name>Education</Name>
+- <Directory>cinnamon-education.directory</Directory>
++ <Directory>Education.directory</Directory>
+ <Include>
+ <And>
+ <Category>Education</Category>
+@@ -73,7 +73,7 @@
+ <!-- Games -->
+ <Menu>
+ <Name>Games</Name>
+- <Directory>cinnamon-game.directory</Directory>
++ <Directory>Game.directory</Directory>
+ <Include>
+ <And>
+ <Category>Game</Category>
+@@ -84,7 +84,7 @@
+ <!-- Graphics -->
+ <Menu>
+ <Name>Graphics</Name>
+- <Directory>cinnamon-graphics.directory</Directory>
++ <Directory>Graphics.directory</Directory>
+ <Include>
+ <And>
+ <Category>Graphics</Category>
+@@ -95,7 +95,7 @@
+ <!-- Internet -->
+ <Menu>
+ <Name>Internet</Name>
+- <Directory>cinnamon-network.directory</Directory>
++ <Directory>Network.directory</Directory>
+ <Include>
+ <And>
+ <Category>Network</Category>
+@@ -106,7 +106,7 @@
+ <!-- Multimedia -->
+ <Menu>
+ <Name>Multimedia</Name>
+- <Directory>cinnamon-audio-video.directory</Directory>
++ <Directory>AudioVideo.directory</Directory>
+ <Include>
+ <And>
+ <Category>AudioVideo</Category>
+@@ -117,7 +117,7 @@
+ <!-- Office -->
+ <Menu>
+ <Name>Office</Name>
+- <Directory>cinnamon-office.directory</Directory>
++ <Directory>Office.directory</Directory>
+ <Include>
+ <And>
+ <Category>Office</Category>
+@@ -128,7 +128,7 @@
+ <!-- System Tools-->
+ <Menu>
+ <Name>System</Name>
+- <Directory>cinnamon-system-tools.directory</Directory>
++ <Directory>System-Tools.directory</Directory>
+ <Include>
+ <And>
+ <Category>System</Category>
+@@ -140,13 +140,15 @@
+ <!-- Other -->
+ <Menu>
+ <Name>Other</Name>
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list