Author: aflinta Date: Sat Mar 5 14:49:18 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
SOURCES:
abiword-desktop.patch (1.3 -> 1.4) , abiword-home_etc.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/abiword-desktop.patch
diff -u SOURCES/abiword-desktop.patch:1.3 SOURCES/abiword-desktop.patch:1.4
--- SOURCES/abiword-desktop.patch:1.3 Fri Oct 1 13:19:19 2004
+++ SOURCES/abiword-desktop.patch Sat Mar 5 15:49:13 2005
@@ -1,15 +1,7 @@
-diff -Nuard abiword-2.0.2.orig/abi/abiword.desktop
abiword-2.0.2/abi/abiword.desktop
---- abiword-2.0.2.orig/abi/abiword.desktop 2003-11-05 23:48:22.000000000
+0100
-+++ abiword-2.0.2/abi/abiword.desktop 2003-12-15 20:17:02.584553768 +0100
-@@ -1,11 +1,14 @@
- [Desktop Entry]
--Name=AbiWord Word Processor
-+Name=AbiWord
-+Name[pl]=AbiWord
- Name[de]=AbiWord Textverarbeitung
-+Comment=Word Processor
-+Comment[pl]=Edytor dokumentĂłw tekstowych
- Exec=abiword
+diff -aurN abiword-2.1.90.orig/abi/abiword.desktop
abiword-2.1.90/abi/abiword.desktop
+--- abiword-2.1.90.orig/abi/abiword.desktop 2004-09-30 16:34:58.000000000
+0200
++++ abiword-2.1.90/abi/abiword.desktop 2004-10-16 00:01:20.331450440 +0200
+@@ -3,14 +3,13 @@
Icon=abiword_48.png
Terminal=false
Type=Application
@@ -17,4 +9,12 @@
+Categories=GTK;GNOME;Office;WordProcessor;
StartupNotify=true
Encoding=UTF-8
-
+-X-Desktop-File-Install-Version=0.4
+ MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;
+ Name=AbiWord Word Processor
+ Name[de]=AbiWord Textverarbeitung
+ Name[nb]=AbiWord Tekstbehandling
+ Name[nn]=AbiWord Tekstbehandling
+-Name[no]=AbiWord Tekstbehandler
++Name[pl]=Procesor tekstu AbiWord
+ Name[pt]=AbiWord Processador de Texto
================================================================
Index: SOURCES/abiword-home_etc.patch
diff -u SOURCES/abiword-home_etc.patch:1.1 SOURCES/abiword-home_etc.patch:1.2
--- SOURCES/abiword-home_etc.patch:1.1 Sat Nov 15 07:39:16 2003
+++ SOURCES/abiword-home_etc.patch Sat Mar 5 15:49:13 2005
@@ -22,37 +22,6 @@
if (!szHome || !*szHome)
szHome = "./";
---- abiword-2.0.1.orig/abi/src/other/pango/pango/mini-xft/minixftcfg.c
2002-05-12 21:12:49.000000000 +0200
-+++ abiword-2.0.1/abi/src/other/pango/pango/mini-xft/minixftcfg.c
2003-11-14 09:50:19.000000000 +0100
-@@ -50,7 +50,7 @@
-
- if (*d == '~')
- {
-- h = getenv ("HOME");
-+ h = getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv ("HOME");
- if (!h)
- return False;
- dir = (char *) malloc (strlen (h) + strlen (d));
-@@ -93,7 +93,7 @@
-
- if (*c == '~')
- {
-- h = getenv ("HOME");
-+ h = getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv ("HOME");
- if (!h)
- return False;
- new = (char *) malloc (strlen (h) + strlen (c));
---- abiword-2.0.1.orig/abi/src/other/pango/pango/mini-xft/minixftlex.l
2002-05-12 21:12:55.000000000 +0200
-+++ abiword-2.0.1/abi/src/other/pango/pango/mini-xft/minixftlex.l
2003-11-14 09:51:17.000000000 +0100
-@@ -212,7 +212,7 @@
- t = s;
- if (*s == '~')
- {
-- h = getenv ("HOME");
-+ h = getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv ("HOME");
- if (h)
- {
- t = (char *) malloc (strlen (h) + strlen (s));
--- abiword-2.0.1.orig/popt/poptconfig.c 2002-11-11 03:00:51.000000000
+0100
+++ abiword-2.0.1/popt/poptconfig.c 2003-11-14 09:55:31.000000000 +0100
@@ -144,7 +144,9 @@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/abiword-desktop.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SOURCES/abiword-home_etc.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
