- outdate

Changed files:
    codeblocks-fhs.patch -> 1.3
    codeblocks-pwd.patch -> 1.2

diff --git a/codeblocks-fhs.patch b/codeblocks-fhs.patch
deleted file mode 100644 (file)
index bcff202..0000000
--- a/codeblocks-fhs.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-prepare patch for plugins's Makefile.am
-find . -name "Makefile.am" -exec sed -i "s@libdir = \$(pkgdatadir)/plugins@libdir = \@plugins_dir\@@" '{}' ';'
-
-diff -Nur o.codeblocks-1.0rc2/acinclude.m4 n.codeblocks-1.0rc2/acinclude.m4
---- o.codeblocks-1.0rc2/acinclude.m4   2005-12-08 17:10:24.454151072 +0100
-+++ n.codeblocks-1.0rc2/acinclude.m4   2005-12-08 17:10:13.204861224 +0100
-@@ -228,3 +228,20 @@
- fi
- 
- ])
-+
-+AC_DEFUN([CODEBLOCKS_PLUGINS_DIR],
-+      [
-+      if test "x$libdir" = "xNONE/lib" ; then
-+              plugins_dir="/usr/local/lib/codeblocks/plugins"
-+      else
-+              plugins_dir="${libdir}/codeblocks/plugins"
-+      fi
-+      AC_ARG_WITH(plugins-dir,
-+                              AC_HELP_STRING([--with-plugins-dir=DIR],
-+                                                              [Path the plugins directory (default is "$plugins_dir")]),
-+                              ,
-+                              with_plugins_dir="$plugins_dir")
-+      AC_DEFINE_UNQUOTED(PLUGINDIR, "${with_plugins_dir}", [Code::Blocks plugins' directory])
-+      AC_MSG_RESULT(PLUGINDIR: ${with_plugins_dir})
-+      AC_SUBST(plugins_dir, ${with_plugins_dir})
-+])
-diff -Nur o.codeblocks-1.0rc2/codeblocks.pc.in n.codeblocks-1.0rc2/codeblocks.pc.in
---- o.codeblocks-1.0rc2/codeblocks.pc.in       2005-12-08 17:10:24.468148944 +0100
-+++ n.codeblocks-1.0rc2/codeblocks.pc.in       2005-12-08 17:10:13.224858184 +0100
-@@ -2,7 +2,7 @@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--plugindir=@datadir@/@PACKAGE@/plugins
-+plugindir=@libdir@/@PACKAGE@/plugins
- sharedir=@datadir@
- 
- Name: codeblocks
-diff -Nur o.codeblocks-1.0rc2/configure.in n.codeblocks-1.0rc2/configure.in
---- o.codeblocks-1.0rc2/configure.in   2005-12-08 17:10:24.469148792 +0100
-+++ n.codeblocks-1.0rc2/configure.in   2005-12-08 17:10:13.227857728 +0100
-@@ -18,6 +18,7 @@
- AC_PROG_AWK
- 
- CODEBLOCKS_SETUP_FOR_TARGET
-+CODEBLOCKS_PLUGINS_DIR
- 
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
-diff -Nur o.codeblocks-1.0rc2/src/plugins/astyle/Makefile.am n.codeblocks-1.0rc2/src/plugins/astyle/Makefile.am
---- o.codeblocks-1.0rc2/src/plugins/astyle/Makefile.am 2005-12-08 17:10:24.740107600 +0100
-+++ n.codeblocks-1.0rc2/src/plugins/astyle/Makefile.am 2005-12-08 17:10:13.478819576 +0100
-@@ -5,7 +5,7 @@
-               -I$(top_srcdir)/src/sdk \
-               -I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @plugins_dir@
- 
- lib_LTLIBRARIES = libastyle.la
- 
-diff -Nur o.codeblocks-1.0rc2/src/plugins/classwizard/Makefile.am n.codeblocks-1.0rc2/src/plugins/classwizard/Makefile.am
---- o.codeblocks-1.0rc2/src/plugins/classwizard/Makefile.am    2005-12-08 17:10:24.777101976 +0100
-+++ n.codeblocks-1.0rc2/src/plugins/classwizard/Makefile.am    2005-12-08 17:10:13.491817600 +0100
-@@ -4,7 +4,7 @@
-               -I$(top_srcdir)/src/sdk \
-               -I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @plugins_dir@
- 
- lib_LTLIBRARIES = libclasswizard.la
- 
-diff -Nur o.codeblocks-1.0rc2/src/plugins/codecompletion/Makefile.am n.codeblocks-1.0rc2/src/plugins/codecompletion/Makefile.am
---- o.codeblocks-1.0rc2/src/plugins/codecompletion/Makefile.am 2005-12-08 17:10:24.835093160 +0100
-+++ n.codeblocks-1.0rc2/src/plugins/codecompletion/Makefile.am 2005-12-08 17:10:13.555807872 +0100
-@@ -4,7 +4,7 @@
-               -I$(top_srcdir)/src/sdk \
-               -I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @plugins_dir@
- 
- lib_LTLIBRARIES = libcodecompletion.la
- 
-diff -Nur o.codeblocks-1.0rc2/src/plugins/compilergcc/Makefile.am n.codeblocks-1.0rc2/src/plugins/compilergcc/Makefile.am
---- o.codeblocks-1.0rc2/src/plugins/compilergcc/Makefile.am    2005-12-08 17:10:25.127048776 +0100
-+++ n.codeblocks-1.0rc2/src/plugins/compilergcc/Makefile.am    2005-12-08 17:10:13.831765920 +0100
-@@ -7,7 +7,7 @@
- 
- AM_CXXFLAGS = -DDEPSLIB_UNIX
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @plugins_dir@
- 
- lib_LTLIBRARIES = libcompiler.la
- 
-diff -Nur o.codeblocks-1.0rc2/src/plugins/contrib/codestat/Makefile.am n.codeblocks-1.0rc2/src/plugins/contrib/codestat/Makefile.am
---- o.codeblocks-1.0rc2/src/plugins/contrib/codestat/Makefile.am       2005-12-08 17:10:25.222034336 +0100
-+++ n.codeblocks-1.0rc2/src/plugins/contrib/codestat/Makefile.am       2005-12-08 17:10:13.986742360 +0100
-@@ -4,7 +4,7 @@
-               -I$(top_srcdir)/src/sdk \
-               -I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @plugins_dir@
- 
- lib_LTLIBRARIES = libcodestat.la
- 
-diff -Nur o.codeblocks-1.0rc2/src/plugins/contrib/profiler/Makefile.am n.codeblocks-1.0rc2/src/plugins/contrib/profiler/Makefile.am
---- o.codeblocks-1.0rc2/src/plugins/contrib/profiler/Makefile.am       2005-12-08 17:10:25.453999072 +0100
-+++ n.codeblocks-1.0rc2/src/plugins/contrib/profiler/Makefile.am       2005-12-08 17:10:14.453671376 +0100
-@@ -4,7 +4,7 @@
-               -I$(top_srcdir)/src/sdk \
-               -I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @plugins_dir@
- 
- lib_LTLIBRARIES = libprofiler.la
- 
-diff -Nur o.codeblocks-1.0rc2/src/plugins/debuggergdb/Makefile.am n.codeblocks-1.0rc2/src/plugins/debuggergdb/Makefile.am
---- o.codeblocks-1.0rc2/src/plugins/debuggergdb/Makefile.am    2005-12-08 17:10:26.501839776 +0100
-+++ n.codeblocks-1.0rc2/src/plugins/debuggergdb/Makefile.am    2005-12-08 17:10:15.528507976 +0100
-@@ -4,7 +4,7 @@
-               -I$(top_srcdir)/src/sdk \
-               -I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @plugins_dir@
- 
- lib_LTLIBRARIES = libdebuggergdb.la
- 
-diff -Nur o.codeblocks-1.0rc2/src/plugins/defaultmimehandler/Makefile.am n.codeblocks-1.0rc2/src/plugins/defaultmimehandler/Makefile.am
---- o.codeblocks-1.0rc2/src/plugins/defaultmimehandler/Makefile.am     2005-12-08 17:10:26.543833392 +0100
-+++ n.codeblocks-1.0rc2/src/plugins/defaultmimehandler/Makefile.am     2005-12-08 17:10:15.568501896 +0100
-@@ -4,7 +4,7 @@
-               -I$(top_srcdir)/src/sdk \
-               -I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @plugins_dir@
- 
- lib_LTLIBRARIES = libdefaultmimehandler.la
- 
-diff -Nur o.codeblocks-1.0rc2/src/plugins/pluginwizard/Makefile.am n.codeblocks-1.0rc2/src/plugins/pluginwizard/Makefile.am
---- o.codeblocks-1.0rc2/src/plugins/pluginwizard/Makefile.am   2005-12-08 17:10:26.577828224 +0100
-+++ n.codeblocks-1.0rc2/src/plugins/pluginwizard/Makefile.am   2005-12-08 17:10:15.603496576 +0100
-@@ -4,7 +4,7 @@
-               -I$(top_srcdir)/src/sdk \
-               -I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @plugins_dir@
- 
- lib_LTLIBRARIES = libpluginwizard.la
- 
-diff -Nur o.codeblocks-1.0rc2/src/plugins/todo/Makefile.am n.codeblocks-1.0rc2/src/plugins/todo/Makefile.am
---- o.codeblocks-1.0rc2/src/plugins/todo/Makefile.am   2005-12-08 17:10:26.621821536 +0100
-+++ n.codeblocks-1.0rc2/src/plugins/todo/Makefile.am   2005-12-08 17:10:15.633492016 +0100
-@@ -4,7 +4,7 @@
-               -I$(top_srcdir)/src/sdk \
-               -I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @plugins_dir@
- 
- lib_LTLIBRARIES = libtodo.la
- 
-diff -Nur o.codeblocks-1.0rc2/src/plugins/xpmanifest/Makefile.am n.codeblocks-1.0rc2/src/plugins/xpmanifest/Makefile.am
---- o.codeblocks-1.0rc2/src/plugins/xpmanifest/Makefile.am     2005-12-08 17:10:26.640818648 +0100
-+++ n.codeblocks-1.0rc2/src/plugins/xpmanifest/Makefile.am     2005-12-08 17:10:15.675485632 +0100
-@@ -2,7 +2,7 @@
-               -I$(top_srcdir)/src/sdk \
-               -I$(top_srcdir)/src/sdk/wxscintilla/include
- 
--libdir = $(pkgdatadir)/plugins
-+libdir = @plugins_dir@
- 
- lib_LTLIBRARIES = libxpmanifest.la
- 
-diff -Nur o.codeblocks-1.0rc2/src/src/main.cpp n.codeblocks-1.0rc2/src/src/main.cpp
---- o.codeblocks-1.0rc2/src/src/main.cpp       2005-12-08 18:06:09.872255616 +0100
-+++ n.codeblocks-1.0rc2/src/src/main.cpp       2005-12-08 18:06:13.733668592 +0100
-@@ -23,6 +23,10 @@
- * $Date$\r
- */\r
- \r
-+#ifdef HAVE_CONFIG_H\r
-+    #include "config.h"\r
-+#endif\r
-+\r
- #include <sdk.h>\r
- #include "app.h"\r
- #include "main.h"\r
-@@ -660,7 +664,9 @@
- \r
-     PluginManager* m_PluginManager = Manager::Get()->GetPluginManager();\r
- \r
--    wxString path = CFG_READ(_T("data_path")) + _T("/plugins");\r
-+    //XXX: FHS changes \r
-+    wxString path = PLUGINDIR;\r
-+\r
-     MSGMAN()->Log(_("Scanning for plugins in %s..."), path.c_str());\r
-     int count = m_PluginManager->ScanForPlugins(path);\r
-     MSGMAN()->AppendLog(_("Found %d plugins: "), count);\r

diff --git a/codeblocks-pwd.patch b/codeblocks-pwd.patch
deleted file mode 100644 (file)
index 4ff32c4..0000000
--- a/codeblocks-pwd.patch
+++ /dev/null
@@ -1,117 +0,0 @@
---- codeblocks-1.0rc2/src/sdk/resources/Makefile.am.orig       2006-01-16 16:57:32.000000000 +0100
-+++ codeblocks-1.0rc2/src/sdk/resources/Makefile.am    2006-01-16 16:59:02.000000000 +0100
-@@ -7,4 +7,4 @@
- CLEANFILES = $(pkgdata_DATA)
- 
- manager_resources.zip:
--      PWD=`pwd` cd $(srcdir) && zip -j $(PWD)/manager_resources.zip *.xrc images/*.png > /dev/null
-+      zip -j manager_resources.zip *.xrc images/*.png > /dev/null
---- codeblocks-1.0rc2/src/src/resources/Makefile.am.orig       2006-03-06 17:37:21.000000000 +0100
-+++ codeblocks-1.0rc2/src/src/resources/Makefile.am    2006-03-06 17:39:05.000000000 +0100
-@@ -9,7 +9,9 @@
- CLEANFILES = $(pkgdata_DATA)
- 
- resources.zip:
--      PWD=`pwd` cd $(srcdir) && zip $(PWD)/resources.zip *.xrc images/*.png images/16x16/*.png > /dev/null
-+      zip resources.zip *.xrc images/*.png images/16x16/*.png > /dev/null
- 
- start_here.zip:
--      PWD=`pwd` cd $(srcdir)/start_here && zip $(PWD)/start_here.zip *.htm* *.png > /dev/null
-+      cd start_here && \
-+      zip ../start_here.zip *.htm* *.png > /dev/null && \
-+      cd ..
---- codeblocks-1.0rc2/src/plugins/todo/resources/Makefile.am.orig      2006-03-06 17:37:08.000000000 +0100
-+++ codeblocks-1.0rc2/src/plugins/todo/resources/Makefile.am   2006-03-06 17:37:13.000000000 +0100
-@@ -2,6 +2,6 @@
- CLEANFILES = $(pkgdata_DATA)
- 
- todo.zip:
--      PWD=`pwd` cd $(srcdir) && zip $(PWD)/todo.zip *.xrc > /dev/null
-+      zip todo.zip *.xrc > /dev/null
- 
- EXTRA_DIST = add_todo.xrc settings.xrc
---- codeblocks-1.0rc2/src/plugins/contrib/codestat/resources/Makefile.am.orig  2006-03-06 17:36:45.000000000 +0100
-+++ codeblocks-1.0rc2/src/plugins/contrib/codestat/resources/Makefile.am       2006-03-06 17:36:51.000000000 +0100
-@@ -4,4 +4,4 @@
- CLEANFILES = $(pkgdata_DATA)
- 
- codestat.zip:
--      PWD=`pwd` cd $(srcdir) && zip $(PWD)/codestat.zip *.xrc > /dev/null
-+      zip codestat.zip *.xrc > /dev/null
---- codeblocks-1.0rc2/src/plugins/contrib/profiler/resources/Makefile.am.orig  2006-03-06 17:36:28.000000000 +0100
-+++ codeblocks-1.0rc2/src/plugins/contrib/profiler/resources/Makefile.am       2006-03-06 17:36:34.000000000 +0100
-@@ -4,4 +4,4 @@
- CLEANFILES = $(pkgdata_DATA)
- 
- profiler.zip:
--      PWD=`pwd` cd $(srcdir) && zip $(PWD)/profiler.zip *.xrc > /dev/null
-+      zip profiler.zip *.xrc > /dev/null
---- codeblocks-1.0rc2/src/plugins/classwizard/resources/Makefile.am.orig       2006-03-06 17:36:14.000000000 +0100
-+++ codeblocks-1.0rc2/src/plugins/classwizard/resources/Makefile.am    2006-03-06 17:36:21.000000000 +0100
-@@ -4,4 +4,4 @@
- CLEANFILES = $(pkgdata_DATA)
- 
- class_wizard.zip:
--      PWD=`pwd` cd $(srcdir) && zip $(PWD)/class_wizard.zip *.xrc > /dev/null
-+      zip class_wizard.zip *.xrc > /dev/null
---- codeblocks-1.0rc2/src/plugins/defaultmimehandler/resources/Makefile.am.orig        2006-03-06 17:36:00.000000000 +0100
-+++ codeblocks-1.0rc2/src/plugins/defaultmimehandler/resources/Makefile.am     2006-03-06 17:36:07.000000000 +0100
-@@ -2,6 +2,6 @@
- CLEANFILES = $(pkgdata_DATA)
- 
- defaultmimehandler.zip:
--      PWD=`pwd` cd $(srcdir) && zip $(PWD)/defaultmimehandler.zip *.xrc > /dev/null
-+      zip defaultmimehandler.zip *.xrc > /dev/null
- 
- EXTRA_DIST = edit_files_handling.xrc
---- codeblocks-1.0rc2/src/plugins/compilergcc/resources/Makefile.am.orig       2006-03-06 17:35:47.000000000 +0100
-+++ codeblocks-1.0rc2/src/plugins/compilergcc/resources/Makefile.am    2006-03-06 17:35:53.000000000 +0100
-@@ -2,7 +2,7 @@
- CLEANFILES = $(pkgdata_DATA)
- 
- compiler_gcc.zip:
--      PWD=`pwd` cd $(srcdir) && zip $(PWD)/compiler_gcc.zip *.xrc images/*.png images/16x16/*.png > /dev/null
-+      zip compiler_gcc.zip *.xrc images/*.png images/16x16/*.png > /dev/null
- 
- EXTRA_DIST = advanced_compiler_options.xrc \
-       compiler_menu.xrc \
---- codeblocks-1.0rc2/src/plugins/codecompletion/resources/Makefile.am.orig    2006-03-06 17:35:30.000000000 +0100
-+++ codeblocks-1.0rc2/src/plugins/codecompletion/resources/Makefile.am 2006-03-06 17:35:38.000000000 +0100
-@@ -2,7 +2,7 @@
- CLEANFILES = $(pkgdata_DATA)
- 
- code_completion.zip:
--      PWD=`pwd` cd $(srcdir) && zip $(PWD)/code_completion.zip *.xrc > /dev/null
-+      zip code_completion.zip *.xrc > /dev/null
- 
- install-exec-local:
-       mkdir -p $(DESTDIR)$(pkgdatadir)/images/codecompletion
---- codeblocks-1.0rc2/src/plugins/astyle/resources/Makefile.am.orig    2006-03-06 17:35:14.000000000 +0100
-+++ codeblocks-1.0rc2/src/plugins/astyle/resources/Makefile.am 2006-03-06 17:35:22.000000000 +0100
-@@ -4,4 +4,4 @@
- CLEANFILES = $(pkgdata_DATA)
- 
- astyle.zip:
--      PWD=`pwd` cd $(srcdir) && zip $(PWD)/astyle.zip *.xrc > /dev/null
-+      zip astyle.zip *.xrc > /dev/null
---- codeblocks-1.0rc2/src/plugins/pluginwizard/resources/Makefile.am.orig      2006-03-06 17:34:59.000000000 +0100
-+++ codeblocks-1.0rc2/src/plugins/pluginwizard/resources/Makefile.am   2006-03-06 17:35:06.000000000 +0100
-@@ -2,6 +2,6 @@
- CLEANFILES = $(pkgdata_DATA)
- 
- plugin_wizard.zip:
--      PWD=`pwd` cd $(srcdir) && zip $(PWD)/plugin_wizard.zip *.xrc > /dev/null
-+      zip plugin_wizard.zip *.xrc > /dev/null
- 
- EXTRA_DIST = new_plugin.xrc plugin_info.xrc
---- codeblocks-1.0rc2/src/plugins/debuggergdb/resources/Makefile.am.orig       2006-03-06 17:33:17.000000000 +0100
-+++ codeblocks-1.0rc2/src/plugins/debuggergdb/resources/Makefile.am    2006-03-06 17:34:31.000000000 +0100
-@@ -2,7 +2,7 @@
- CLEANFILES = $(pkgdata_DATA)
- 
- debugger_gdb.zip:
--      PWD=`pwd` cd $(srcdir) && zip $(PWD)/debugger_gdb.zip *.xrc images/*.png images/16x16/*.png > /dev/null
-+      zip debugger_gdb.zip *.xrc images/*.png images/16x16/*.png > /dev/null
- 
- EXTRA_DIST = backtrace.xrc \
-       debugger_menu.xrc \