This commit was manufactured by cvs2git to create branch 'AC-branch'.

Sprout from master 2006-03-16 10:46:23 UTC Jan Palus <jan.palus@gmail.com> '- fix imlib2 BR'
Delete:
    fluxbox-0.1.13-bugfix1.patch
    fluxbox-nls-codesets.patch

diff --git a/fluxbox-0.1.13-bugfix1.patch b/fluxbox-0.1.13-bugfix1.patch
deleted file mode 100644 (file)
index cf0c75a..0000000
--- a/fluxbox-0.1.13-bugfix1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Only in fluxbox-0.1.13-bugfix1/data: menu.bak
-diff -r -U 1 fluxbox-0.1.13/src/Ewmh.cc fluxbox-0.1.13-bugfix1/src/Ewmh.cc
---- fluxbox-0.1.13/src/Ewmh.cc 2002-10-17 01:32:17.000000000 +0200
-+++ fluxbox-0.1.13-bugfix1/src/Ewmh.cc 2002-11-30 15:51:51.000000000 +0100
-@@ -331,2 +331,5 @@
-       m_net_close_window = XInternAtom(disp, "_NET_CLOSE_WINDOW", False);
-+      m_net_moveresize_window = XInternAtom(disp, "_NET_MOVERESIZE_WINDOW", False);
-+      
-+      // TODO: implement this one
-       m_net_wm_moveresize = XInternAtom(disp, "_NET_WM_MOVERESIZE", False);
-diff -r -U 1 fluxbox-0.1.13/src/Font.cc fluxbox-0.1.13-bugfix1/src/Font.cc
---- fluxbox-0.1.13/src/Font.cc 2002-10-25 23:07:07.000000000 +0200
-+++ fluxbox-0.1.13-bugfix1/src/Font.cc 2002-11-30 15:50:53.000000000 +0100
-@@ -141,10 +141,4 @@
-               return false;
--      bool ret_val = m_fontimp->load(name);
--      if (ret_val && name == 0) { //prevent from having a bad fontimp
--              m_fontstr = name; // if the load really succeded then set font string
--      } else {
--              m_fontstr = "";
--      }
--
--      return ret_val;
-+      m_fontstr = name;
-+      return m_fontimp->load(name);
- }
-diff -r -U 1 fluxbox-0.1.13/src/Screen.cc fluxbox-0.1.13-bugfix1/src/Screen.cc
---- fluxbox-0.1.13/src/Screen.cc       2002-11-17 12:27:50.000000000 +0100
-+++ fluxbox-0.1.13-bugfix1/src/Screen.cc       2002-11-30 15:50:53.000000000 +0100
-@@ -286,3 +286,3 @@
-                       image_control, fluxbox->getStyleFilename(), getRootCommand().c_str());
--
-+      theme->reconfigure(*resource.antialias);
- 
-@@ -449,3 +449,2 @@
-       XFlush(getBaseDisplay()->getXDisplay());
--      theme->reconfigure(*resource.antialias);
- }
-diff -r -U 1 fluxbox-0.1.13/src/Texture.cc fluxbox-0.1.13-bugfix1/src/Texture.cc
---- fluxbox-0.1.13/src/Texture.cc      2002-09-19 21:51:55.000000000 +0200
-+++ fluxbox-0.1.13-bugfix1/src/Texture.cc      2002-11-30 15:52:03.000000000 +0100
-@@ -26,2 +26,6 @@
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif // HAVE_CONFIG_H
-+
- #include "Texture.hh"

