This commit was manufactured by cvs2git to create branch

'unlabeled-1.196.2'.

Sprout from master 2007-07-31 18:25:40 UTC Jakub Bogusz <qboosh@pld-linux.org> '- BR+R libselinux-devel'
Delete:
    gnome-vfs2-default_cdda_handler.patch
    gnome-vfs2-defaults.list
    gnome-vfs2-fstab_edit_crash.patch
    gnome-vfs2-headers-define.patch
    gnome-vfs2-no_g_mime.patch

diff --git a/gnome-vfs2-default_cdda_handler.patch b/gnome-vfs2-default_cdda_handler.patch
deleted file mode 100644 (file)
index 723e328..0000000
--- a/gnome-vfs2-default_cdda_handler.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Nur gnome-vfs2-2.12.0.orig/schemas/desktop_gnome_url_handlers.schemas.in gnome-vfs2-2.12.0/schemas/desktop_gnome_url_handlers.schemas.in
---- gnome-vfs2-2.12.0.orig/schemas/desktop_gnome_url_handlers.schemas.in       2004-08-14 16:08:28.000000000 +0200
-+++ gnome-vfs2-2.12.0/schemas/desktop_gnome_url_handlers.schemas.in    2005-09-29 15:16:04.000000000 +0200
-@@ -172,6 +172,40 @@
-     </schema>
- 
-     <schema>
-+      <key>/schemas/desktop/gnome/url-handlers/cdda/enabled</key>
-+      <applyto>/desktop/gnome/url-handlers/cdda/enabled</applyto>
-+      <owner>gnome</owner>
-+      <type>bool</type>
-+      <default>true</default>
-+      <locale name="C">
-+        <short>Whether the specified command should handle "cdda" URLs</short>
-+        <long>True if the command specified in the "command" key should handle "cdda" URLs.</long>
-+      </locale>
-+    </schema>
-+    <schema>
-+      <key>/schemas/desktop/gnome/url-handlers/cdda/command</key>
-+      <applyto>/desktop/gnome/url-handlers/cdda/command</applyto>
-+      <owner>gnome</owner>
-+      <type>string</type>
-+      <default>sound-juicer %s</default>
-+      <locale name="C">
-+        <short>The handler for "cdda" URLs</short>
-+        <long>The command used to handle "cdda" URLs, if enabled.</long>
-+      </locale>
-+    </schema>
-+    <schema>
-+      <key>/schemas/desktop/gnome/url-handlers/cdda/needs_terminal</key>
-+      <applyto>/desktop/gnome/url-handlers/cdda/needs_terminal</applyto>
-+      <owner>gnome</owner>
-+      <type>bool</type>
-+      <default>false</default>
-+      <locale name="C">
-+        <short>Run the command in a terminal</short>
-+        <long>True if the command used to handle this type of URL should be run in a terminal.</long>
-+      </locale>
-+    </schema>
-+
-+    <schema>
-       <key>/schemas/desktop/gnome/url-handlers/https/enabled</key>
-       <applyto>/desktop/gnome/url-handlers/https/enabled</applyto>
-       <owner>gnome</owner>

