Remove upstreamed grace helper

See https://trisquel.info/en/issues/20736 for further details

README.md

@@ -32,7 +32,6 @@ Those are the steps done by the helpers:
 * `EXTERNAL`: When building packages not coming from the upstream Ubuntu, the external `deb-src` in the same format as in `apt.sources.list`.
 * `REPOKEY`: An additional GPG key to import for the helper. Mostly only used in conjunction with `EXTERNAL`.
 * `BACKPORT(S)`: Must be set to `true` if the package is a backport.
-* `PARALLEL`: If `false`, avoids `dpkg-src` to run multi-threaded with as many CPUs as available.
 * `QUILT`: If `skip`, avoids patches to be automatically applied. Only set this variables if you know what you are doing.
 
 ## Recommendations

helpers/DATA/apache2/001_branding

@@ -1,37 +0,0 @@
-#!/bin/sh -e
-## 02_branding.dpatch by Adam Conrad <adconrad@0c3.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes apache's PLATFORM based on lsb_release output
-
-BUILD_DIST="($(lsb_release -i -s) GNU/Linux)"
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-case "$1" in
-  -patch)
-    if grep -q "${BUILD_DIST}" server/core.c 2>/dev/null; then
-      echo >&2 "`basename $0`: patch already applied"
-      exit 1
-    else
-      # This is where we get our distribution-specific server signature from:
-      sed -i -e "s:(\" PLATFORM \"):${BUILD_DIST}:" server/core.c
-    fi
-  ;;
-  -unpatch)
-    if grep -q "${BUILD_DIST}" server/core.c 2>/dev/null; then
-      sed -i -e "s:${BUILD_DIST}:(\" PLATFORM \"):" server/core.c
-    else
-      echo >&2 "`basename $0`: patch not yet applied, cannot unpatch"
-      exit 1
-    fi
-  ;;
-  *)
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-  ;;
-esac
-

helpers/DATA/app-install-data-ubuntu/09_app_install_entry.patch

@@ -1,46 +0,0 @@
-Index: gnome-menus-2.28.0/layout/applications.menu
-===================================================================
---- gnome-menus-2.28.0.orig/layout/applications.menu	2009-09-24 11:34:44.000000000 +0200
-+++ gnome-menus-2.28.0/layout/applications.menu	2009-09-24 11:34:44.000000000 +0200
-@@ -157,4 +157,29 @@
-     <Directory>Debian.directory</Directory>
-   </Menu>
- 
-+<Include>
-+  <Filename>gnome-app-install.desktop</Filename>
-+</Include>
-+
-+<!-- Separator between menus and gnome-app-install -->
-+<Layout>
-+  <Merge type="menus"/>
-+  <Menuname>Internet</Menuname>
-+  <Menuname>Office</Menuname>
-+  <Menuname>Education</Menuname>
-+  <Menuname>Development</Menuname>
-+  <Menuname>Graphics</Menuname>
-+  <Menuname>Multimedia</Menuname>
-+  <Menuname>Games</Menuname>
-+  <Menuname>Accessories</Menuname>
-+  <Menuname>System</Menuname>
-+  <Menuname>Universal Access</Menuname>
-+  <Menuname>Debian</Menuname>
-+  <Menuname>Other</Menuname>
-+  <Menuname>wine-wine</Menuname>
-+  <Merge type="files"/>
-+  <Separator/>
-+  <Filename>gnome-app-install.desktop</Filename>
-+</Layout>
-+
- </Menu> <!-- End Applications -->
-Index: gnome-menus-2.28.0/layout/settings.menu
-===================================================================
---- gnome-menus-2.28.0.orig/layout/settings.menu	2009-09-24 11:34:47.000000000 +0200
-+++ gnome-menus-2.28.0/layout/settings.menu	2009-09-24 11:35:22.000000000 +0200
-@@ -43,6 +43,7 @@
-       <And>
-         <Category>Settings</Category>
-         <Category>System</Category>
-+        <Not><Filename>gnome-app-install.desktop</Filename></Not>
-       </And>
-     </Include>
-   </Menu>     <!-- End System Settings -->

helpers/DATA/db/007-mt19937db.c_license.patch

