- updated for 0.8.1

Changed files:
    seahorse-desktop.patch -> 1.10
    seahorse-install.patch -> 1.5

diff --git a/seahorse-desktop.patch b/seahorse-desktop.patch
index fde24d4a7ab8d695087606a27d8f44451df5715a..0f5daaaa3eeb613d4d09223d72001da3dd04af97 100644 (file)
--- a/seahorse-desktop.patch
+++ b/seahorse-desktop.patch
@@ -1,34 +1,24 @@
-diff -urN seahorse-0.7.9.orig/plugins/nautilus/seahorse-pgp-preferences.desktop.in seahorse-0.7.9/plugins/nautilus/seahorse-pgp-preferences.desktop.in
---- seahorse-0.7.9.orig/plugins/nautilus/seahorse-pgp-preferences.desktop.in   2005-09-18 11:18:48.831762432 +0200
-+++ seahorse-0.7.9/plugins/nautilus/seahorse-pgp-preferences.desktop.in        2005-09-18 11:21:12.078985544 +0200
-@@ -1,11 +1,12 @@
- [Desktop Entry]
-+Encoding=UTF-8
- _Name=Encryption Preferences
- _Comment=Configure key servers and other encryption settings
- Exec=seahorse-pgp-preferences
+diff -aurN seahorse-0.8.1.orig/plugins/nautilus/seahorse-pgp-preferences.desktop.in seahorse-0.8.1/plugins/nautilus/seahorse-pgp-preferences.desktop.in
+--- seahorse-0.8.1.orig/plugins/nautilus/seahorse-pgp-preferences.desktop.in   2006-01-26 11:45:01.000000000 +0100
++++ seahorse-0.8.1/plugins/nautilus/seahorse-pgp-preferences.desktop.in        2006-03-06 12:14:04.228625632 +0100
+@@ -6,7 +6,7 @@
  Terminal=false
  Type=Application
  Icon=gnome-mime-application-pgp-keys.png
--Categories=Application;Settings;Advanced
+-Categories=GNOME;GTK;Application;Settings;Advanced;
 +Categories=GTK;GNOME;Settings;AdvancedSettings;X-Capplet;
  StartupNotify=true
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=seahorse
-diff -urN seahorse-0.7.9.orig/src/seahorse.desktop.in seahorse-0.7.9/src/seahorse.desktop.in
---- seahorse-0.7.9.orig/src/seahorse.desktop.in        2005-09-18 11:18:48.607796480 +0200
-+++ seahorse-0.7.9/src/seahorse.desktop.in     2005-09-18 11:20:38.958020696 +0200
-@@ -1,11 +1,12 @@
- [Desktop Entry]
-+Encoding=UTF-8
- _Name=Encryption Key Manager
- _Comment=Manage your encryption keys
- Exec=seahorse
+diff -aurN seahorse-0.8.1.orig/src/seahorse.desktop.in seahorse-0.8.1/src/seahorse.desktop.in
+--- seahorse-0.8.1.orig/src/seahorse.desktop.in        2006-01-26 12:05:09.000000000 +0100
++++ seahorse-0.8.1/src/seahorse.desktop.in     2006-03-06 12:14:53.335160304 +0100
+@@ -6,7 +6,7 @@
  Terminal=false
  Type=Application
  Icon=seahorse.png
--Categories=Application;Cryptography;
-+Categories=GTK;GNOME;Utility;
+-Categories=GNOME;GTK;Application;Cryptography;
++Categories=GNOME;GTK;Utility;
  StartupNotify=true
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=seahorse

diff --git a/seahorse-install.patch b/seahorse-install.patch
index 28ac3cba8622aa0448e1ac33f89159576e2c2a46..0848c82bcc1cc2ea5699d74dd85b7777fc9db477 100644 (file)
--- a/seahorse-install.patch
+++ b/seahorse-install.patch
@@ -1,17 +1,15 @@
-diff -urN seahorse-0.7.8.orig/agent/Makefile.am seahorse-0.7.8/agent/Makefile.am
---- seahorse-0.7.8.orig/agent/Makefile.am      2005-05-09 09:52:58.000000000 +0200
-+++ seahorse-0.7.8/agent/Makefile.am   2005-05-09 09:53:11.000000000 +0200
-@@ -32,6 +32,3 @@
- 
- CLEANFILES = *.gladep* *.bak \
+diff -aurN seahorse-0.8.1.orig/agent/Makefile.am seahorse-0.8.1/agent/Makefile.am
+--- seahorse-0.8.1.orig/agent/Makefile.am      2005-10-12 17:57:05.000000000 +0200
++++ seahorse-0.8.1/agent/Makefile.am   2006-03-06 12:24:56.175514640 +0100
+@@ -34,4 +34,3 @@
        $(desktop_DATA)
--      
--install-exec-hook:
--      chmod u+s $(bindir)/seahorse-agent
-diff -urN seahorse-0.7.8.orig/plugins/nautilus/Makefile.am seahorse-0.7.8/plugins/nautilus/Makefile.am
---- seahorse-0.7.8.orig/plugins/nautilus/Makefile.am   2005-05-09 09:52:58.000000000 +0200
-+++ seahorse-0.7.8/plugins/nautilus/Makefile.am        2005-05-09 09:56:02.000000000 +0200
-@@ -15,27 +15,17 @@
+       
+ install-exec-hook:
+-      chmod u+s $(DESTDIR)/$(bindir)/seahorse-agent
+diff -aurN seahorse-0.8.1.orig/plugins/nautilus/Makefile.am seahorse-0.8.1/plugins/nautilus/Makefile.am
+--- seahorse-0.8.1.orig/plugins/nautilus/Makefile.am   2006-01-19 04:59:10.000000000 +0100
++++ seahorse-0.8.1/plugins/nautilus/Makefile.am        2006-03-06 12:25:36.347407584 +0100
+@@ -15,32 +15,10 @@
        $(top_builddir)/libseahorse/libseahorse-internal.la \
        $(SEAHORSE_LIBS)
  
@@ -23,27 +21,24 @@ diff -urN seahorse-0.7.8.orig/plugins/nautilus/Makefile.am seahorse-0.7.8/plugin
  mimedir = $(datadir)/mime/packages
  mime_DATA = seahorse.xml
  
- install-data-local:
-       mkdir -p $(datadir)/mime/packages/
+-if UPDATE_MIME_DATABASE
+-install-data-local:
+-      mkdir -p $(mimedir)
 -      update-mime-database $(datadir)/mime/
-     
- uninstall-local:
-       update-mime-database $(datadir)/mime/
-       
- @INTLTOOL_DESKTOP_RULE@
+-
+-uninstall-local:
+-      update-mime-database $(datadir)/mime/
+-else
+-install-data-local:
+-
+-uninstall-local:
+-endif
+-
+-@INTLTOOL_DESKTOP_RULE@
 -olddesktopdir = $(datadir)/control-center-2.0/capplets
 -olddesktop_in_files = seahorse-pgp-preferences.desktop.in
 -olddesktop_DATA = $(olddesktop_in_files:.desktop.in=.desktop)
 -
--@INTLTOOL_DESKTOP_RULE@
+ @INTLTOOL_DESKTOP_RULE@
  desktopdir = $(datadir)/applications
  desktop_in_files = seahorse-pgp-preferences.desktop.in
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@@ -43,7 +33,6 @@
- 
- EXTRA_DIST = \
-       $(mime_DATA) \
--      $(mimeinfo_DATA) \
-       $(desktop_in_files) 
- 
- CLEANFILES = *.bak \