diff --git a/gnome-vfs2-defaults.list b/gnome-vfs2-defaults.list
deleted file mode 100644 (file)
index 8b3c034..0000000
--- a/gnome-vfs2-defaults.list
+++ /dev/null
@@ -1,124 +0,0 @@
-[Default Applications]
-image/bmp=eog.desktop
-image/gif=eog.desktop
-image/jpeg=eog.desktop
-image/jpg=eog.desktop
-image/pjpeg=eog.desktop
-image/png=eog.desktop
-image/tiff=eog.desktop
-image/x-bmp=eog.desktop
-image/x-gray=eog.desktop
-image/x-icb=eog.desktop
-image/x-ico=eog.desktop
-image/x-png=eog.desktop
-image/x-portable-anymap=eog.desktop
-image/x-portable-bitmap=eog.desktop
-image/x-portable-graymap=eog.desktop
-image/x-portable-pixmap=eog.desktop
-image/x-psd=eog.desktop
-image/x-xbitmap=eog.desktop
-image/x-xpixmap=eog.desktop
-video/dv=totem.desktop
-video/mpeg=totem.desktop
-video/x-mpeg=totem.desktop
-video/msvideo=totem.desktop
-video/quicktime=totem.desktop
-video/x-anim=totem.desktop
-video/x-avi=totem.desktop
-video/x-ms-asf=totem.desktop
-video/x-ms-wmv=totem.desktop
-video/x-msvideo=totem.desktop
-video/x-nsv=totem.desktop
-video/x-flc=totem.desktop
-video/x-fli=totem.desktop
-application/ogg=totem.desktop
-application/x-ogg=totem.desktop
-audio/x-mp3=totem.desktop
-audio/x-mpeg=totem.desktop
-audio/mpeg=totem.desktop
-audio/x-wav=totem.desktop
-audio/x-mpegurl=totem.desktop
-audio/x-scpls=rhythmbox.desktop
-audio/x-m4a=totem.desktop
-audio/x-ms-asf=totem.desktop
-audio/x-ms-asx=totem.desktop
-audio/x-ms-wax=totem.desktop
-application/vnd.rn-realmedia=totem.desktop
-audio/x-real-audio=totem.desktop
-audio/x-pn-realaudio=totem.desktop
-application/x-flac=totem.desktop
-audio/x-flac=totem.desktop
-application/x-shockwave-flash=totem.desktop
-misc/ultravox=totem.desktop
-application/x-matroska=totem.desktop
-audio/vnd.rn-realaudio=totem.desktop
-audio/x-pn-aiff=totem.desktop
-audio/x-pn-au=totem.desktop
-audio/x-pn-wav=totem.desktop
-audio/x-pn-windows-acm=totem.desktop
-image/vnd.rn-realpix=totem.desktop
-video/vnd.rn-realvideo=totem.desktop
-text/html=epiphany.desktop
-text/xml=epiphany.desktop
-application/xhtml+xml=epiphany.desktop
-application/x-java-archive=file-roller.desktop
-application/x-compress=file-roller.desktop
-application/x-lzop=file-roller.desktop
-application/x-gzip=file-roller.desktop
-application/zip=file-roller.desktop
-application/x-rar-compressed=file-roller.desktop
-application/x-gtar=file-roller.desktop
-application/x-bzip=file-roller.desktop
-application/x-compressed-tar=file-roller.desktop
-application/x-zip=file-roller.desktop
-application/x-bzip-compressed-tar=file-roller.desktop
-application/x-tar=file-roller.desktop
-application/x-zoo=file-roller.desktop
-application/x-rpm=file-roller.desktop
-application/x-zip-compressed=file-roller.desktop
-application/x-jar=file-roller.desktop
-application/x-lha=file-roller.desktop
-application/x-arj=file-roller.desktop
-application/x-rar=file-roller.desktop
-application/x-lhz=file-roller.desktop
-multipart/x-zip=file-roller.desktop
-application/x-cd-image=file-roller.desktop
-text/abiword=abiword.desktop
-application/msword=abiword.desktop
-text/richtext=abiword.desktop
-text/rtf=abiword.desktop
-application/x-abiword=abiword.desktop
-application/rtf=abiword.desktop
-application/x-quattropro=gnumeric.desktop
-application/x-mps=gnumeric.desktop
-application/x-123=gnumeric.desktop
-application/tab-separated-values=gnumeric.desktop
-zz-application/zz-winassoc-xls=gnumeric.desktop
-application/x-xls=gnumeric.desktop
-text/spreadsheet=gnumeric.desktop
-text/csv=gnumeric.desktop
-application/vnd.ms-excel=gnumeric.desktop
-application/x-xbase=gnumeric.desktop
-application/vnd.sun.xml.calc=gnumeric.desktop
-text/tab-separated-values=gnumeric.desktop
-application/x-sc=gnumeric.desktop
-application/x-applix-spreadsheet=gnumeric.desktop
-application/csv=gnumeric.desktop
-application/vnd.sun.xml.calc.template=gnumeric.desktop
-application/x-excel=gnumeric.desktop
-text/comma-separated-values=gnumeric.desktop
-application/x-gnumeric=gnumeric.desktop
-application/x-ms-excel=gnumeric.desktop
-application/excel=gnumeric.desktop
-application/msexcel=gnumeric.desktop
-application/vnd.lotus-1-2-3=gnumeric.desktop
-application/x-planperfect=gnumeric.desktop
-application/x-dos_ms_excel=gnumeric.desktop
-application/xls=gnumeric.desktop
-application/x-msexcel=gnumeric.desktop
-application/x-oleo=gnumeric.desktop
-text/x-comma-separated-values=gnumeric.desktop
-application/x-sylk=gnumeric.desktop
-application/pdf=gpdf.desktop
-application/postscript=ggv.desktop
-text/plain=gedit.desktop