@@ -1,49 +0,0 @@
-Description: mt19937db.c license should include the GPL
- This file is distributed from upstream Berkeley DB under the Artistic
- License (no version specified), althouth it was later released by the
- original author under both GPL2+ and BSD.
- .
- References:
- http://web.archive.org/web/20010806225716/http://www.math.keio.ac.jp/matumoto/mt19937int.c
- http://web.archive.org/web/20130127064020/http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/CODES/mt19937ar.c
- https://bugzilla.redhat.com/show_bug.cgi?format=multiple&id=886838
- https://lists.nongnu.org/archive/html/gnu-linux-libre/2010-05/msg00000.html
- .
-Author: Ruben Rodriguez <ruben@trisquel.info>
-
-
---- db-5.1.25.orig/src/crypto/mersenne/mt19937db.c
-+++ db-5.1.25/src/crypto/mersenne/mt19937db.c
-@@ -16,16 +16,27 @@
- /*   Coded by Takuji Nishimura, considering the suggestions by    */
- /* Topher Cooper and Marc Rieffel in July-Aug. 1997.              */
- 
--/* This library is free software under the Artistic license:       */
--/* see the file COPYING distributed together with this code.       */
--/* For the verification of the code, its output sequence file      */
--/* mt19937int.out is attached (2001/4/2)                           */
--
- /* Copyright (C) 1997, 1999 Makoto Matsumoto and Takuji Nishimura. */
- /* Any feedback is very welcome. For any question, comments,       */
- /* see http://www.math.keio.ac.jp/matumoto/emt.html or email       */
- /* matumoto@math.keio.ac.jp                                        */
- 
-+/* This library is free software; you can redistribute it and/or   */
-+/* modify it under the terms of the GNU Library General Public     */
-+/* License as published by the Free Software Foundation; either    */
-+/* version 2 of the License, or (at your option) any later         */
-+/* version.                                                        */
-+/* This library is distributed in the hope that it will be useful, */
-+/* but WITHOUT ANY WARRANTY; without even the implied warranty of  */
-+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.            */
-+/* See the GNU Library General Public License for more details.    */
-+/* You should have received a copy of the GNU Library General      */
-+/* Public License along with this library; if not, write to the    */
-+/* Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA   */ 
-+/* 02111-1307  USA                                                 */
-+
-+/* This library is free software under the Artistic license:       */
-+
- /* REFERENCE                                                       */
- /* M. Matsumoto and T. Nishimura,                                  */
- /* "Mersenne Twister: A 623-Dimensionally Equidistributed Uniform  */

helpers/DATA/db4.7/007-mt19937db.c_license.patch

@@ -1,49 +0,0 @@
-Description: mt19937db.c license should include the GPL
- This file is distributed from upstream Berkeley DB under the Artistic
- License (no version specified), althouth it was later released by the
- original author under both GPL2+ and BSD.
- .
- References:
- http://web.archive.org/web/20010806225716/http://www.math.keio.ac.jp/matumoto/mt19937int.c
- http://web.archive.org/web/20130127064020/http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/CODES/mt19937ar.c
- https://bugzilla.redhat.com/show_bug.cgi?format=multiple&id=886838
- https://lists.nongnu.org/archive/html/gnu-linux-libre/2010-05/msg00000.html
- .
-Author: Ruben Rodriguez <ruben@trisquel.info>
-
-
---- a/crypto/mersenne/mt19937db.c
-+++ b/crypto/mersenne/mt19937db.c
-@@ -16,16 +16,27 @@
- /*   Coded by Takuji Nishimura, considering the suggestions by    */
- /* Topher Cooper and Marc Rieffel in July-Aug. 1997.              */
- 
--/* This library is free software under the Artistic license:       */
--/* see the file COPYING distributed together with this code.       */
--/* For the verification of the code, its output sequence file      */
--/* mt19937int.out is attached (2001/4/2)                           */
--
- /* Copyright (C) 1997, 1999 Makoto Matsumoto and Takuji Nishimura. */
- /* Any feedback is very welcome. For any question, comments,       */
- /* see http://www.math.keio.ac.jp/matumoto/emt.html or email       */
- /* matumoto@math.keio.ac.jp                                        */
- 
-+/* This library is free software; you can redistribute it and/or   */
-+/* modify it under the terms of the GNU Library General Public     */
-+/* License as published by the Free Software Foundation; either    */
-+/* version 2 of the License, or (at your option) any later         */
-+/* version.                                                        */
-+/* This library is distributed in the hope that it will be useful, */
-+/* but WITHOUT ANY WARRANTY; without even the implied warranty of  */
-+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.            */
-+/* See the GNU Library General Public License for more details.    */
-+/* You should have received a copy of the GNU Library General      */
-+/* Public License along with this library; if not, write to the    */
-+/* Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA   */ 
-+/* 02111-1307  USA                                                 */
-+
-+/* This library is free software under the Artistic license:       */
-+
- /* REFERENCE                                                       */
- /* M. Matsumoto and T. Nishimura,                                  */
- /* "Mersenne Twister: A 623-Dimensionally Equidistributed Uniform  */

