This commit was manufactured by cvs2git to create branch 'unlabeled-1.40.2'.

Sprout from master 2010-06-23 07:41:35 UTC Marcin Banasiak <marcin.banasiak@gmail.com> '- release 2'
Delete:
    default-apps-chrome-chromium.patch
    no_update_desktop.patch

diff --git a/default-apps-chrome-chromium.patch b/default-apps-chrome-chromium.patch
deleted file mode 100644 (file)
index 0583cdc..0000000
--- a/default-apps-chrome-chromium.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- gnome-control-center-2.28.1/capplets/default-applications/gnome-default-applications.xml.in~       2009-05-03 21:30:56.000000000 +0300
-+++ gnome-control-center-2.28.1/capplets/default-applications/gnome-default-applications.xml.in        2010-03-09 22:29:32.991354516 +0200
-@@ -147,6 +147,22 @@
-       <run-in-terminal>false</run-in-terminal>
-       <netscape-remote>false</netscape-remote>
-     </web-browser>
-+    <web-browser>
-+        <_name>Google Chrome</_name>
-+        <executable>google-chrome</executable>
-+        <command>google-chrome %s</command>
-+        <icon-name>google-chrome</icon-name>
-+        <run-in-terminal>false</run-in-terminal>
-+        <netscape-remote>false</netscape-remote>
-+    </web-browser>
-+    <web-browser>
-+        <_name>Chromium Browser</_name>
-+        <executable>chromium-browser</executable>
-+        <command>chromium-browser %s</command>
-+        <icon-name>chromium-browser</icon-name>
-+        <run-in-terminal>false</run-in-terminal>
-+        <netscape-remote>false</netscape-remote>
-+    </web-browser>
-   </web-browsers>
- 
-   <mail-readers>

diff --git a/no_update_desktop.patch b/no_update_desktop.patch
deleted file mode 100644 (file)
index 97457c1..0000000
--- a/no_update_desktop.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -aurN gnome-control-center-2.28.0.orig/configure.ac gnome-control-center-2.28.0/configure.in
---- gnome-control-center-2.28.0.orig/configure.ac      2009-09-24 11:34:15.000000000 +0200
-+++ gnome-control-center-2.28.0/configure.ac   2009-09-24 11:38:03.000000000 +0200
-@@ -298,6 +298,17 @@
-                    enable_update_mimedb=yes)
- AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
- 
-+dnl =======================================
-+dnl Update Desktop Database
-+dnl =======================================
-+
-+AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no)
-+
-+AC_ARG_ENABLE(update-desktop,
-+   AC_HELP_STRING([--disable-update-desktop],
-+                   [do not update desktop database after installation]),,
-+                   enable_update_desktop=yes)
-+AM_CONDITIONAL(ENABLE_UPDATE_DESKTOP, test x$enable_update_desktop = xyes)
- 
- AC_CONFIG_FILES([
- Makefile
-diff -aurN gnome-control-center-2.28.0.orig/font-viewer/Makefile.am gnome-control-center-2.28.0/font-viewer/Makefile.am
---- gnome-control-center-2.28.0.orig/font-viewer/Makefile.am   2009-09-24 11:34:15.000000000 +0200
-+++ gnome-control-center-2.28.0/font-viewer/Makefile.am        2009-09-24 11:41:45.000000000 +0200
-@@ -28,11 +28,15 @@
- install-gconf-schemas:
- endif
- 
-+if ENABLE_UPDATE_DESKTOP
- install-desktop-database: install-desktopDATA
--      update-desktop-database $(DESTDIR)$(desktopdir)
-+      $(UPDATE_DESKTOP_DATABASE) $(DESTDIR)$(desktopdir)
- 
- uninstall-local:
-       rm -f $(DESTDIR)$(desktopdir)/mimeinfo.cache
-+else
-+install-desktop-database:
-+endif
- 
- @INTLTOOL_DESKTOP_RULE@
- @INTLTOOL_DIRECTORY_RULE@
-diff -aurN gnome-control-center-2.28.0.orig/Makefile.am gnome-control-center-2.28.0/Makefile.am
---- gnome-control-center-2.28.0.orig/Makefile.am       2009-09-24 11:34:15.000000000 +0200
-+++ gnome-control-center-2.28.0/Makefile.am    2009-09-24 11:36:11.000000000 +0200
-@@ -46,7 +46,7 @@
-       MAINTAINERS \
-       gnome-doc-utils.make
- 
--DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-update-mimedb
-+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-update-mimedb --disable-update-desktop
- 
- GITIGNOREFILES=m4
-