- merged from DEVEL

Changed files:
    gnome-games-desktop.patch -> 1.4
    gnome-games-include.patch -> 1.2

diff --git a/gnome-games-desktop.patch b/gnome-games-desktop.patch
index 423a2d91f1aed25a068b3eb6cd9e2488f23b9bac..0ffc3ec1986a53b3ea65e2229c48ca0577dad9d0 100644 (file)
--- a/gnome-games-desktop.patch
+++ b/gnome-games-desktop.patch
@@ -165,22 +165,16 @@
  X-GNOME-Bugzilla-Component=same-gnome
 --- gnome-games-2.6.2/blackjack/data/blackjack.desktop~        2004-08-24 05:36:55.000000000 +0200
 +++ gnome-games-2.6.2/blackjack/data/blackjack.desktop 2004-08-24 05:36:55.000000000 +0200
-@@ -26,9 +26,9 @@
- Name[ko]=블랙잭
- Name[lt]=Blackjack
- Name[mn]=Блакжак
-+Name[nb]=Blackjack
+@@ -26,7 +26,6 @@
+ Name[nb]=Blackjack
  Name[nl]=Blackjack
  Name[nn]=Blackjack
 -Name[no]=Blackjack
  Name[pa]=ਕਾਲਾ ਗੋਲ੏ਾ
  Name[pl]=Oczko
  Name[pt]=Blackjack
-@@ -69,9 +69,9 @@
- Comment[lt]=Žaisti kazino žaidimą Blackjack
- Comment[mn]=Казино карт тоглоом Блакжак тоглох
- Comment[ms]=Main permainan kad kasino Blackjack
-+Comment[nb]=Spill kasinospillet Blackjack
+@@ -69,7 +69,6 @@
+ Comment[nb]=Spill kasinospillet Blackjack
  Comment[nl]=Het casino-kaartspel Blackjack
  Comment[nn]=Spel kasinospelet Blackjack
 -Comment[no]=Spill kasinospillet Blackjack
@@ -198,26 +192,20 @@
  X-GNOME-Bugzilla-Component=blackjack
 --- gnome-games-2.6.2/gnect/data/gnect.desktop~        2004-08-24 05:37:33.000000000 +0200
 +++ gnome-games-2.6.2/gnect/data/gnect.desktop 2004-08-24 05:37:33.000000000 +0200
-@@ -27,9 +27,9 @@
- Name[lt]=Keturi-eilėje
- Name[mn]=Нэг мөрөнд дөрөв
- Name[ms]=Four-in-a-row
-+Name[nb]=Fire på rad
+@@ -27,7 +27,6 @@
+ Name[nb]=Fire på rad
  Name[nl]=Vier-op-een-rij
  Name[nn]=Fire på rad
 -Name[no]=Fire på rad
- Name[pa]=ੲਿੱਕ ਕਤਾਰ ਵਿੱਚ ਚਾਰ
+ Name[pa]=à¨\87ੱਕ ਕਤਾਰ ਵਿੱਚ ਚਾਰ
  Name[pl]=Gra "cztery w rzędzie"
  Name[pt]=Quatro-em-linha
-@@ -67,9 +67,9 @@
- Comment[ja]=同じ色のラインを作って競い合って下さい
- Comment[ko]=서로 같은 색을 한 줄로 놓는 게임
- Comment[lt]=Sudarykite liniją iš tos pačios spalvos rutulių
-+Comment[nb]=Kjemp om å la linjene bli av samme farge
+@@ -67,7 +67,6 @@
+ Comment[nb]=Kjemp om å la linjene bli av samme farge
  Comment[nl]=Probeer lijnen van dezelfde kleur te maken
  Comment[nn]=Kapp om å laga linjer av same farge
 -Comment[no]=Kjemp om å la linjene bli av samme farge
- Comment[pa]=ੲਿੱà¨\95 ਰੰà¨\97 ਦà©\80à¨\85੾ ਲਾੲਿਨ੾ ਬਣਾੳà©\81ਣ ਦਾ ਮੁਕਾਬਲਾ ਕਰੋ
+ Comment[pa]=à¨\87ੱà¨\95 ਰੰà¨\97 ਦà©\80à¨\86à¨\82 ਲਾà¨\87ਨਾà¨\82 ਬਣਾà¨\89ਣ ਦਾ ਮੁਕਾਬਲਾ ਕਰੋ
  Comment[pl]=Rywalizuj w celu utowrzenia linii w jednym kolorze
  Comment[pt]=Compita para fazer linhas da mesma cor
 @@ -84,7 +84,7 @@

diff --git a/gnome-games-include.patch b/gnome-games-include.patch
new file mode 100644 (file)
index 0000000..0aa0429
--- /dev/null
+++ b/gnome-games-include.patch
@@ -0,0 +1,11 @@
+diff -urN aa/gnome-games-2.7.5/libgames-support/games-controls.c gnome-games-2.7.5/libgames-support/games-controls.c
+--- aa/gnome-games-2.7.5/libgames-support/games-controls.c     2004-06-06 00:21:20.000000000 +0200
++++ gnome-games-2.7.5/libgames-support/games-controls.c        2004-07-20 22:32:21.235179008 +0200
+@@ -17,6 +17,7 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#include <config.h>
+ #include <string.h>
+ 
+ #include <glib/gi18n-lib.h>