SOURCES: seahorse-install.patch, seahorse-desktop.patch - updated ...
freetz
freetz at pld-linux.org
Mon Mar 6 13:37:42 CET 2006
Author: freetz Date: Mon Mar 6 12:37:42 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 0.8.1
---- Files affected:
SOURCES:
seahorse-install.patch (1.4 -> 1.5) , seahorse-desktop.patch (1.9 -> 1.10)
---- Diffs:
================================================================
Index: SOURCES/seahorse-install.patch
diff -u SOURCES/seahorse-install.patch:1.4 SOURCES/seahorse-install.patch:1.5
--- SOURCES/seahorse-install.patch:1.4 Mon May 9 10:21:38 2005
+++ SOURCES/seahorse-install.patch Mon Mar 6 13:37:36 2006
@@ -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 @@
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
+-
+- at 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)
-
-- at 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 \
================================================================
Index: SOURCES/seahorse-desktop.patch
diff -u SOURCES/seahorse-desktop.patch:1.9 SOURCES/seahorse-desktop.patch:1.10
--- SOURCES/seahorse-desktop.patch:1.9 Sun Sep 18 12:02:49 2005
+++ SOURCES/seahorse-desktop.patch Mon Mar 6 13:37:37 2006
@@ -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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/seahorse-install.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SOURCES/seahorse-desktop.patch?r1=1.9&r2=1.10&f=u
More information about the pld-cvs-commit
mailing list