helpers/DATA/db4.8/007-mt19937db.c_license.patch

@@ -1,49 +0,0 @@
-Description: mt19937db.c license should include the GPL
- This file is distributed from upstream Berkeley DB under the Artistic
- License (no version specified), althouth it was later released by the
- original author under both GPL2+ and BSD.
- .
- References:
- http://web.archive.org/web/20010806225716/http://www.math.keio.ac.jp/matumoto/mt19937int.c
- http://web.archive.org/web/20130127064020/http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/CODES/mt19937ar.c
- https://bugzilla.redhat.com/show_bug.cgi?format=multiple&id=886838
- https://lists.nongnu.org/archive/html/gnu-linux-libre/2010-05/msg00000.html
- .
-Author: Ruben Rodriguez <ruben@trisquel.info>
-
-
---- a/crypto/mersenne/mt19937db.c
-+++ b/crypto/mersenne/mt19937db.c
-@@ -16,16 +16,27 @@
- /*   Coded by Takuji Nishimura, considering the suggestions by    */
- /* Topher Cooper and Marc Rieffel in July-Aug. 1997.              */
- 
--/* This library is free software under the Artistic license:       */
--/* see the file COPYING distributed together with this code.       */
--/* For the verification of the code, its output sequence file      */
--/* mt19937int.out is attached (2001/4/2)                           */
--
- /* Copyright (C) 1997, 1999 Makoto Matsumoto and Takuji Nishimura. */
- /* Any feedback is very welcome. For any question, comments,       */
- /* see http://www.math.keio.ac.jp/matumoto/emt.html or email       */
- /* matumoto@math.keio.ac.jp                                        */
- 
-+/* This library is free software; you can redistribute it and/or   */
-+/* modify it under the terms of the GNU Library General Public     */
-+/* License as published by the Free Software Foundation; either    */
-+/* version 2 of the License, or (at your option) any later         */
-+/* version.                                                        */
-+/* This library is distributed in the hope that it will be useful, */
-+/* but WITHOUT ANY WARRANTY; without even the implied warranty of  */
-+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.            */
-+/* See the GNU Library General Public License for more details.    */
-+/* You should have received a copy of the GNU Library General      */
-+/* Public License along with this library; if not, write to the    */
-+/* Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA   */ 
-+/* 02111-1307  USA                                                 */
-+
-+/* This library is free software under the Artistic license:       */
-+
- /* REFERENCE                                                       */
- /* M. Matsumoto and T. Nishimura,                                  */
- /* "Mersenne Twister: A 623-Dimensionally Equidistributed Uniform  */

helpers/DATA/gnome-app-install/gnome-app-install.patch

@@ -1,23 +0,0 @@
-diff -ru data-orig/gnome-app-install.glade data/gnome-app-install.glade
---- data-orig/gnome-app-install.glade	2009-03-31 12:55:04.000000000 +0000
-+++ data/gnome-app-install.glade	2009-06-12 21:35:02.846384370 +0000
-@@ -1008,7 +1008,7 @@
- 
- 			  <child>
- 			    <widget class="GtkHBox" id="hbox24">
--			      <property name="visible">True</property>
-+			      <property name="visible">False</property>
- 			      <property name="homogeneous">False</property>
- 			      <property name="spacing">12</property>
- 
-@@ -1294,9 +1294,7 @@
-       <child>
- 	<widget class="GtkLabel" id="label_progress">
- 	  <property name="visible">True</property>
--	  <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Checking installed and available applications&lt;/b&gt;&lt;/big&gt;
--
--Ubuntu and third party vendors offer you a large variety of applications that you can install on your system.</property>
-+          <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Loading...&lt;/b&gt;&lt;/big&gt;</property>
- 	  <property name="use_underline">False</property>
- 	  <property name="use_markup">True</property>
- 	  <property name="justify">GTK_JUSTIFY_LEFT</property>

