rpms/gnome-desktop/devel .cvsignore, 1.61, 1.62 gnome-desktop-2.22.0-mistranslation.patch, 1.1, 1.2 gnome-desktop.spec, 1.138, 1.139 sources, 1.61, 1.62

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27245

Modified Files:
	.cvsignore gnome-desktop-2.22.0-mistranslation.patch 
	gnome-desktop.spec sources 
Log Message:
2.22.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	11 Mar 2008 02:51:55 -0000	1.61
+++ .cvsignore	7 Apr 2008 23:03:32 -0000	1.62
@@ -1 +1 @@
-gnome-desktop-2.22.0.tar.bz2
+gnome-desktop-2.22.1.tar.bz2

gnome-desktop-2.22.0-mistranslation.patch:

Index: gnome-desktop-2.22.0-mistranslation.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop-2.22.0-mistranslation.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-desktop-2.22.0-mistranslation.patch	26 Mar 2008 16:57:24 -0000	1.1
+++ gnome-desktop-2.22.0-mistranslation.patch	7 Apr 2008 23:03:32 -0000	1.2
@@ -19,118 +19,3 @@
  
  #: ../gnome-about/gnome-about.in:951
  msgid "Version"
-diff -up gnome-desktop-2.22.0/po/el.po.mistranslation gnome-desktop-2.22.0/po/el.po
---- gnome-desktop-2.22.0/po/el.po.mistranslation	2008-03-26 12:53:44.000000000 -0400
-+++ gnome-desktop-2.22.0/po/el.po	2008-03-26 12:53:56.000000000 -0400
-@@ -31,14 +31,14 @@ msgid ""
- msgstr ""
- "Project-Id-Version: el\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2008-03-08 19:05+0200\n"
-+"POT-Creation-Date: 2008-03-24 14:58+0000\n"
- "PO-Revision-Date: 2008-03-08 19:07+0200\n"
- "Last-Translator: Simos Xenitellis <simos at gnome.org>\n"
- "Language-Team: Greek <team at gnome.gr>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"Plural-Forms:  nplurals=2; plural=(n != 1);"
-+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
- 
- #: ../gnome-about/gnome-about.desktop.in.in.h:1
- #: ../gnome-about/gnome-about.in:61
-@@ -91,7 +91,7 @@ msgstr "Περί της επιφάνει
- 
- #: ../gnome-about/gnome-about.in:865
- msgid "%(name)s: %(value)s"
--msgstr "%(όνομα): %(τιμές)"
-+msgstr "%(name)s: %(value)s"
- 
- #: ../gnome-about/gnome-about.in:879
- msgid "Welcome to the GNOME Desktop"
-@@ -103,7 +103,7 @@ msgstr "Φτάνει σε εσάς απÏ
- 
- #: ../gnome-about/gnome-about.in:920
- msgid "<b>%(name)s:</b> %(value)s"
--msgstr "<b>%(όνομα):</b> %(τιμές)"
-+msgstr "<b>%(name)s:</b> %(value)s"
- 
- #: ../gnome-about/gnome-about.in:976
- msgid "Version"
-@@ -312,59 +312,59 @@ msgstr "Περιήγηση εικονιÎ
- msgid "Run in t_erminal"
- msgstr "Εκτέλεση σε τ_ερματικό"
- 
--#: ../libgnome-desktop/gnome-ditem-edit.c:657
--#: ../libgnome-desktop/gnome-ditem-edit.c:757
-+#: ../libgnome-desktop/gnome-ditem-edit.c:621
-+#: ../libgnome-desktop/gnome-ditem-edit.c:721
- msgid "Language"
- msgstr "Γλώσσα"
- 
--#: ../libgnome-desktop/gnome-ditem-edit.c:662
--#: ../libgnome-desktop/gnome-ditem-edit.c:763
-+#: ../libgnome-desktop/gnome-ditem-edit.c:626
-+#: ../libgnome-desktop/gnome-ditem-edit.c:727
- msgid "Name"
- msgstr "Όνομα"
- 
--#: ../libgnome-desktop/gnome-ditem-edit.c:667
--#: ../libgnome-desktop/gnome-ditem-edit.c:769
-+#: ../libgnome-desktop/gnome-ditem-edit.c:631
-+#: ../libgnome-desktop/gnome-ditem-edit.c:733
- msgid "Generic name"
- msgstr "Γενικό όνομα"
- 
--#: ../libgnome-desktop/gnome-ditem-edit.c:672
--#: ../libgnome-desktop/gnome-ditem-edit.c:777
-+#: ../libgnome-desktop/gnome-ditem-edit.c:636
-+#: ../libgnome-desktop/gnome-ditem-edit.c:741
- msgid "Comment"
- msgstr "Σχόλιο"
- 
--#: ../libgnome-desktop/gnome-ditem-edit.c:710
-+#: ../libgnome-desktop/gnome-ditem-edit.c:674
- msgid "_Try this before using:"
- msgstr "Δοκιμάσ_τε αυτό πριν τη χρήση:"
- 
--#: ../libgnome-desktop/gnome-ditem-edit.c:721
-+#: ../libgnome-desktop/gnome-ditem-edit.c:685
- msgid "_Documentation:"
- msgstr "Τεκμη_ρίωση:"
- 
--#: ../libgnome-desktop/gnome-ditem-edit.c:732
-+#: ../libgnome-desktop/gnome-ditem-edit.c:696
- msgid "_Name/Comment translations:"
- msgstr "Μεταφράσεις Ο_νόματος/Σχολίου:"
- 
--#: ../libgnome-desktop/gnome-ditem-edit.c:779
-+#: ../libgnome-desktop/gnome-ditem-edit.c:743
- msgid "_Add/Set"
- msgstr "Προσ_θήκη/Καθορισμός"
- 
--#: ../libgnome-desktop/gnome-ditem-edit.c:784
-+#: ../libgnome-desktop/gnome-ditem-edit.c:748
- msgid "Add or Set Name/Comment Translations"
- msgstr "Προσθήκη ή καθορισμός μετάφρασης ονόματος/σχολίου"
- 
--#: ../libgnome-desktop/gnome-ditem-edit.c:786
-+#: ../libgnome-desktop/gnome-ditem-edit.c:750
- msgid "Re_move"
- msgstr "Α_φαίρεση"
- 
--#: ../libgnome-desktop/gnome-ditem-edit.c:791
-+#: ../libgnome-desktop/gnome-ditem-edit.c:755
- msgid "Remove Name/Comment Translation"
- msgstr "Διαγραφή μετάφρασης ονόματος/σχολίου"
- 
--#: ../libgnome-desktop/gnome-ditem-edit.c:807
-+#: ../libgnome-desktop/gnome-ditem-edit.c:771
- msgid "Basic"
- msgstr "Βασικό"
- 
--#: ../libgnome-desktop/gnome-ditem-edit.c:815
-+#: ../libgnome-desktop/gnome-ditem-edit.c:779
- msgid "Advanced"
- msgstr "Για προχωρημένους"
- 


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- gnome-desktop.spec	5 Apr 2008 16:40:52 -0000	1.138
+++ gnome-desktop.spec	7 Apr 2008 23:03:32 -0000	1.139
@@ -11,8 +11,8 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.22.0
-Release: 6%{?dist}
+Version: 2.22.1
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.22/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -23,8 +23,6 @@
 Patch2:   add-randr-12.patch
 Patch4:   multires.patch
 Patch5:   gnome-desktop-2.22.0-mistranslation.patch
-# fixed upstream
-Patch6:   gnome-desktop-2.22.0-future.patch
 
 Patch7:   refcount-slideshow.patch
 
@@ -81,7 +79,6 @@
 %patch2 -p1 -b .add-randr-12
 %patch4 -p1 -b .multires
 %patch5 -p1 -b .mistranslation
-%patch6 -p1 -b .future
 %patch7 -p1 -b .refcount-slideshow
 
 %build
@@ -129,6 +126,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Mon Apr 7 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.1-1
+- Update to 2.22.1
+
 * Tue Apr 5 2008 Soren Sandmann <sandmann at redhat.com> - 2.22.0-6
 - Update randr code
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	11 Mar 2008 02:51:55 -0000	1.61
+++ sources	7 Apr 2008 23:03:32 -0000	1.62
@@ -1 +1 @@
-452d4ee91b3c54aac4282f3f1e3b68f0  gnome-desktop-2.22.0.tar.bz2
+39d1421dbfe54d0838a00b055edcb5cf  gnome-desktop-2.22.1.tar.bz2