SOURCES: gramps-desktop.patch, gramps-icon_path.patch, gramps-loca...

krystian krystian at pld-linux.org
Tue Dec 12 00:54:58 CET 2006


Author: krystian                     Date: Mon Dec 11 23:54:58 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to 2.2.3

---- Files affected:
SOURCES:
   gramps-desktop.patch (1.4 -> 1.5) , gramps-icon_path.patch (1.1 -> 1.2) , gramps-locale_names.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/gramps-desktop.patch
diff -u SOURCES/gramps-desktop.patch:1.4 SOURCES/gramps-desktop.patch:1.5
--- SOURCES/gramps-desktop.patch:1.4	Tue May  2 08:52:37 2006
+++ SOURCES/gramps-desktop.patch	Tue Dec 12 00:54:53 2006
@@ -1,50 +1,12 @@
-diff -urN gramps-2.0.10.org/src/data/gramps.desktop gramps-2.0.10/src/data/gramps.desktop
---- gramps-2.0.10.org/src/data/gramps.desktop	2006-02-09 20:02:31.000000000 +0100
-+++ gramps-2.0.10/src/data/gramps.desktop	2006-05-02 08:40:47.801552000 +0200
-@@ -1,30 +1,33 @@
- [Desktop Entry]
- Encoding=UTF-8
- Name=GRAMPS Genealogy System
--Name[sv]=GRAMPS
--Name[no]=GRAMPS
--Name[nb]=GRAMPS
--Name[ru]=ГоноаНОгичоскио исследования в GRAMPS
- Name[de]=GRAMPS
--Name[hu]=GRAMPS
--Name[nl]=GRAMPS genealogie
- Name[fi]=GRAMPS sukututkimusohjelma
- Name[fr]=GRAMPS
-+Name[hu]=GRAMPS
-+Name[nb]=GRAMPS
-+Name[nl]=GRAMPS genealogie
-+Name[no]=GRAMPS
-+Name[pl]=GRAMPS
-+Name[ru]=ГоноаНОгичоскио исследования в GRAMPS
-+Name[sv]=GRAMPS
- Comment=Manage genealogical information, perform genealogical research and analysis
--Comment[nl]=Een programma voor genealogie infomatie beheer en genealogisch onderzoek en analyse
--Comment[sv]=Ett släktforskningsprogram
--Comment[no]=Et slektsforskningsprogram
--Comment[nb]=Et slektsforskningsprogram
--Comment[ru]=ХистоПа исследования и анаНиСа гоноаНОгичоскОК инфОрПации
- Comment[de]=Ein Programm zur Ahnenforschung
--Comment[hu]=ÖrÜklÊskutató Ês elemző program
- Comment[fi]=Hallinnoi, tutki ja analysoi sukutietoa
- Comment[fr]=Gestion des informations genealogiques, optimisation de la recherche et de l'analyse
-+Comment[hu]=ÖrÜklÊskutató Ês elemző program
-+Comment[nb]=Et slektsforskningsprogram
-+Comment[nl]=Een programma voor genealogie infomatie beheer en genealogisch onderzoek en analyse
-+Comment[no]=Et slektsforskningsprogram
-+Comment[pl]=ZarzÄ
dzanie informacjami genealogicznymi, przeprowadzanie badań i analiz genealogicznych
-+Comment[ru]=ХистоПа исследования и анаНиСа гоноаНОгичоскОК инфОрПации
-+Comment[sv]=Ett släktforskningsprogram
- Icon=gramps.png
+diff -urN gramps-2.2.3.orig/data/gramps.desktop gramps-2.2.3/data/gramps.desktop
+--- gramps-2.2.3.orig/data/gramps.desktop	2006-11-27 00:13:20.000000000 +0100
++++ gramps-2.2.3/data/gramps.desktop	2006-12-12 00:35:12.031772000 +0100
+@@ -32,7 +32,7 @@
  Terminal=false
  Type=Application
  StartupNotify=true
 -Categories=Application;Genealogy;Office;
-+Categories=GTK;GNOME;Education;
++Categories=GTK;Gnome;Education;
  X-GNOME-DocPath=gramps/gramps-manual.xml
  MimeType=application/x-gramps
  Exec=gramps %F
-++# vi: encoding=utf-8

================================================================
Index: SOURCES/gramps-icon_path.patch
diff -u SOURCES/gramps-icon_path.patch:1.1 SOURCES/gramps-icon_path.patch:1.2
--- SOURCES/gramps-icon_path.patch:1.1	Sat Jul 29 21:19:55 2006
+++ SOURCES/gramps-icon_path.patch	Tue Dec 12 00:54:53 2006
@@ -1,23 +1,21 @@
-diff -urN gramps-2.0.10.orig/src/data/Makefile.am gramps-2.0.10/src/data/Makefile.am
---- gramps-2.0.10.orig/src/data/Makefile.am	2005-09-12 01:24:33.000000000 +0200
-+++ gramps-2.0.10/src/data/Makefile.am	2006-07-29 16:43:37.596076000 +0200
-@@ -60,8 +60,8 @@
- install-data-local:
- 	$(INSTALL) -d $(DESTDIR)$(prefix)/share/applications
- 	$(INSTALL_DATA) $(top_srcdir)/src/data/gramps.desktop $(DESTDIR)$(prefix)/share/applications
--	$(INSTALL) -d $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/
--	$(INSTALL_DATA) $(top_srcdir)/src/data/gnome-mime-application-x-*.png $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/
-+	$(INSTALL) -d $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/mimetypes/
-+	$(INSTALL_DATA) $(top_srcdir)/src/data/gnome-mime-application-x-*.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/mimetypes/
- 	$(INSTALL) -d $(DESTDIR)$(prefix)/share/application-registry
- 	$(INSTALL_DATA) $(top_srcdir)/src/data/gramps.applications $(DESTDIR)$(prefix)/share/application-registry
- 	$(INSTALL) -d $(DESTDIR)$(prefix)/share/mime-info
-@@ -76,7 +76,7 @@
+diff -urN gramps-2.2.3.orig/data/Makefile.am gramps-2.2.3/data/Makefile.am
+--- gramps-2.2.3.orig/data/Makefile.am	2006-11-10 07:10:42.000000000 +0100
++++ gramps-2.2.3/data/Makefile.am	2006-12-11 23:36:12.649249750 +0100
+@@ -34,7 +34,7 @@
+ xmldir = $(SHARED_MIME_DIR)/packages
+ xml_DATA = $(xml_files)
  