helpers/DATA/gnome-app-install/gnome-app-install_Ubuntu.py

@@ -1,190 +0,0 @@
-
-import Default
-
-from AppInstall.Menu import SHOW_ALL, SHOW_ONLY_SUPPORTED, SHOW_ONLY_FREE, SHOW_ONLY_MAIN, SHOW_ONLY_PROPRIETARY, SHOW_ONLY_THIRD_PARTY, SHOW_ONLY_INSTALLED
-from AppInstall.Util import *
-
-import datetime
-import locale
-
-from gettext import gettext as _
-
-class Distribution(Default.Distribution):
-
-    def __init__(self):
-        Default.Distribution.__init__(self)
-        # Dictonary of all available filters with corresponding choser name
-        # and tooltip
-        # The installed filter will be automatically added in non-installer mode
-        # The primary and secondary filters are separated
-        self.filters_primary = {
-            SHOW_ALL : (_("All available applications"), ""),
-            SHOW_ONLY_FREE : (_("All Open Source applications"), ""),
-            }
-        self.filters_secondary = {
-            SHOW_ONLY_SUPPORTED : (_("Canonical-maintained applications"), ""),
-            SHOW_ONLY_THIRD_PARTY :(_("Third party applications"), ""),
-            }
-        # List of components whose applications should not be installed
-        # before asking for a confirmation
-        self.components_ask = ["universe", "multiverse"]
-        # Dictonary that provides dialog messages that are shown,
-        # before a component gets activated or when it requires to be confirmed
-        self.components_activation = {
-            # Fallback
-            None : [_("Enable the installation of software from the %s "
-                      "component of Ubuntu?"),
-                    # %s is the name of the component
-                    _("%s is not officially supported with security "
-                      "updates.")],
-            "main" : [_("Enable the installaion of officially "
-                        "supported Ubuntu software?"),
-                      # %s is the name of the application
-                      _("%s is part of the Ubuntu main distribution. "
-                        "Canonical Ltd. provides support and security "
-                        "updates, which will be enabled too.")],
-            "universe" : [_("Enable the installation of community maintained "
-                            "software?"),
-                          # %s is the name of the application
-                          _("%s is maintained by the Ubuntu community. "
-                            "The Ubuntu community provides support and "
-                            "security updates, which will be enabled too.")],
-            "multiverse" : [_("Enable the installation of unsupported and "
-                              "restricted software?"),
-                            # %s is the name of the application
-                            _("The use, modification and distribution of %s "
-                              "is restricted by copyright or by legal terms in "
-                              "some countries.")]
-              }
-
-        self.dependencies_map = [
-            # KDE
-            (("kdelibs5","python-kde4","libqtgui4"),
-            # %s is the name of an application
-             None,
-             "application-kde"),
-            # GNOME
-            (("libgnome2-0","python-gnome2","libgtk2.0-0","python-gtk2"),
-            # %s is the name of an application
-             None, 
-             "application-gnome"),
-            # XUBUNTU
-            # FIXME: get an icon from xubuntu
-            (("libxfce4util4",),
-            # %s is the name of an application
-             None,
-             None)]
-
-        self.comp_depend_map = { "universe":["main"],
-                                 "multiverse":["main", "universe"]}
-
-    def get_app_emblems(self, app, cache):
-        # A short statement about the freedom, legal status and level of
-        # support of the application
-        emblems = []
-        icon_name = None
-        tooltip = None
-        if app.channel.endswith("-partner") and app.supported:
-            tooltip = _("%s is provided by a third party vendor "
-                        "from the Canonical partner repository.") % app.name
-            icon_name = "application-partner"
-            emblems.append((icon_name, tooltip))
-        elif app.component == "main" or app.supported:
-            tooltip = _("Canonical Ltd. provides technical support and "
-                        "security updates for %s") % app.name
-            icon_name = "application-supported"
-            emblems.append((icon_name, tooltip))
-        elif app.thirdparty or app.channel:
-            tooltip = ("%s is provided by a third party vendor "
-                       "and is therefore not an official part "
-                       "of Ubuntu. The third party vendor is "
-                       "responsible for support and security "
-                       "updates.") % app.name
-            icon_name = "application-proprietary"
-            emblems.append((icon_name, tooltip))
-        if app.component == "universe":
-            tooltip =_("This application is provided by the "
-                       "Ubuntu community.")
-            icon_name = "application-community"
-            emblems.append((icon_name, tooltip))
-        if app.component == "multiverse" or app.thirdparty:
-            tooltip = _("The use, modification and distribution "
-                        "of %s is restricted by copyright or by "
-                        "legal terms in some countries.") % app.name
-            icon_name = "application-proprietary"
-            emblems.append((icon_name, tooltip))
-
-        # Add an emblem corresponding to the dependencies of the app
-        if cache.has_key(app.pkgname):
-            for (deps, tooltip, icon_name) in self.dependencies_map:
-                for dep in deps:
-                    if cache.pkgDependsOn(app.pkgname, dep):
-                        if type(tooltip) == str:
-                            tooltip = tooltip % app.name
-                        emblems.append((icon_name, tooltip))
-                        break
-        icon_name = None
-        tooltip = None
-        return emblems
-
-    def get_codec_information_link(self):
-        url = "https://codecs.canonical.com"
-        label = _("Buy Licensed Plug-ins...")
-        return (label, url)
-
-    def get_maintenance_status(self, app, cache):
-
-        # try to figure out the support dates of the release and make
-        # sure to look only for stuff in "Ubuntu" and "distro_codename"
-        # (to exclude stuff in ubuntu-updates for the support time 
-        # calculation because the "Release" file time for that gets
-        # updated regularly)
-        releasef = get_release_filename_for_pkg(cache, app.pkgname, 
-                                                "Ubuntu", self.get_codename())
-        time_t = get_release_date_from_release_file(releasef)
-        # check the release date and show support information
-        # based on this
-        if time_t:
-            release_date = datetime.datetime.fromtimestamp(time_t)
-            #print "release_date: ", release_date
-            now = datetime.datetime.now()
-            release_age = (now - release_date).days
-            #print "release age: ", release_age
-
-            # mvo: we do not define the end date very precisely
-            #      currently this is why it will just display a end
-            #      range
-            (support_end_year, support_end_month) = get_maintenance_end_date(release_date, 18)
-            support_end_month_str = locale.nl_langinfo(getattr(locale,"MON_%d" % support_end_month))
-             # check if the support has ended
-            support_ended = (now.year >= support_end_year and 
-                             now.month > support_end_month)
-            if app.component == "main":
-                if support_ended:
-                    return _("Canonical does no longer provide "
-                             "updates for %s in Ubuntu %s. "
-                             "Updates may be available in a newer version of "
-                             "Ubuntu.") % (app.name, self.get_distro_release())
-                else:
-                    return _("Canonical provides critical updates for "
-                             "%(appname)s until %(support_end_month_str)s "
-                             "%(support_end_year)s.") % {'appname' : app.name,
-                                                         'support_end_month_str' : support_end_month_str,
-                                                         'support_end_year' : support_end_year}
-            elif app.component == "restricted":
-                if support_ended:
-                    return _("Canonical does no longer provide "
-                             "updates for %s in Ubuntu %s. "
-                             "Updates may be available in a newer version of "
-                             "Ubuntu.") % (app.name, self.get_distro_release())
-                else:
-                    return _("Canonical provides critical updates supplied "
-                             "by the developers of %(appname)s until "
-                             "%(support_end_month_str)s "
-                             "%(support_end_year)s.") % {'appname' : app.name,
-                                                         'support_end_month_str' : support_end_month_str,
-                                                         'support_end_year' : support_end_year}
-               
-
-        return _("") % app.name
-