diff --git a/fluxbox-nls-codesets.patch b/fluxbox-nls-codesets.patch
deleted file mode 100644 (file)
index e20e3ee..0000000
--- a/fluxbox-nls-codesets.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-diff -urN fluxbox-0.9.9.orig/nls/bg_BG/BaseDisplay.m fluxbox-0.9.9/nls/bg_BG/BaseDisplay.m
---- fluxbox-0.9.9.orig/nls/bg_BG/BaseDisplay.m 2002-02-24 19:55:42.000000000 +0100
-+++ fluxbox-0.9.9/nls/bg_BG/BaseDisplay.m      2004-04-26 22:18:18.289202008 +0200
-@@ -1,5 +1,7 @@
- $set 1 #BaseDisplay
- 
-+$ codeset=cp1251
-+
- $ #XError
- # %s:  X ãðåøêà: %s(%d) opcodes %d/%d\n  resource 0x%lx\n
- $ #SignalCaught
-diff -urN fluxbox-0.9.9.orig/nls/convert.awk fluxbox-0.9.9/nls/convert.awk
---- fluxbox-0.9.9.orig/nls/convert.awk 2003-10-04 14:44:47.000000000 +0200
-+++ fluxbox-0.9.9/nls/convert.awk      2004-04-26 22:18:18.290201856 +0200
-@@ -29,6 +29,8 @@
-   text = substr($0, 3)  
-   printf "%d %s\n", minor, text > output
- }
--  
-+
-+/^\$ codeset/ { print > output }
-+
- ! /^(\$|#)/ { print > output }
- 
-diff -urN fluxbox-0.9.9.orig/nls/da_DK/BaseDisplay.m fluxbox-0.9.9/nls/da_DK/BaseDisplay.m
---- fluxbox-0.9.9.orig/nls/da_DK/BaseDisplay.m 2001-12-11 21:47:36.000000000 +0100
-+++ fluxbox-0.9.9/nls/da_DK/BaseDisplay.m      2004-04-26 22:18:18.291201704 +0200
-@@ -1,5 +1,7 @@
- $set 1 #BaseDisplay
- 
-+$ codeset=iso-8859-1
-+
- $ #XError
- # %s:  X fejl: %s(%d) kode %d/%d\n  resource 0x%lx\n
- $ #SignalCaught
-diff -urN fluxbox-0.9.9.orig/nls/de_DE/BaseDisplay.m fluxbox-0.9.9/nls/de_DE/BaseDisplay.m
---- fluxbox-0.9.9.orig/nls/de_DE/BaseDisplay.m 2002-12-16 12:25:58.000000000 +0100
-+++ fluxbox-0.9.9/nls/de_DE/BaseDisplay.m      2004-04-26 22:18:18.291201704 +0200
-@@ -1,5 +1,7 @@
- $set 1 #BaseDisplay
- 
-+$ codeset=iso-8859-1
-+
- $ #XError
- # %s:  X Fehler ! : %s(%d) opcodes %d/%d\n  resource 0x%lx\n
- $ #SignalCaught
-diff -urN fluxbox-0.9.9.orig/nls/es_ES/BaseDisplay.m fluxbox-0.9.9/nls/es_ES/BaseDisplay.m
---- fluxbox-0.9.9.orig/nls/es_ES/BaseDisplay.m 2001-12-11 21:47:36.000000000 +0100
-+++ fluxbox-0.9.9/nls/es_ES/BaseDisplay.m      2004-04-26 22:18:18.292201552 +0200
-@@ -1,5 +1,7 @@
- $set 1 #BaseDisplay
- 
-+$ codeset=iso-8859-1
-+
- $ #XError
- # %s:  Un error de X: %s(%d) clave de operación %d/%d\n  recurso 0x%lx\n
- $ #SignalCaught
-diff -urN fluxbox-0.9.9.orig/nls/et_EE/BaseDisplay.m fluxbox-0.9.9/nls/et_EE/BaseDisplay.m
---- fluxbox-0.9.9.orig/nls/et_EE/BaseDisplay.m 2001-12-11 21:47:37.000000000 +0100
-+++ fluxbox-0.9.9/nls/et_EE/BaseDisplay.m      2004-04-26 22:18:18.292201552 +0200
-@@ -1,5 +1,7 @@
- $set 1 #BaseDisplay
- 
-+$ codeset=iso-8859-1
-+
- $ #XError
- # %s:  X'i viga: %s(%d) opkood %d/%d\n  resurss 0x%lx\n
- $ #SignalCaught
-diff -urN fluxbox-0.9.9.orig/nls/fr_FR/BaseDisplay.m fluxbox-0.9.9/nls/fr_FR/BaseDisplay.m
---- fluxbox-0.9.9.orig/nls/fr_FR/BaseDisplay.m 2001-12-11 21:47:37.000000000 +0100
-+++ fluxbox-0.9.9/nls/fr_FR/BaseDisplay.m      2004-04-26 22:18:18.293201400 +0200
-@@ -1,5 +1,7 @@
- $set 1 #BaseDisplay
- 
-+$ codeset=iso-8859-1
-+
- $ #XError
- # %s:  Erreur de X %s(%d) opcodes %d/%d\n  ressource 0x%lx\n
- $ #SignalCaught
-diff -urN fluxbox-0.9.9.orig/nls/it_IT/BaseDisplay.m fluxbox-0.9.9/nls/it_IT/BaseDisplay.m
---- fluxbox-0.9.9.orig/nls/it_IT/BaseDisplay.m 2002-10-20 22:57:15.000000000 +0200
-+++ fluxbox-0.9.9/nls/it_IT/BaseDisplay.m      2004-04-26 22:18:18.293201400 +0200
-@@ -1,5 +1,7 @@
- $set 1 #BaseDisplay
- 
-+$ codeset=iso-8859-1
-+
- $ #XError
- # %s:  errore di X: %s(%d) opcodes %d/%d\n  resource 0x%lx\n
- $ #SignalCaught
-diff -urN fluxbox-0.9.9.orig/nls/ja_JP/BaseDisplay.m fluxbox-0.9.9/nls/ja_JP/BaseDisplay.m
---- fluxbox-0.9.9.orig/nls/ja_JP/BaseDisplay.m 2002-02-24 19:51:59.000000000 +0100
-+++ fluxbox-0.9.9/nls/ja_JP/BaseDisplay.m      2004-04-26 22:18:18.294201248 +0200
-@@ -1,5 +1,7 @@
- $set 1 #BaseDisplay
- 
-+$ codeset=eucjp
-+
- $ #XError
- # %s:  X ¥¨¥é¡¼: %s(%d) opcodes %d/%d\n  resource 0x%lx\n
- $ #SignalCaught
-diff -urN fluxbox-0.9.9.orig/nls/lv_LV/BaseDisplay.m fluxbox-0.9.9/nls/lv_LV/BaseDisplay.m
---- fluxbox-0.9.9.orig/nls/lv_LV/BaseDisplay.m 2002-09-21 15:52:17.000000000 +0200
-+++ fluxbox-0.9.9/nls/lv_LV/BaseDisplay.m      2004-04-26 22:18:18.294201248 +0200
-@@ -1,5 +1,7 @@
- $set 1 #BaseDisplay
- 
-+$ codeset=iso-8859-13
-+
- $ #XError
- # %s:  X kïûda: %s(%d) opkodi %d/%d\n  resurss 0x%lx\n
- $ #SignalCaught
-diff -urN fluxbox-0.9.9.orig/nls/nl_NL/BaseDisplay.m fluxbox-0.9.9/nls/nl_NL/BaseDisplay.m
---- fluxbox-0.9.9.orig/nls/nl_NL/BaseDisplay.m 2003-12-14 21:54:58.000000000 +0100
-+++ fluxbox-0.9.9/nls/nl_NL/BaseDisplay.m      2004-04-26 22:18:18.295201096 +0200
-@@ -1,5 +1,7 @@
- $set 1 #BaseDisplay
- 
-+$ codeset=iso-8859-1
-+
- $ #XError
- # %s:  X error: %s(%d) opcodes %d/%d\n  resource 0x%lx\n
- $ #SignalCaught
-diff -urN fluxbox-0.9.9.orig/nls/pl_PL/BaseDisplay.m fluxbox-0.9.9/nls/pl_PL/BaseDisplay.m
---- fluxbox-0.9.9.orig/nls/pl_PL/BaseDisplay.m 2003-09-20 12:43:10.000000000 +0200
-+++ fluxbox-0.9.9/nls/pl_PL/BaseDisplay.m      2004-04-26 22:20:39.857680328 +0200
-@@ -1,5 +1,7 @@
- $set 1 #BaseDisplay
- 
-+$ codeset=iso-8859-2
-+
- $ #XError
- # %s:  X error: %s(%d) opcodes %d/%d\n  resource 0x%lx\n
- $ #SignalCaught
-diff -urN fluxbox-0.9.9.orig/nls/pt_BR/BaseDisplay.m fluxbox-0.9.9/nls/pt_BR/BaseDisplay.m
---- fluxbox-0.9.9.orig/nls/pt_BR/BaseDisplay.m 2001-12-11 21:47:37.000000000 +0100
-+++ fluxbox-0.9.9/nls/pt_BR/BaseDisplay.m      2004-04-26 22:18:18.295201096 +0200
-@@ -1,5 +1,7 @@
- $set 1 #BaseDisplay
- 
-+$ codeset=iso-8859-1
-+
- $ #XError
- # %s:  X erro: %s(%d) opcodes %d/%d\n  recurso 0x%lx\n
- $ #SignalCaught
-diff -urN fluxbox-0.9.9.orig/nls/pt_PT/BaseDisplay.m fluxbox-0.9.9/nls/pt_PT/BaseDisplay.m
---- fluxbox-0.9.9.orig/nls/pt_PT/BaseDisplay.m 2002-02-04 08:45:18.000000000 +0100
-+++ fluxbox-0.9.9/nls/pt_PT/BaseDisplay.m      2004-04-26 22:18:18.296200944 +0200
-@@ -1,5 +1,7 @@
- $set 1 #BaseDisplay
- 
-+$ codeset=iso-8859-1
-+
- $ #XError
- # %s:  X erro: %s(%d) opções %d/%d\n  recurso 0x%lx\n
- $ #SignalCaught
-diff -urN fluxbox-0.9.9.orig/nls/ru_RU/BaseDisplay.m fluxbox-0.9.9/nls/ru_RU/BaseDisplay.m
---- fluxbox-0.9.9.orig/nls/ru_RU/BaseDisplay.m 2002-01-26 12:33:08.000000000 +0100
-+++ fluxbox-0.9.9/nls/ru_RU/BaseDisplay.m      2004-04-26 22:18:18.297200792 +0200
-@@ -1,5 +1,7 @@
- $set 1 #BaseDisplay
- 
-+$ codeset=iso-8859-5
-+
- $ #XError
- # %s:  ÏÛÉÂËÁ X ÓÅÒ×ÅÒÁ: %s(%d) ÚÎÁÞÅÎÉÑ %d/%d\n ÒÅÓÕÒÓ 0x%lx\n
- $ #SignalCaught
-diff -urN fluxbox-0.9.9.orig/nls/sl_SI/BaseDisplay.m fluxbox-0.9.9/nls/sl_SI/BaseDisplay.m
---- fluxbox-0.9.9.orig/nls/sl_SI/BaseDisplay.m 2004-01-17 22:21:02.000000000 +0100
-+++ fluxbox-0.9.9/nls/sl_SI/BaseDisplay.m      2004-04-26 22:21:24.169943840 +0200
-@@ -1,5 +1,7 @@
- $set 1 #BaseDisplay
- 
-+$ codeset=iso-8859-2
-+
- $ #XError
- # %s:  Napaka v sistemu oken X: %s(%d) operacijska koda %d/%d\n  vir 0x%lx\n
- $ #SignalCaught
-diff -urN fluxbox-0.9.9.orig/nls/sv_SE/BaseDisplay.m fluxbox-0.9.9/nls/sv_SE/BaseDisplay.m
---- fluxbox-0.9.9.orig/nls/sv_SE/BaseDisplay.m 2001-12-11 21:47:38.000000000 +0100
-+++ fluxbox-0.9.9/nls/sv_SE/BaseDisplay.m      2004-04-26 22:18:18.298200640 +0200
-@@ -1,5 +1,7 @@
- $set 1 #BaseDisplay
- 
-+$ codeset=iso-8859-1
-+
- $ #XError
- # %s:  X-fel: %s(%d) opkod %d/%d\n  resurs 0x%lx\n
- $ #SignalCaught
-diff -urN fluxbox-0.9.9.orig/nls/tr_TR/BaseDisplay.m fluxbox-0.9.9/nls/tr_TR/BaseDisplay.m
---- fluxbox-0.9.9.orig/nls/tr_TR/BaseDisplay.m 2002-12-16 12:41:57.000000000 +0100
-+++ fluxbox-0.9.9/nls/tr_TR/BaseDisplay.m      2004-04-26 22:18:18.299200488 +0200
-@@ -1,5 +1,7 @@
- $set 1 #BaseDisplay
- 
-+$ codeset=iso-8859-9
-+
- $ #XError
- # %s : X hatasý : %s ( %d ) opkodlar %d/%d\n  kaynak 0x%lx\n
- $ #SignalCaught