diff --git a/gnome-vfs2-fstab_edit_crash.patch b/gnome-vfs2-fstab_edit_crash.patch
deleted file mode 100644 (file)
index b5b9488..0000000
--- a/gnome-vfs2-fstab_edit_crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# upstream http://bugzilla.gnome.org/show_bug.cgi?id=300547
-
-diff -Nur gnome-vfs2-2.10.0/libgnomevfs/gnome-vfs-volume-monitor-daemon.c gnome-vfs2-2.10.0.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
---- gnome-vfs2-2.10.0/libgnomevfs/gnome-vfs-volume-monitor-daemon.c    2004-12-14 17:23:33.000000000 +0100
-+++ gnome-vfs2-2.10.0.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c        2005-03-17 12:01:07.245801992 +0100
-@@ -718,6 +718,9 @@
-                       mount = l->data;
-                       uri = gnome_vfs_get_uri_from_local_path (mount->mount_path);
- 
-+                      if (uri == NULL)
-+                          continue;
-+
-                       drive = _gnome_vfs_volume_monitor_find_fstab_drive_by_activation_uri (volume_monitor, uri);
- 
-                       if (drive != NULL) {

diff --git a/gnome-vfs2-headers-define.patch b/gnome-vfs2-headers-define.patch
deleted file mode 100644 (file)
index f74db8e..0000000
--- a/gnome-vfs2-headers-define.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.in       2006-06-13 00:36:14.000000000 -0500
-+++ configure.in       2006-06-13 00:54:15.000000000 -0500
-@@ -191,6 +191,16 @@
- 
- AC_CHECK_HEADERS(sys/param.h sys/resource.h sys/vfs.h sys/mount.h sys/statfs.h sys/statvfs.h sys/param.h wctype.h sys/poll.h poll.h)
- 
-+AC_CHECK_HEADERS([pwd.h])
-+if test "$ac_cv_header_pwd_h" = "yes"; then
-+      AC_DEFINE(HAVE_PWD_H, [1], [pwd.h present])
-+fi
-+
-+AC_CHECK_HEADERS([grp.h])
-+if test "$ac_cv_header_grp_h" = "yes"; then
-+      AC_DEFINE(HAVE_GRP_H, [1], [grp.h present])
-+fi
-+
- dnl
- dnl file system type member in statfs struct
- dnl

diff --git a/gnome-vfs2-no_g_mime.patch b/gnome-vfs2-no_g_mime.patch
deleted file mode 100644 (file)
index 3db13d1..0000000
--- a/gnome-vfs2-no_g_mime.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN gnome-vfs-2.18.0/configure.in gnome-vfs-2.18.0.new/configure.in
---- gnome-vfs-2.18.0/configure.in      2007-03-12 10:33:16.000000000 +0100
-+++ gnome-vfs-2.18.0.new/configure.in  2007-03-12 15:23:14.000000000 +0100
-@@ -1044,7 +1044,7 @@
- dnl End of IPv6 checks
- dnl ==============================================================================
- 
--PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement)
-+PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement)
- LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS"
- LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS"
- AC_SUBST(LIBGNOMEVFS_CFLAGS)