helpers/DATA/gnome-control-center/gnomecc.menu.in

@@ -1,131 +0,0 @@
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-
-<Menu>
-  <Name>Control Center</Name>
-  <Directory>gnomecc.directory</Directory>
-
-  <!-- Read standard .directory and .desktop file locations -->
-  <AppDir>/usr/share/applications/</AppDir>
-  <DefaultDirectoryDirs/>
-
-  <!-- Read in overrides and child menus from gnomecc-merged/ -->
-  <DefaultMergeDirs/>
-
-   <!-- Sort the control center categories -->
-   <Layout>
-     <Menuname>Personal</Menuname>
-     <Menuname>System</Menuname>
-     <Menuname>Other</Menuname>
-     <Merge type="all" />
-   </Layout>
-
-  <!-- Stuff in the toplevel (Other category) -->
-  <Include>
-    <And>
-      <Category>Settings</Category>
-      <Not>
-        <Or>
-          <Category>X-GNOME-PersonalSettings</Category>
-          <Category>DesktopSettings</Category>
-          <Category>HardwareSettings</Category>
-          <Category>X-GNOME-SystemSettings</Category>
-          <Category>System</Category>
-        </Or>
-      </Not>
-    </And>
-  </Include>
-
-  <!-- Avoid the shell having a launcher for itself -->
-  <Exclude>
-    <Filename>gnome-control-center.desktop</Filename>
-  </Exclude>
-
-  <!-- Personal category -->
-  <Menu>
-    <Name>Personal</Name>
-    <Directory>Personal.directory</Directory>
-    <Include>
-      <And>
-        <Category>Settings</Category>
-        <Not>
-        <Or>
-         <Category>System</Category>
-         <Category>X-GNOME-SystemSettings</Category>
-        </Or>
-      </Not>
-      </And>
-<Or>
-<Filename>gnome-universal-access-panel.desktop</Filename>
-<Filename>gnome-info-panel.desktop</Filename>
-</Or>
-    </Include>
-<Exclude>
-<Filename>gnome-printers-panel.desktop</Filename>
-<Filename>gnome-network-panel.desktop</Filename>
-<Filename>evolution-settings.desktop</Filename>
-<Filename>language-selector.desktop</Filename>
-<Filename>nm-connection-editor.desktop</Filename>
-<Filename>palimpsest.desktop</Filename>
-<Filename>gnome-online-accounts-panel.desktop</Filename>
-<Filename>gnome-disks.desktop</Filename>
-<Filename>im-config.desktop</Filename>
-<Filename>gnome-user-share-properties.desktop</Filename>
-</Exclude>
-  </Menu> <!-- End Personal -->
-
-
-  <!-- System category -->
-  <Menu>
-    <Name>System</Name>
-    <Directory>System.directory</Directory>
-    <Include>
-      <And>
-         <Category>System</Category>
-        <Category>Settings</Category>
-      </And>
-<Or>
-         <Category>X-GNOME-SystemSettings</Category>
-<Filename>language-selector.desktop</Filename>
-<Filename>gnome-ppp.desktop</Filename>
-<Filename>baobab.desktop</Filename>
-<Filename>gnome-system-monitor.desktop</Filename>
-<Filename>gnome-printers-panel.desktop</Filename>
-<Filename>gnome-disks.desktop</Filename>
-<Filename>gnome-network-panel.desktop</Filename>
-</Or>
-    </Include>
-<Exclude>
-<Filename>gnome-universal-access-panel.desktop</Filename>
-<Filename>nm-connection-editor.desktop</Filename>
-<Filename>gnome-app-install.desktop</Filename>
-<Filename>time.desktop</Filename>
-<Filename>users.desktop</Filename>
-<Filename>network.desktop</Filename>
-<Filename>gnome-info-panel.desktop</Filename>
-<Filename>system-config-printer.desktop</Filename>
-</Exclude>
-  </Menu> <!-- End System -->
-
-  <!-- Other category -->
-  <Menu>
-    <Name>Other</Name>
-    <Directory>X-GNOME-Other.directory</Directory>
-    <Include>
-      <And>
-        <Category>Settings</Category>
-        <Category>X-GNOME-Settings-Panel</Category>
-        <Not>
-          <Or>
-            <Category>X-GNOME-PersonalSettings</Category>
-            <Category>X-GNOME-SystemSettings</Category>
-            <Category>HardwareSettings</Category>
-            <Filename>gnome-control-center.desktop</Filename>
-          </Or>
-        </Not>
-      </And>
-    </Include>
-  </Menu> <!-- End Other -->
-
-</Menu>     <!-- End CC -->
-