- uninstall-local:
- 	-rm $(DESTDIR)$(prefix)/share/applications/gramps.desktop
--	-rm $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-*.png
-+	-rm $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-*.png
- 	-rm $(DESTDIR)$(prefix)/share/mime-info/gramps.keys
- 	-rm $(DESTDIR)$(prefix)/share/mime-info/gramps.mime
- 	-rm $(DESTDIR)$(prefix)/share/application-registry/gramps.applications
+-pngdir = $(datadir)/icons/gnome/48x48/mimetypes
++pngdir = $(datadir)/icons/hicolor/48x48/mimetypes
+ png_DATA = \
+ 	gnome-mime-application-x-gramps.png \
+ 	gnome-mime-application-x-gedcom.png \
+@@ -42,7 +42,7 @@
+ 	gnome-mime-application-x-gramps-xml.png \
+ 	gnome-mime-application-x-geneweb.png
+ 
+-svgdir = $(datadir)/icons/gnome/scalable/mimetypes
++svgdir = $(datadir)/icons/hicolor/scalable/mimetypes
+ svg_DATA = \
+ 	gnome-mime-application-x-gramps.svg \
+ 	gnome-mime-application-x-gedcom.svg \

================================================================
Index: SOURCES/gramps-locale_names.patch
diff -u SOURCES/gramps-locale_names.patch:1.5 SOURCES/gramps-locale_names.patch:1.6
--- SOURCES/gramps-locale_names.patch:1.5	Thu Aug 10 22:17:15 2006
+++ SOURCES/gramps-locale_names.patch	Tue Dec 12 00:54:53 2006
@@ -1,24 +1,24 @@
-diff -urN gramps-2.0.11.orig/configure gramps-2.0.11/configure
---- gramps-2.0.11.orig/configure	2006-08-10 22:05:40.179292250 +0200
-+++ gramps-2.0.11/configure	2006-08-10 22:07:48.995342750 +0200
-@@ -2023,7 +2023,7 @@
-    { (exit 1); exit 1; }; }
- fi
- 
--LANGUAGES="hu zh_CN cs da de es fr it nb nl no pl pt_BR ro ru sv eo fi lt sk"
-+LANGUAGES="hu zh_CN cs da de es fr it nb nl pl pt_BR ro ru sv eo fi lt sk"
- 
- 
- DISTLANGS=
-diff -urN gramps-2.0.11.orig/configure.in gramps-2.0.11/configure.in
---- gramps-2.0.11.orig/configure.in	2006-08-10 22:05:40.179292250 +0200
-+++ gramps-2.0.11/configure.in	2006-08-10 22:08:19.049221000 +0200
-@@ -42,7 +42,7 @@
-   AC_MSG_ERROR(Couldn't find iconv program.)
- fi
- 
--LANGUAGES="hu zh_CN cs da de es fr it nb nl no pl pt_BR ro ru sv eo fi lt sk"
-+LANGUAGES="hu zh_CN cs da de es fr it nb nl pl pt_BR ro ru sv eo fi lt sk"
- AC_SUBST(LANGUAGES)
+diff -urN gramps-2.2.3.orig/configure gramps-2.2.3/configure
+--- gramps-2.2.3.orig/configure	2006-11-27 04:27:24.000000000 +0100
++++ gramps-2.2.3/configure	2006-12-11 22:52:59.913791000 +0100
+@@ -3095,7 +3095,7 @@
  
- DISTLANGS=
+ 
+ 
+-ALL_LINGUAS="hu zh_CN cs da de es fr it nb nl no pl pt_BR ro ru sv eo fi lt sk tr"
++ALL_LINGUAS="hu zh_CN cs da de es fr it nb nl pl pt_BR ro ru sv eo fi lt sk tr"
+ GETTEXT_PACKAGE=gramps
+ 
+ 
+diff -urN gramps-2.2.3.orig/configure.in gramps-2.2.3/configure.in
+--- gramps-2.2.3.orig/configure.in	2006-11-27 04:24:41.000000000 +0100
++++ gramps-2.2.3/configure.in	2006-12-11 22:53:36.496077250 +0100
+@@ -45,7 +45,7 @@
+ AC_SUBST(VERSIONSTRING)
+ 
+ dnl Add the languages which your application supports here.
+-ALL_LINGUAS="hu zh_CN cs da de es fr it nb nl no pl pt_BR ro ru sv eo fi lt sk tr"
++ALL_LINGUAS="hu zh_CN cs da de es fr it nb nl pl pt_BR ro ru sv eo fi lt sk tr"
+ GETTEXT_PACKAGE=gramps
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define to the Gettext package name.])
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/gramps-desktop.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SOURCES/gramps-icon_path.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/gramps-locale_names.patch?r1=1.5&r2=1.6&f=u



More information about the pld-cvs-commit mailing list