- up to 13.12

diff --git a/codeblocks-FHS-plugins.patch b/codeblocks-FHS-plugins.patch
index 65c0977890da8844c8f92f2a592b7b6efcf19dfc..0b9039c5e4c827f16aa5dbd5e91f2788893f0442 100644 (file)
--- a/codeblocks-FHS-plugins.patch
+++ b/codeblocks-FHS-plugins.patch
@@ -5,8 +5,8 @@ diff -urN codeblocks-8.02_orig/src/sdk/configmanager.cpp codeblocks-8.02/src/sdk
  
          case sdPluginsGlobal:
  #ifndef CB_AUTOCONF
--            return ConfigManager::data_path_global + _T("/plugins");
-+            // return ConfigManager::data_path_global + _T("/plugins");
+-            return ConfigManager::data_path_global + wxFILE_SEP_PATH + _T("plugins");
++            // return ConfigManager::data_path_global + wxFILE_SEP_PATH + _T("plugins");
 +            return _T("@libdir@/codeblocks/plugins");
  #else
              return ConfigManager::plugin_path_global;

diff --git a/codeblocks-ac.patch b/codeblocks-ac.patch
index 7ee50c4377bc0645a60c02ff96d53ee6b6d05338..9c8cbcabda30949d312192eda4148ec6ec58577c 100644 (file)
--- a/codeblocks-ac.patch
+++ b/codeblocks-ac.patch
@@ -2,13 +2,13 @@ diff -urN codeblocks-8.02/acinclude.m4 codeblocks-8.02.new/acinclude.m4
 --- codeblocks-8.02/acinclude.m4.orig  2010-07-01 01:18:30.000000000 +0200
 +++ codeblocks-8.02/acinclude.m4       2010-07-01 01:23:01.000000000 +0200
 @@ -71,8 +71,8 @@ if test "x$enable_debug" = "xyes"; then
-          CXXFLAGS="-g -DDEBUG -DCB_AUTOCONF $CXXFLAGS"
-       AC_MSG_RESULT(yes)
- else
--      CFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CFLAGS"
--      CXXFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CXXFLAGS"
-+      CFLAGS="-Wall -ffast-math -DCB_AUTOCONF $CFLAGS"
-+      CXXFLAGS="-Wall -ffast-math -DCB_AUTOCONF $CXXFLAGS"
-       AC_MSG_RESULT(no)
- fi
- 
+         LDFLAGS="-Wl,--no-undefined"
+         AC_MSG_RESULT(yes)
+     else
+-        CFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CFLAGS"
+-        CXXFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CXXFLAGS"
++        CFLAGS="-Wall -ffast-math -DCB_AUTOCONF $CFLAGS"
++        CXXFLAGS="-Wall -ffast-math -DCB_AUTOCONF $CXXFLAGS"
+         LDFLAGS="-Wl,--no-undefined"
+         AC_MSG_RESULT(no)
+     fi

diff --git a/codeblocks-pwd.patch b/codeblocks-pwd.patch
index dc619652c8dbddd02f4beb22c8d9b37b638e71b8..8a3e25ae26c861087cfd2668dc59bc0541bbc001 100644 (file)
--- a/codeblocks-pwd.patch
+++ b/codeblocks-pwd.patch
@@ -1,403 +1,545 @@
-diff -urN codeblocks-8.02/src/plugins/astyle/resources/Makefile.am codeblocks-8.02.new/src/plugins/astyle/resources/Makefile.am
---- codeblocks-8.02/src/plugins/astyle/resources/Makefile.am   2007-07-16 16:07:04.000000000 +0200
-+++ codeblocks-8.02.new/src/plugins/astyle/resources/Makefile.am       2009-01-31 13:22:38.000000000 +0100
+diff -ur codeblocks-13.12/src/plugins/abbreviations/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/abbreviations/resources/Makefile.am
+--- codeblocks-13.12/src/plugins/abbreviations/resources/Makefile.am   2013-11-17 20:33:51.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/abbreviations/resources/Makefile.am       2014-01-18 19:35:30.545377868 +0100
+@@ -4,5 +4,5 @@
+ EXTRA_DIST = manifest.xml $(srcdir)/*.xrc
+ 
+ abbreviations.zip: $(EXTRA_DIST)
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/abbreviations.zip manifest.xml *.xrc > /dev/null
++      zip $(PWD)/abbreviations.zip manifest.xml *.xrc > /dev/null
+ 
+diff -ur codeblocks-13.12/src/plugins/astyle/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/astyle/resources/Makefile.am
+--- codeblocks-13.12/src/plugins/astyle/resources/Makefile.am  2013-11-17 20:34:12.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/astyle/resources/Makefile.am      2014-01-18 19:35:30.545377868 +0100
 @@ -4,4 +4,4 @@
  CLEANFILES = $(pkgdata_DATA)
  
  astyle.zip: $(EXTRA_DIST)
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/astyle.zip manifest.xml *.xrc > /dev/null
-+      zip astyle.zip manifest.xml *.xrc > /dev/null
-diff -urN codeblocks-8.02/src/plugins/autosave/Makefile.am codeblocks-8.02.new/src/plugins/autosave/Makefile.am
---- codeblocks-8.02/src/plugins/autosave/Makefile.am   2007-07-16 16:07:04.000000000 +0200
-+++ codeblocks-8.02.new/src/plugins/autosave/Makefile.am       2009-01-31 13:22:52.000000000 +0100
++      zip $(PWD)/astyle.zip manifest.xml *.xrc > /dev/null
+diff -ur codeblocks-13.12/src/plugins/autosave/Makefile.am codeblocks-13.12.pwd/src/plugins/autosave/Makefile.am
+--- codeblocks-13.12/src/plugins/autosave/Makefile.am  2013-11-17 20:33:50.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/autosave/Makefile.am      2014-01-18 19:35:30.545377868 +0100
 @@ -17,4 +17,4 @@
  CLEANFILES = $(pkgdata_DATA)
  
  autosave.zip: $(EXTRA_DIST)
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/autosave.zip manifest.xml *.xrc > /dev/null
-+      zip autosave.zip manifest.xml *.xrc > /dev/null
-diff -urN codeblocks-8.02/src/plugins/classwizard/resources/Makefile.am codeblocks-8.02.new/src/plugins/classwizard/resources/Makefile.am
---- codeblocks-8.02/src/plugins/classwizard/resources/Makefile.am      2007-07-16 16:07:04.000000000 +0200
-+++ codeblocks-8.02.new/src/plugins/classwizard/resources/Makefile.am  2009-01-31 13:23:04.000000000 +0100
++      zip $(PWD)/autosave.zip manifest.xml *.xrc > /dev/null
+diff -ur codeblocks-13.12/src/plugins/classwizard/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/classwizard/resources/Makefile.am
+--- codeblocks-13.12/src/plugins/classwizard/resources/Makefile.am     2013-11-17 20:33:50.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/classwizard/resources/Makefile.am 2014-01-18 19:35:30.545377868 +0100
 @@ -4,4 +4,4 @@
  CLEANFILES = $(pkgdata_DATA)
  
  classwizard.zip: $(EXTRA_DIST)
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/classwizard.zip manifest.xml *.xrc > /dev/null
-+      zip classwizard.zip manifest.xml *.xrc > /dev/null
-diff -urN codeblocks-8.02/src/plugins/codecompletion/resources/Makefile.am codeblocks-8.02.new/src/plugins/codecompletion/resources/Makefile.am
---- codeblocks-8.02/src/plugins/codecompletion/resources/Makefile.am   2007-07-16 16:07:04.000000000 +0200
-+++ codeblocks-8.02.new/src/plugins/codecompletion/resources/Makefile.am       2009-01-31 13:23:19.000000000 +0100
-@@ -34,7 +34,7 @@
-       images/var_public.png
++      zip $(PWD)/classwizard.zip manifest.xml *.xrc > /dev/null
+diff -ur codeblocks-13.12/src/plugins/codecompletion/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/codecompletion/resources/Makefile.am
+--- codeblocks-13.12/src/plugins/codecompletion/resources/Makefile.am  2013-11-17 20:34:13.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/codecompletion/resources/Makefile.am      2014-01-18 19:35:30.545377868 +0100
+@@ -56,7 +56,7 @@
+              images/vars_folder.png
  
  codecompletion.zip: $(EXTRA_DIST)
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/codecompletion.zip manifest.xml *.xrc > /dev/null
-+      zip codecompletion.zip manifest.xml *.xrc > /dev/null
++      zip $(PWD)/codecompletion.zip manifest.xml *.xrc > /dev/null
  
  install-exec-local:
        mkdir -p $(DESTDIR)$(pkgdatadir)/images/codecompletion
-diff -urN codeblocks-8.02/src/plugins/compilergcc/resources/Makefile.am codeblocks-8.02.new/src/plugins/compilergcc/resources/Makefile.am
---- codeblocks-8.02/src/plugins/compilergcc/resources/Makefile.am      2007-07-16 16:07:04.000000000 +0200
-+++ codeblocks-8.02.new/src/plugins/compilergcc/resources/Makefile.am  2009-01-31 13:23:34.000000000 +0100
-@@ -19,5 +19,5 @@
+diff -ur codeblocks-13.12/src/plugins/compilergcc/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/compilergcc/resources/Makefile.am
+--- codeblocks-13.12/src/plugins/compilergcc/resources/Makefile.am     2013-11-17 20:33:51.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/compilergcc/resources/Makefile.am 2014-01-18 19:35:30.545377868 +0100
+@@ -20,7 +20,7 @@
        images/16x16/stop.png
  
  compiler.zip: $(EXTRA_DIST)
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/compiler.zip manifest.xml *.xrc images/*.png images/16x16/*.png > /dev/null
-+      zip compiler.zip manifest.xml *.xrc images/*.png images/16x16/*.png > /dev/null
++      zip $(PWD)/compiler.zip manifest.xml *.xrc images/*.png images/16x16/*.png > /dev/null
  
-diff -urN codeblocks-8.02/src/plugins/contrib/AutoVersioning/Makefile.am codeblocks-8.02.new/src/plugins/contrib/AutoVersioning/Makefile.am
---- codeblocks-8.02/src/plugins/contrib/AutoVersioning/Makefile.am     2007-12-09 18:51:26.000000000 +0100
-+++ codeblocks-8.02.new/src/plugins/contrib/AutoVersioning/Makefile.am 2009-01-31 13:25:33.000000000 +0100
-@@ -34,4 +34,4 @@
+ compilers_xmldir = $(datadir)/@PACKAGE@/compilers
+ 
+diff -ur codeblocks-13.12/src/plugins/contrib/AutoVersioning/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/AutoVersioning/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/AutoVersioning/Makefile.am    2013-11-17 20:34:10.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/AutoVersioning/Makefile.am        2014-01-18 19:35:30.555377867 +0100
+@@ -33,4 +33,4 @@
  CLEANFILES = $(pkgdata_DATA)
  
  AutoVersioning.zip: manifest.xml
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/AutoVersioning.zip manifest.xml > /dev/null
-+      zip AutoVersioning.zip manifest.xml > /dev/null
-diff -urNp codeblocks-10.05-release.orig/src/plugins/contrib/BrowseTracker/Makefile.am codeblocks-10.05-release/src/plugins/contrib/BrowseTracker/Makefile.am
---- codeblocks-10.05-release.orig/src/plugins/contrib/BrowseTracker/Makefile.am        2010-07-01 01:25:12.000000000 +0200
-+++ codeblocks-10.05-release/src/plugins/contrib/BrowseTracker/Makefile.am     2010-07-01 01:30:10.000000000 +0200
-@@ -43,4 +43,4 @@ pkgdata_DATA = BrowseTracker.zip
++      zip $(PWD)/AutoVersioning.zip manifest.xml > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/BrowseTracker/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/BrowseTracker/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/BrowseTracker/Makefile.am     2013-11-17 20:34:10.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/BrowseTracker/Makefile.am 2014-01-18 19:35:30.552044534 +0100
+@@ -42,4 +42,4 @@
  CLEANFILES = $(pkgdata_DATA)
  
  BrowseTracker.zip: manifest.xml
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/BrowseTracker.zip manifest.xml > /dev/null
-+      zip BrowseTracker.zip manifest.xml > /dev/null
-diff -urN codeblocks-8.02/src/plugins/contrib/byogames/Makefile.am codeblocks-8.02.new/src/plugins/contrib/byogames/Makefile.am
---- codeblocks-8.02/src/plugins/contrib/byogames/Makefile.am   2007-07-16 16:07:04.000000000 +0200
-+++ codeblocks-8.02.new/src/plugins/contrib/byogames/Makefile.am       2009-01-31 13:26:18.000000000 +0100
-@@ -36,4 +36,4 @@
++      zip $(PWD)/BrowseTracker.zip manifest.xml > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/byogames/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/byogames/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/byogames/Makefile.am  2013-11-17 20:34:09.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/byogames/Makefile.am      2014-01-18 19:35:30.548711201 +0100
+@@ -35,4 +35,4 @@
  CLEANFILES = $(pkgdata_DATA)
  
  byogames.zip: manifest.xml
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/byogames.zip manifest.xml > /dev/null
-+      zip byogames.zip manifest.xml > /dev/null
-diff -urN codeblocks-8.02/src/plugins/contrib/cb_koders/Makefile.am codeblocks-8.02.new/src/plugins/contrib/cb_koders/Makefile.am
---- codeblocks-8.02/src/plugins/contrib/cb_koders/Makefile.am  2007-07-16 16:07:04.000000000 +0200
-+++ codeblocks-8.02.new/src/plugins/contrib/cb_koders/Makefile.am      2009-01-31 13:26:30.000000000 +0100
++      zip $(PWD)/byogames.zip manifest.xml > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/cb_koders/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/cb_koders/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/cb_koders/Makefile.am 2013-11-17 20:33:55.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/cb_koders/Makefile.am     2014-01-18 19:35:30.545377868 +0100
 @@ -24,4 +24,4 @@
  CLEANFILES = $(pkgdata_DATA)
  
  cb_koders.zip: manifest.xml
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/cb_koders.zip manifest.xml > /dev/null
-+      zip cb_koders.zip manifest.xml > /dev/null
-diff -urNp codeblocks-10.05-release.orig/src/plugins/contrib/codesnippets/resources/Makefile.am codeblocks-10.05-release/src/plugins/contrib/codesnippets/resources/Makefile.am
---- codeblocks-10.05-release.orig/src/plugins/contrib/codesnippets/resources/Makefile.am       2010-07-01 01:25:12.000000000 +0200
-+++ codeblocks-10.05-release/src/plugins/contrib/codesnippets/resources/Makefile.am    2010-07-01 01:30:18.000000000 +0200
-@@ -136,5 +136,5 @@ dist_image_DATA =  allsnippets.png \
++      zip $(PWD)/cb_koders.zip manifest.xml > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/Cccc/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/Cccc/resources/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/Cccc/resources/Makefile.am    2013-11-17 20:34:04.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/Cccc/resources/Makefile.am        2014-01-18 19:35:30.555377867 +0100
+@@ -4,4 +4,4 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ Cccc.zip: manifest.xml
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/Cccc.zip manifest.xml > /dev/null
++      zip $(PWD)/Cccc.zip manifest.xml > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/codesnippets/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/codesnippets/resources/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/codesnippets/resources/Makefile.am    2013-11-17 20:34:08.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/codesnippets/resources/Makefile.am        2014-01-18 19:35:30.552044534 +0100
+@@ -140,5 +140,5 @@
  EXTRA_DIST = manifest.xml
  
  codesnippets.zip: $(EXTRA_DIST)
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/codesnippets.zip manifest.xml > /dev/null
-+      zip codesnippets.zip manifest.xml > /dev/null
++      zip $(PWD)/codesnippets.zip manifest.xml > /dev/null
  
-diff -urN codeblocks-8.02/src/plugins/contrib/codestat/resources/Makefile.am codeblocks-8.02.new/src/plugins/contrib/codestat/resources/Makefile.am
---- codeblocks-8.02/src/plugins/contrib/codestat/resources/Makefile.am 2007-07-16 16:07:04.000000000 +0200
-+++ codeblocks-8.02.new/src/plugins/contrib/codestat/resources/Makefile.am     2009-01-31 13:27:05.000000000 +0100
+diff -ur codeblocks-13.12/src/plugins/contrib/codestat/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/codestat/resources/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/codestat/resources/Makefile.am        2013-11-17 20:34:09.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/codestat/resources/Makefile.am    2014-01-18 19:35:30.548711201 +0100
 @@ -4,4 +4,4 @@
  CLEANFILES = $(pkgdata_DATA)
  
  codestat.zip: manifest.xml
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/codestat.zip manifest.xml *.xrc > /dev/null
-+      zip codestat.zip manifest.xml *.xrc > /dev/null
-diff -urN codeblocks-8.02/src/plugins/contrib/dragscroll/Makefile.am codeblocks-8.02.new/src/plugins/contrib/dragscroll/Makefile.am
---- codeblocks-8.02/src/plugins/contrib/dragscroll/Makefile.am 2007-07-16 16:07:04.000000000 +0200
-+++ codeblocks-8.02.new/src/plugins/contrib/dragscroll/Makefile.am     2009-01-31 13:27:25.000000000 +0100
-@@ -24,4 +24,4 @@
++      zip $(PWD)/codestat.zip manifest.xml *.xrc > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/copystrings/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/copystrings/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/copystrings/Makefile.am       2013-11-17 20:33:55.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/copystrings/Makefile.am   2014-01-18 19:35:30.552044534 +0100
+@@ -22,4 +22,4 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ copystrings.zip: manifest.xml
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/copystrings.zip manifest.xml > /dev/null
++      zip $(PWD)/copystrings.zip manifest.xml > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/CppCheck/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/CppCheck/resources/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/CppCheck/resources/Makefile.am        2013-11-17 20:33:54.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/CppCheck/resources/Makefile.am    2014-01-18 19:35:30.552044534 +0100
+@@ -4,4 +4,4 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ CppCheck.zip: manifest.xml
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/CppCheck.zip manifest.xml > /dev/null
++      zip $(PWD)/CppCheck.zip manifest.xml > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/Cscope/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/Cscope/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/Cscope/Makefile.am    2013-11-17 20:34:00.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/Cscope/Makefile.am        2014-01-18 19:35:30.555377867 +0100
+@@ -36,4 +36,4 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ Cscope.zip: manifest.xml
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/Cscope.zip manifest.xml > /dev/null
++      zip $(PWD)/Cscope.zip manifest.xml > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/DoxyBlocks/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/DoxyBlocks/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/DoxyBlocks/Makefile.am        2013-11-17 20:33:54.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/DoxyBlocks/Makefile.am    2014-01-18 19:35:30.555377867 +0100
+@@ -41,7 +41,7 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ DoxyBlocks.zip: manifest.xml
+-      PWD=`pwd` cd $(srcdir) && zip -R $(PWD)/DoxyBlocks.zip manifest.xml images/*.png images/16x16/*.png > /dev/null
++      zip -R $(PWD)/DoxyBlocks.zip manifest.xml images/*.png images/16x16/*.png > /dev/null
+ 
+ confimagesdir = $(datadir)/@PACKAGE@/images/settings
+ 
+diff -ur codeblocks-13.12/src/plugins/contrib/dragscroll/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/dragscroll/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/dragscroll/Makefile.am        2013-11-17 20:34:05.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/dragscroll/Makefile.am    2014-01-18 19:35:30.548711201 +0100
+@@ -26,4 +26,4 @@
  CLEANFILES = $(pkgdata_DATA)
  
  dragscroll.zip: manifest.xml
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/dragscroll.zip manifest.xml > /dev/null
-+      zip dragscroll.zip manifest.xml > /dev/null
-diff -urN codeblocks-8.02/src/plugins/contrib/envvars/Makefile.am codeblocks-8.02.new/src/plugins/contrib/envvars/Makefile.am
---- codeblocks-8.02/src/plugins/contrib/envvars/Makefile.am    2007-07-16 16:07:04.000000000 +0200
-+++ codeblocks-8.02.new/src/plugins/contrib/envvars/Makefile.am        2009-01-31 13:27:39.000000000 +0100
-@@ -20,4 +20,4 @@
++      zip $(PWD)/dragscroll.zip manifest.xml > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/EditorConfig/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/EditorConfig/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/EditorConfig/Makefile.am      2013-11-17 20:34:00.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/EditorConfig/Makefile.am  2014-01-18 19:35:30.545377868 +0100
+@@ -26,4 +26,4 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ EditorConfig.zip: manifest.xml
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/EditorConfig.zip manifest.xml > /dev/null
++      zip $(PWD)/EditorConfig.zip manifest.xml > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/EditorTweaks/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/EditorTweaks/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/EditorTweaks/Makefile.am      2013-11-17 20:34:09.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/EditorTweaks/Makefile.am  2014-01-18 19:35:30.552044534 +0100
+@@ -26,4 +26,4 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ EditorTweaks.zip: $(EXTRA_DIST)
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/EditorTweaks.zip manifest.xml *.xrc > /dev/null
++      zip $(PWD)/EditorTweaks.zip manifest.xml *.xrc > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/envvars/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/envvars/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/envvars/Makefile.am   2013-11-17 20:33:54.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/envvars/Makefile.am       2014-01-18 19:35:30.545377868 +0100
+@@ -32,4 +32,4 @@
  CLEANFILES = $(pkgdata_DATA)
  
  envvars.zip: manifest.xml
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/envvars.zip manifest.xml *.xrc > /dev/null
-+      zip envvars.zip manifest.xml *.xrc > /dev/null
-diff -urN codeblocks-8.02/src/plugins/contrib/help_plugin/Makefile.am codeblocks-8.02.new/src/plugins/contrib/help_plugin/Makefile.am
---- codeblocks-8.02/src/plugins/contrib/help_plugin/Makefile.am        2007-11-15 14:24:03.000000000 +0100
-+++ codeblocks-8.02.new/src/plugins/contrib/help_plugin/Makefile.am    2009-01-31 13:27:56.000000000 +0100
-@@ -65,4 +65,4 @@
++      zip $(PWD)/envvars.zip manifest.xml *.xrc > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/FileManager/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/FileManager/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/FileManager/Makefile.am       2013-11-17 20:33:59.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/FileManager/Makefile.am   2014-01-18 19:35:30.555377867 +0100
+@@ -41,4 +41,4 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ FileManager.zip: manifest.xml Resources/fileexplorersettings.xrc
+-      PWD=`pwd` cd $(srcdir) && zip -j9 $(PWD)/FileManager.zip manifest.xml Resources/fileexplorersettings.xrc > /dev/null
++      zip -j9 $(PWD)/FileManager.zip manifest.xml Resources/fileexplorersettings.xrc > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/headerfixup/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/headerfixup/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/headerfixup/Makefile.am       2013-11-17 20:34:08.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/headerfixup/Makefile.am   2014-01-18 19:35:30.548711201 +0100
+@@ -40,4 +40,4 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ headerfixup.zip:
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/headerfixup.zip manifest.xml > /dev/null
++      zip $(PWD)/headerfixup.zip manifest.xml > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/help_plugin/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/help_plugin/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/help_plugin/Makefile.am       2013-11-17 20:34:09.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/help_plugin/Makefile.am   2014-01-18 19:35:30.552044534 +0100
+@@ -61,4 +61,4 @@
  CLEANFILES = $(pkgdata_DATA)
  
  help_plugin.zip: manifest.xml help_plugin.xrc
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/help_plugin.zip manifest.xml *.xrc *.png > /dev/null
-+      zip help_plugin.zip manifest.xml *.xrc *.png > /dev/null
-diff -urN codeblocks-8.02/src/plugins/contrib/keybinder/Makefile.am codeblocks-8.02.new/src/plugins/contrib/keybinder/Makefile.am
---- codeblocks-8.02/src/plugins/contrib/keybinder/Makefile.am  2007-07-16 16:07:04.000000000 +0200
-+++ codeblocks-8.02.new/src/plugins/contrib/keybinder/Makefile.am      2009-01-31 13:28:08.000000000 +0100
++      zip $(PWD)/help_plugin.zip manifest.xml *.xrc *.png > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/HexEditor/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/HexEditor/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/HexEditor/Makefile.am 2013-11-17 20:33:55.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/HexEditor/Makefile.am     2014-01-18 19:35:30.552044534 +0100
+@@ -66,4 +66,4 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ HexEditor.zip: manifest.xml
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/HexEditor.zip manifest.xml > /dev/null
++      zip $(PWD)/HexEditor.zip manifest.xml > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/IncrementalSearch/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/IncrementalSearch/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/IncrementalSearch/Makefile.am 2013-11-17 20:34:02.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/IncrementalSearch/Makefile.am     2014-01-18 19:35:30.548711201 +0100
+@@ -29,7 +29,7 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ IncrementalSearch.zip: manifest.xml IncrementalSearchToolbar.xrc IncrementalSearchConfDlg.xrc
+-      PWD=`pwd` cd $(srcdir) && zip -R $(PWD)/IncrementalSearch.zip manifest.xml *.xrc images/*.png images/16x16/*.png > /dev/null
++      zip -R $(PWD)/IncrementalSearch.zip manifest.xml *.xrc images/*.png images/16x16/*.png > /dev/null
+ 
+ confimagesdir = $(datadir)/@PACKAGE@/images/settings
+ 
+diff -ur codeblocks-13.12/src/plugins/contrib/keybinder/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/keybinder/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/keybinder/Makefile.am 2013-11-17 20:34:10.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/keybinder/Makefile.am     2014-01-18 19:35:30.552044534 +0100
 @@ -26,4 +26,4 @@
  CLEANFILES = $(pkgdata_DATA)
  
  keybinder.zip: manifest.xml
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/keybinder.zip manifest.xml > /dev/null
-+      zip keybinder.zip manifest.xml > /dev/null
-diff -urN codeblocks-8.02/src/plugins/contrib/lib_finder/Makefile.am codeblocks-8.02.new/src/plugins/contrib/lib_finder/Makefile.am
---- codeblocks-8.02/src/plugins/contrib/lib_finder/Makefile.am 2008-01-02 00:02:41.000000000 +0100
-+++ codeblocks-8.02.new/src/plugins/contrib/lib_finder/Makefile.am     2009-01-31 13:28:19.000000000 +0100
-@@ -50,4 +50,4 @@
++      zip $(PWD)/keybinder.zip manifest.xml > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/lib_finder/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/lib_finder/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/lib_finder/Makefile.am        2013-11-17 20:34:06.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/lib_finder/Makefile.am    2014-01-18 19:35:30.545377868 +0100
+@@ -71,4 +71,4 @@
  CLEANFILES = $(pkgdata_DATA)
  
  lib_finder.zip: manifest.xml
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/lib_finder.zip manifest.xml > /dev/null
-+      zip lib_finder.zip manifest.xml > /dev/null
-diff -urN codeblocks-8.02/src/plugins/contrib/profiler/resources/Makefile.am codeblocks-8.02.new/src/plugins/contrib/profiler/resources/Makefile.am
---- codeblocks-8.02/src/plugins/contrib/profiler/resources/Makefile.am 2007-07-16 16:07:04.000000000 +0200
-+++ codeblocks-8.02.new/src/plugins/contrib/profiler/resources/Makefile.am     2009-01-31 13:28:43.000000000 +0100
++      zip $(PWD)/lib_finder.zip manifest.xml > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/MouseSap/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/MouseSap/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/MouseSap/Makefile.am  2013-11-17 20:34:04.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/MouseSap/Makefile.am      2014-01-18 19:35:30.545377868 +0100
+@@ -23,4 +23,4 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ MouseSap.zip: manifest.xml
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/MouseSap.zip manifest.xml > /dev/null
++      zip $(PWD)/MouseSap.zip manifest.xml > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/NassiShneiderman/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/NassiShneiderman/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/NassiShneiderman/Makefile.am  2013-11-17 20:34:04.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/NassiShneiderman/Makefile.am      2014-01-18 19:35:30.552044534 +0100
+@@ -81,4 +81,4 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ NassiShneiderman.zip: manifest.xml
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/NassiShneiderman.zip manifest.xml > /dev/null
++      zip $(PWD)/NassiShneiderman.zip manifest.xml > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/profiler/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/profiler/resources/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/profiler/resources/Makefile.am        2013-11-17 20:33:54.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/profiler/resources/Makefile.am    2014-01-18 19:35:30.548711201 +0100
 @@ -4,4 +4,4 @@
  CLEANFILES = $(pkgdata_DATA)
  
  Profiler.zip: $(EXTRA_DIST)
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/Profiler.zip manifest.xml *.xrc > /dev/null
-+      zip Profiler.zip manifest.xml *.xrc > /dev/null
-diff -urN codeblocks-8.02/src/plugins/contrib/regex_testbed/Makefile.am codeblocks-8.02.new/src/plugins/contrib/regex_testbed/Makefile.am
---- codeblocks-8.02/src/plugins/contrib/regex_testbed/Makefile.am      2008-01-13 17:45:24.000000000 +0100
-+++ codeblocks-8.02.new/src/plugins/contrib/regex_testbed/Makefile.am  2009-01-31 13:28:56.000000000 +0100
-@@ -24,4 +24,4 @@
++      zip $(PWD)/Profiler.zip manifest.xml *.xrc > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/regex_testbed/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/regex_testbed/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/regex_testbed/Makefile.am     2013-11-17 20:33:55.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/regex_testbed/Makefile.am 2014-01-18 19:35:30.552044534 +0100
+@@ -23,4 +23,4 @@
  CLEANFILES = $(pkgdata_DATA)
  
  RegExTestbed.zip: manifest.xml regexdlg.xrc
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/RegExTestbed.zip manifest.xml regexdlg.xrc > /dev/null
-+      zip RegExTestbed.zip manifest.xml regexdlg.xrc > /dev/null
-diff -urN codeblocks-8.02/src/plugins/contrib/source_exporter/Makefile.am codeblocks-8.02.new/src/plugins/contrib/source_exporter/Makefile.am
---- codeblocks-8.02/src/plugins/contrib/source_exporter/Makefile.am    2007-07-16 16:07:04.000000000 +0200
-+++ codeblocks-8.02.new/src/plugins/contrib/source_exporter/Makefile.am        2009-01-31 13:29:09.000000000 +0100
-@@ -35,4 +35,4 @@
++      zip $(PWD)/RegExTestbed.zip manifest.xml regexdlg.xrc > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/ReopenEditor/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/ReopenEditor/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/ReopenEditor/Makefile.am      2013-11-17 20:34:06.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/ReopenEditor/Makefile.am  2014-01-18 19:35:30.548711201 +0100
+@@ -28,4 +28,4 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ ReopenEditor.zip: manifest.xml ReopenEditorConfDLg.xrc
+-      PWD=`pwd` cd $(srcdir) && zip -R $(PWD)/ReopenEditor.zip manifest.xml  *.xrc > /dev/null
++      zip -R $(PWD)/ReopenEditor.zip manifest.xml  *.xrc > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/SmartIndent/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/SmartIndent/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/SmartIndent/Makefile.am       2013-11-17 20:34:04.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/SmartIndent/Makefile.am   2014-01-18 19:35:30.548711201 +0100
+@@ -102,37 +102,30 @@
+ .NOTPARALLEL: $(pkgdata_DATA)
+ 
+ SmartIndentHDL.zip: manifest_hdl.xml
+-      PWD=`pwd` cd $(srcdir) && \
+       cp manifest_hdl.xml ./manifest.xml && \
+       zip -R $(PWD)/SmartIndentHDL.zip manifest.xml
+ 
+ SmartIndentPascal.zip: manifest_pascal.xml
+-      PWD=`pwd` cd $(srcdir) && \
+       cp manifest_pascal.xml ./manifest.xml && \
+       zip -R $(PWD)/SmartIndentPascal.zip manifest.xml
+ 
+ SmartIndentCpp.zip: manifest_cpp.xml
+-      PWD=`pwd` cd $(srcdir) && \
+       cp manifest_cpp.xml ./manifest.xml && \
+       zip -R $(PWD)/SmartIndentCpp.zip manifest.xml
+ 
+ SmartIndentPython.zip: manifest_python.xml
+-      PWD=`pwd` cd $(srcdir) && \
+       cp manifest_python.xml ./manifest.xml && \
+       zip -R $(PWD)/SmartIndentPython.zip manifest.xml
+ 
+ SmartIndentLua.zip: manifest_lua.xml
+-      PWD=`pwd` cd $(srcdir) && \
+       cp manifest_lua.xml ./manifest.xml && \
+       zip -R $(PWD)/SmartIndentLua.zip manifest.xml
+ 
+ SmartIndentFortran.zip: manifest_fortran.xml
+-      PWD=`pwd` cd $(srcdir) && \
+       cp manifest_fortran.xml ./manifest.xml && \
+       zip -R $(PWD)/SmartIndentFortran.zip manifest.xml
+ 
+ SmartIndentXML.zip: manifest_xml.xml
+-      PWD=`pwd` cd $(srcdir) && \
+       cp manifest_xml.xml ./manifest.xml && \
+       zip -R $(PWD)/SmartIndentXML.zip manifest.xml
+ 
+diff -ur codeblocks-13.12/src/plugins/contrib/source_exporter/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/source_exporter/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/source_exporter/Makefile.am   2013-11-17 20:34:03.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/source_exporter/Makefile.am       2014-01-18 19:35:30.548711201 +0100
+@@ -38,4 +38,4 @@
  CLEANFILES = $(pkgdata_DATA)
  
  exporter.zip: manifest.xml
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/exporter.zip manifest.xml > /dev/null
-+      zip exporter.zip manifest.xml > /dev/null
-diff -urN codeblocks-8.02/src/plugins/contrib/symtab/resources/Makefile.am codeblocks-8.02.new/src/plugins/contrib/symtab/resources/Makefile.am
---- codeblocks-8.02/src/plugins/contrib/symtab/resources/Makefile.am   2007-07-16 16:07:04.000000000 +0200
-+++ codeblocks-8.02.new/src/plugins/contrib/symtab/resources/Makefile.am       2009-01-31 13:29:21.000000000 +0100
++      zip $(PWD)/exporter.zip manifest.xml > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/SpellChecker/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/SpellChecker/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/SpellChecker/Makefile.am      2013-11-17 20:34:09.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/SpellChecker/Makefile.am  2014-01-18 19:35:30.552044534 +0100
+@@ -57,7 +57,7 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ SpellChecker.zip: manifest.xml SpellCheckSettingsPanel.xrc
+-      PWD=`pwd` cd $(srcdir) && zip -R $(PWD)/SpellChecker.zip manifest.xml SpellCheckSettingsPanel.xrc > /dev/null
++      zip -R $(PWD)/SpellChecker.zip manifest.xml SpellCheckSettingsPanel.xrc > /dev/null
+ 
+ confimagesdir = $(datadir)/@PACKAGE@/images/settings
+ 
+diff -ur codeblocks-13.12/src/plugins/contrib/symtab/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/symtab/resources/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/symtab/resources/Makefile.am  2013-11-17 20:34:06.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/symtab/resources/Makefile.am      2014-01-18 19:35:30.548711201 +0100
 @@ -4,4 +4,4 @@
  CLEANFILES = $(pkgdata_DATA)
  
  SymTab.zip: $(EXTRA_DIST)
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/SymTab.zip manifest.xml *.xrc > /dev/null
-+      zip SymTab.zip manifest.xml *.xrc > /dev/null
-diff -urN codeblocks-8.02/src/plugins/contrib/ThreadSearch/Makefile.am codeblocks-8.02.new/src/plugins/contrib/ThreadSearch/Makefile.am
---- codeblocks-8.02/src/plugins/contrib/ThreadSearch/Makefile.am       2008-01-13 17:45:24.000000000 +0100
-+++ codeblocks-8.02.new/src/plugins/contrib/ThreadSearch/Makefile.am   2009-01-31 13:26:04.000000000 +0100
-@@ -66,5 +66,5 @@
++      zip $(PWD)/SymTab.zip manifest.xml *.xrc > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/ThreadSearch/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/ThreadSearch/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/ThreadSearch/Makefile.am      2013-11-17 20:34:05.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/ThreadSearch/Makefile.am  2014-01-18 19:35:30.548711201 +0100
+@@ -71,5 +71,5 @@
  CLEANFILES = $(pkgdata_DATA)
  
  ThreadSearch.zip: manifest.xml
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/ThreadSearch.zip manifest.xml > /dev/null
-+      zip ThreadSearch.zip manifest.xml > /dev/null
++      zip $(PWD)/ThreadSearch.zip manifest.xml > /dev/null
  
-diff -urN codeblocks-8.02/src/plugins/contrib/wxSmith/Makefile.am codeblocks-8.02.new/src/plugins/contrib/wxSmith/Makefile.am
---- codeblocks-8.02/src/plugins/contrib/wxSmith/Makefile.am    2007-11-07 16:26:51.000000000 +0100
-+++ codeblocks-8.02.new/src/plugins/contrib/wxSmith/Makefile.am        2009-01-31 13:29:35.000000000 +0100
-@@ -69,4 +69,4 @@
+diff -ur codeblocks-13.12/src/plugins/contrib/ToolsPlus/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/ToolsPlus/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/ToolsPlus/Makefile.am 2013-11-17 20:34:08.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/ToolsPlus/Makefile.am     2014-01-18 19:35:30.548711201 +0100
+@@ -42,5 +42,5 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ ToolsPlus.zip: manifest.xml
+-      PWD=`pwd` cd $(srcdir) && zip -j9 $(PWD)/ToolsPlus.zip manifest.xml > /dev/null
++      zip -j9 $(PWD)/ToolsPlus.zip manifest.xml > /dev/null
+ 
+diff -ur codeblocks-13.12/src/plugins/contrib/Valgrind/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/Valgrind/resources/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/Valgrind/resources/Makefile.am        2013-11-17 20:34:10.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/Valgrind/resources/Makefile.am    2014-01-18 19:35:30.552044534 +0100
+@@ -5,7 +5,7 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ Valgrind.zip: manifest.xml
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/Valgrind.zip manifest.xml > /dev/null
++      zip $(PWD)/Valgrind.zip manifest.xml > /dev/null
+ 
+ confimagesdir = $(datadir)/@PACKAGE@/images/settings
+ 
+diff -ur codeblocks-13.12/src/plugins/contrib/wxSmith/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/wxSmith/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/wxSmith/Makefile.am   2013-11-17 20:33:59.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/wxSmith/Makefile.am       2014-01-18 19:35:30.548711201 +0100
+@@ -85,4 +85,4 @@
  CLEANFILES = $(pkgdata_DATA)
  
  wxsmith.zip: manifest.xml
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/wxsmith.zip manifest.xml > /dev/null
-+      zip wxsmith.zip manifest.xml > /dev/null
-diff -urN codeblocks-8.02/src/plugins/contrib/wxSmithContribItems/Makefile.am codeblocks-8.02.new/src/plugins/contrib/wxSmithContribItems/Makefile.am
---- codeblocks-8.02/src/plugins/contrib/wxSmithContribItems/Makefile.am        2008-01-13 17:45:24.000000000 +0100
-+++ codeblocks-8.02.new/src/plugins/contrib/wxSmithContribItems/Makefile.am    2009-01-31 13:29:51.000000000 +0100
-@@ -1,5 +1,4 @@
- AM_CPPFLAGS = -DWXMAKINGLIB_PROPGRID
--
- INCLUDES = $(WX_CXXFLAGS) \
-               -I$(top_srcdir)/src/include \
-               -I$(top_srcdir)/src/include/wxFlatNotebook/include \
-@@ -33,7 +32,7 @@
++      zip $(PWD)/wxsmith.zip manifest.xml > /dev/null
+diff -ur codeblocks-13.12/src/plugins/contrib/wxSmithAui/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/wxSmithAui/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/wxSmithAui/Makefile.am        2013-11-17 20:33:55.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/wxSmithAui/Makefile.am    2014-01-18 19:35:30.548711201 +0100
+@@ -28,7 +28,7 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ wxSmithAui.zip: manifest.xml
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/wxSmithAui.zip manifest.xml > /dev/null
++      zip $(PWD)/wxSmithAui.zip manifest.xml > /dev/null
+ 
+ libwxSmithAui_la_SOURCES = \
+ ./wxAuiManager/wxsAuiManager.cpp \
+diff -ur codeblocks-13.12/src/plugins/contrib/wxSmithContribItems/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/wxSmithContribItems/Makefile.am
+--- codeblocks-13.12/src/plugins/contrib/wxSmithContribItems/Makefile.am       2013-11-17 20:34:01.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/contrib/wxSmithContribItems/Makefile.am   2014-01-18 19:35:30.545377868 +0100
+@@ -57,7 +57,7 @@
  CLEANFILES = $(pkgdata_DATA)
  
  wxsmithcontribitems.zip: manifest.xml
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/wxsmithcontribitems.zip manifest.xml > /dev/null
-+      zip wxsmithcontribitems.zip manifest.xml > /dev/null
++      zip $(PWD)/wxsmithcontribitems.zip manifest.xml > /dev/null
  
  libwxsmithcontribitems_la_SOURCES = \
- ./wxchart/wxchart-1.0/src/legendwindow.cpp \
-diff -urN codeblocks-8.02/src/plugins/debuggergdb/resources/Makefile.am codeblocks-8.02.new/src/plugins/debuggergdb/resources/Makefile.am
---- codeblocks-8.02/src/plugins/debuggergdb/resources/Makefile.am      2008-02-15 10:29:11.000000000 +0100
-+++ codeblocks-8.02.new/src/plugins/debuggergdb/resources/Makefile.am  2009-01-31 13:23:54.000000000 +0100
-@@ -37,4 +37,4 @@
+ ./wxflatnotebook/wxsFlatNotebook.cpp \
+diff -ur codeblocks-13.12/src/plugins/debuggergdb/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/debuggergdb/resources/Makefile.am
+--- codeblocks-13.12/src/plugins/debuggergdb/resources/Makefile.am     2013-11-17 20:34:12.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/debuggergdb/resources/Makefile.am 2014-01-18 19:35:30.545377868 +0100
+@@ -10,4 +10,4 @@
  EXTRA_DIST = $(DEBUG_RESOURCES)
  
  debugger.zip: $(DEBUG_RESOURCES)
--      PWD=`pwd` cd $(srcdir) && zip $(PWD)/debugger.zip manifest.xml *.xrc images/*.png images/16x16/*.png > /dev/null
-+      zip debugger.zip manifest.xml *.xrc images/*.png images/16x16/*.png > /dev/null
-diff -urN codeblocks-8.02/src/plugins/defaultmimehandler/resources/Makefile.am codeblocks-8.02.new/src/plugins/defaultmimehandler/resources/Makefile.am
---- codeblocks-8.02/src/plugins/defaultmimehandler/resources/Makefile.am       2007-07-16 16:07:04.000000000 +0200
-+++ codeblocks-8.02.new/src/plugins/defaultmimehandler/resources/Makefile.am   2009-01-31 13:24:06.000000000 +0100
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/debugger.zip manifest.xml *.xrc > /dev/null
++      zip $(PWD)/debugger.zip manifest.xml *.xrc > /dev/null
+diff -ur codeblocks-13.12/src/plugins/defaultmimehandler/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/defaultmimehandler/resources/Makefile.am
+--- codeblocks-13.12/src/plugins/defaultmimehandler/resources/Makefile.am      2013-11-17 20:33:51.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/defaultmimehandler/resources/Makefile.am  2014-01-18 19:35:30.545377868 +0100
 @@ -4,5 +4,5 @@
  EXTRA_DIST = edit_files_handling.xrc manifest.xml
  
  defaultmimehandler.zip: $(EXTRA_DIST)
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/defaultmimehandler.zip manifest.xml *.xrc > /dev/null
-+      zip defaultmimehandler.zip manifest.xml *.xrc > /dev/null
++      zip $(PWD)/defaultmimehandler.zip manifest.xml *.xrc > /dev/null
  
-diff -urN codeblocks-8.02/src/plugins/openfileslist/Makefile.am codeblocks-8.02.new/src/plugins/openfileslist/Makefile.am
---- codeblocks-8.02/src/plugins/openfileslist/Makefile.am      2007-11-11 10:24:33.000000000 +0100
-+++ codeblocks-8.02.new/src/plugins/openfileslist/Makefile.am  2009-01-31 13:24:23.000000000 +0100
+diff -ur codeblocks-13.12/src/plugins/occurrenceshighlighting/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/occurrenceshighlighting/resources/Makefile.am
+--- codeblocks-13.12/src/plugins/occurrenceshighlighting/resources/Makefile.am 2013-11-17 20:34:12.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/occurrenceshighlighting/resources/Makefile.am     2014-01-18 19:35:30.545377868 +0100
+@@ -4,4 +4,4 @@
+ EXTRA_DIST = manifest.xml $(srcdir)/*.xrc
+ 
+ occurrenceshighlighting.zip: $(EXTRA_DIST)
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/occurrenceshighlighting.zip manifest.xml *.xrc > /dev/null
++      zip $(PWD)/occurrenceshighlighting.zip manifest.xml *.xrc > /dev/null
+diff -ur codeblocks-13.12/src/plugins/openfileslist/Makefile.am codeblocks-13.12.pwd/src/plugins/openfileslist/Makefile.am
+--- codeblocks-13.12/src/plugins/openfileslist/Makefile.am     2013-11-17 20:33:50.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/openfileslist/Makefile.am 2014-01-18 19:35:30.542044534 +0100
 @@ -19,5 +19,5 @@
  EXTRA_DIST = manifest.xml
  
  openfileslist.zip: $(EXTRA_DIST)
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/openfileslist.zip manifest.xml > /dev/null
-+      zip openfileslist.zip manifest.xml > /dev/null
++      zip $(PWD)/openfileslist.zip manifest.xml > /dev/null
  
-diff -urN codeblocks-8.02/src/plugins/projectsimporter/resources/Makefile.am codeblocks-8.02.new/src/plugins/projectsimporter/resources/Makefile.am
---- codeblocks-8.02/src/plugins/projectsimporter/resources/Makefile.am 2007-10-24 06:44:02.000000000 +0200
-+++ codeblocks-8.02.new/src/plugins/projectsimporter/resources/Makefile.am     2009-01-31 13:24:35.000000000 +0100
+diff -ur codeblocks-13.12/src/plugins/projectsimporter/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/projectsimporter/resources/Makefile.am
+--- codeblocks-13.12/src/plugins/projectsimporter/resources/Makefile.am        2013-11-17 20:34:14.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/projectsimporter/resources/Makefile.am    2014-01-18 19:35:30.545377868 +0100
 @@ -4,5 +4,5 @@
  EXTRA_DIST = project_import_menu.xrc manifest.xml
  
  projectsimporter.zip: $(EXTRA_DIST)
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/projectsimporter.zip manifest.xml *.xrc > /dev/null
-+      zip projectsimporter.zip manifest.xml *.xrc > /dev/null
++      zip $(PWD)/projectsimporter.zip manifest.xml *.xrc > /dev/null
  
-diff -urN codeblocks-8.02/src/plugins/scriptedwizard/resources/Makefile.am codeblocks-8.02.new/src/plugins/scriptedwizard/resources/Makefile.am
---- codeblocks-8.02/src/plugins/scriptedwizard/resources/Makefile.am   2007-12-14 15:17:53.000000000 +0100
-+++ codeblocks-8.02.new/src/plugins/scriptedwizard/resources/Makefile.am       2009-01-31 13:24:51.000000000 +0100
-@@ -8,7 +8,7 @@
+diff -ur codeblocks-13.12/src/plugins/scriptedwizard/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/scriptedwizard/resources/Makefile.am
+--- codeblocks-13.12/src/plugins/scriptedwizard/resources/Makefile.am  2013-11-17 20:33:54.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/scriptedwizard/resources/Makefile.am      2014-01-18 19:35:30.542044534 +0100
+@@ -11,5 +11,5 @@
  EXTRA_DIST = manifest.xml
  
  scriptedwizard.zip: $(EXTRA_DIST)
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/scriptedwizard.zip manifest.xml > /dev/null
-+      zip scriptedwizard.zip manifest.xml > /dev/null
++      zip $(PWD)/scriptedwizard.zip manifest.xml > /dev/null
  
- install-data-local: scriptedwizard.zip
-       $(mkinstalldirs) $(DESTDIR)$(datadir)/@PACKAGE@/; \
-diff -urN codeblocks-8.02/src/plugins/todo/resources/Makefile.am codeblocks-8.02.new/src/plugins/todo/resources/Makefile.am
---- codeblocks-8.02/src/plugins/todo/resources/Makefile.am     2007-08-08 09:36:42.000000000 +0200
-+++ codeblocks-8.02.new/src/plugins/todo/resources/Makefile.am 2009-01-31 13:25:05.000000000 +0100
+diff -ur codeblocks-13.12/src/plugins/todo/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/todo/resources/Makefile.am
+--- codeblocks-13.12/src/plugins/todo/resources/Makefile.am    2013-11-17 20:34:13.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/todo/resources/Makefile.am        2014-01-18 19:35:30.545377868 +0100
 @@ -4,5 +4,5 @@
  EXTRA_DIST = manifest.xml $(srcdir)/*.xrc
  
  todo.zip: $(EXTRA_DIST)
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/todo.zip manifest.xml *.xrc > /dev/null
-+      zip todo.zip manifest.xml *.xrc > /dev/null
++      zip $(PWD)/todo.zip manifest.xml *.xrc > /dev/null
  
-diff -urN codeblocks-8.02/src/plugins/xpmanifest/Makefile.am codeblocks-8.02.new/src/plugins/xpmanifest/Makefile.am
---- codeblocks-8.02/src/plugins/xpmanifest/Makefile.am 2007-07-16 16:07:04.000000000 +0200
-+++ codeblocks-8.02.new/src/plugins/xpmanifest/Makefile.am     2009-01-31 13:25:16.000000000 +0100
+diff -ur codeblocks-13.12/src/plugins/xpmanifest/Makefile.am codeblocks-13.12.pwd/src/plugins/xpmanifest/Makefile.am
+--- codeblocks-13.12/src/plugins/xpmanifest/Makefile.am        2013-11-17 20:34:14.000000000 +0100
++++ codeblocks-13.12.pwd/src/plugins/xpmanifest/Makefile.am    2014-01-18 19:35:30.545377868 +0100
 @@ -18,4 +18,4 @@
  CLEANFILES = $(pkgdata_DATA)
  
  xpmanifest.zip: $(EXTRA_DIST)
 -      PWD=`pwd` cd $(srcdir) && zip $(PWD)/xpmanifest.zip manifest.xml > /dev/null
-+      zip xpmanifest.zip manifest.xml > /dev/null
-diff -urN codeblocks-8.02/src/sdk/resources/Makefile.am codeblocks-8.02.new/src/sdk/resources/Makefile.am
---- codeblocks-8.02/src/sdk/resources/Makefile.am      2007-07-16 16:07:04.000000000 +0200
-+++ codeblocks-8.02.new/src/sdk/resources/Makefile.am  2009-01-31 13:22:08.000000000 +0100
-@@ -7,4 +7,4 @@
++      zip $(PWD)/xpmanifest.zip manifest.xml > /dev/null
+diff -ur codeblocks-13.12/src/sdk/resources/Makefile.am codeblocks-13.12.pwd/src/sdk/resources/Makefile.am
+--- codeblocks-13.12/src/sdk/resources/Makefile.am     2013-11-17 20:33:47.000000000 +0100
++++ codeblocks-13.12.pwd/src/sdk/resources/Makefile.am 2014-01-18 19:35:30.555377867 +0100
+@@ -9,4 +9,4 @@
  CLEANFILES = $(pkgdata_DATA)
  
  manager_resources.zip: $(dist_noinst_DATA)
--      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
-diff -urN codeblocks-8.02/src/src/resources/Makefile.am codeblocks-8.02.new/src/src/resources/Makefile.am
---- codeblocks-8.02/src/src/resources/Makefile.am      2008-01-25 09:47:58.000000000 +0100
-+++ codeblocks-8.02.new/src/src/resources/Makefile.am  2009-01-31 13:21:51.000000000 +0100
-@@ -9,7 +9,9 @@
+-      PWD=`pwd` cd $(srcdir) && zip -qu $(PWD)/manager_resources.zip *.xrc images/*.png images/16x16/*.png images/12x12/*.png > /dev/null
++      zip -qu $(PWD)/manager_resources.zip *.xrc images/*.png images/16x16/*.png images/12x12/*.png > /dev/null
+diff -ur codeblocks-13.12/src/src/resources/Makefile.am codeblocks-13.12.pwd/src/src/resources/Makefile.am
+--- codeblocks-13.12/src/src/resources/Makefile.am     2013-11-17 20:33:49.000000000 +0100
++++ codeblocks-13.12.pwd/src/src/resources/Makefile.am 2014-01-18 19:35:30.538711201 +0100
+@@ -9,7 +9,7 @@
  CLEANFILES = $(dist_pkgdata_DATA)
  
  resources.zip: $(srcdir)/*.xrc $(srcdir)/images/*.png $(srcdir)/images/16x16/*.png
 -      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
++      zip $(PWD)/resources.zip *.xrc images/*.png images/16x16/*.png > /dev/null
  
  start_here.zip: $(srcdir)/start_here/*.htm* $(srcdir)/start_here/*.png
--      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 ..
-diff -urNp codeblocks-10.05-release.orig/src/plugins/contrib/Cccc/resources/Makefile.am codeblocks-10.05-release/src/plugins/contrib/Cccc/resources/Makefile.am
---- codeblocks-10.05-release.orig/src/plugins/contrib/Cccc/resources/Makefile.am       2010-07-01 01:18:29.000000000 +0200
-+++ codeblocks-10.05-release/src/plugins/contrib/Cccc/resources/Makefile.am    2010-07-01 01:29:14.000000000 +0200
-@@ -4,4 +4,4 @@ pkgdata_DATA = Cccc.zip
- CLEANFILES = $(pkgdata_DATA)
- 
- Cccc.zip: manifest.xml
--      PWD=`pwd` cd $(srcdir) && zip $(PWD)/Cccc.zip manifest.xml > /dev/null
-+      zip Cccc.zip manifest.xml > /dev/null
-diff -urNp codeblocks-10.05-release.orig/src/plugins/contrib/copystrings/Makefile.am codeblocks-10.05-release/src/plugins/contrib/copystrings/Makefile.am
---- codeblocks-10.05-release.orig/src/plugins/contrib/copystrings/Makefile.am  2010-07-01 01:18:29.000000000 +0200
-+++ codeblocks-10.05-release/src/plugins/contrib/copystrings/Makefile.am       2010-07-01 01:29:30.000000000 +0200
-@@ -22,4 +22,4 @@ pkgdata_DATA = copystrings.zip
- CLEANFILES = $(pkgdata_DATA)
- 
- copystrings.zip: manifest.xml
--      PWD=`pwd` cd $(srcdir) && zip $(PWD)/copystrings.zip manifest.xml > /dev/null
-+      zip copystrings.zip manifest.xml > /dev/null
-diff -urNp codeblocks-10.05-release.orig/src/plugins/contrib/CppCheck/resources/Makefile.am codeblocks-10.05-release/src/plugins/contrib/CppCheck/resources/Makefile.am
---- codeblocks-10.05-release.orig/src/plugins/contrib/CppCheck/resources/Makefile.am   2010-07-01 01:18:29.000000000 +0200
-+++ codeblocks-10.05-release/src/plugins/contrib/CppCheck/resources/Makefile.am        2010-07-01 01:30:24.000000000 +0200
-@@ -4,4 +4,4 @@ pkgdata_DATA = CppCheck.zip
- CLEANFILES = $(pkgdata_DATA)
- 
- CppCheck.zip: manifest.xml
--      PWD=`pwd` cd $(srcdir) && zip $(PWD)/CppCheck.zip manifest.xml > /dev/null
-+      zip CppCheck.zip manifest.xml > /dev/null
-diff -urNp codeblocks-10.05-release.orig/src/plugins/contrib/headerfixup/Makefile.am codeblocks-10.05-release/src/plugins/contrib/headerfixup/Makefile.am
---- codeblocks-10.05-release.orig/src/plugins/contrib/headerfixup/Makefile.am  2010-07-01 01:18:29.000000000 +0200
-+++ codeblocks-10.05-release/src/plugins/contrib/headerfixup/Makefile.am       2010-07-01 01:29:22.000000000 +0200
-@@ -39,4 +39,4 @@ pkgdata_DATA = headerfixup.zip
- CLEANFILES = $(pkgdata_DATA)
- 
- headerfixup.zip:
--      PWD=`pwd` cd $(srcdir) && zip $(PWD)/headerfixup.zip manifest.xml > /dev/null
-+      zip headerfixup.zip manifest.xml > /dev/null
-diff -urNp codeblocks-10.05-release.orig/src/plugins/contrib/HexEditor/Makefile.am codeblocks-10.05-release/src/plugins/contrib/HexEditor/Makefile.am
---- codeblocks-10.05-release.orig/src/plugins/contrib/HexEditor/Makefile.am    2010-07-01 01:18:29.000000000 +0200
-+++ codeblocks-10.05-release/src/plugins/contrib/HexEditor/Makefile.am 2010-07-01 01:29:38.000000000 +0200
-@@ -67,4 +67,4 @@ pkgdata_DATA = HexEditor.zip
- CLEANFILES = $(pkgdata_DATA)
- 
- HexEditor.zip: manifest.xml
--      PWD=`pwd` cd $(srcdir) && zip $(PWD)/HexEditor.zip manifest.xml > /dev/null
-+      zip HexEditor.zip manifest.xml > /dev/null
-diff -urNp codeblocks-10.05-release.orig/src/plugins/contrib/IncrementalSearch/Makefile.am codeblocks-10.05-release/src/plugins/contrib/IncrementalSearch/Makefile.am
---- codeblocks-10.05-release.orig/src/plugins/contrib/IncrementalSearch/Makefile.am    2010-07-01 01:18:29.000000000 +0200
-+++ codeblocks-10.05-release/src/plugins/contrib/IncrementalSearch/Makefile.am 2010-07-01 01:29:57.000000000 +0200
-@@ -30,7 +30,7 @@ pkgdata_DATA = IncrementalSearch.zip
- CLEANFILES = $(pkgdata_DATA)
- 
- IncrementalSearch.zip: manifest.xml IncrementalSearchToolbar.xrc IncrementalSearchConfDlg.xrc
--      PWD=`pwd` cd $(srcdir) && zip -R $(PWD)/IncrementalSearch.zip manifest.xml *.xrc images/*.png images/16x16/*.png > /dev/null
-+      zip -R IncrementalSearch.zip manifest.xml *.xrc images/*.png images/16x16/*.png > /dev/null
- 
- confimagesdir = $(datadir)/@PACKAGE@/images/settings
- 
-diff -urNp codeblocks-10.05-release.orig/src/plugins/contrib/MouseSap/Makefile.am codeblocks-10.05-release/src/plugins/contrib/MouseSap/Makefile.am
---- codeblocks-10.05-release.orig/src/plugins/contrib/MouseSap/Makefile.am     2010-07-01 01:18:29.000000000 +0200
-+++ codeblocks-10.05-release/src/plugins/contrib/MouseSap/Makefile.am  2010-07-01 01:29:01.000000000 +0200
-@@ -23,4 +23,4 @@ pkgdata_DATA = MouseSap.zip
- CLEANFILES = $(pkgdata_DATA)
- 
- MouseSap.zip: manifest.xml
--      PWD=`pwd` cd $(srcdir) && zip $(PWD)/MouseSap.zip manifest.xml > /dev/null
-+      zip MouseSap.zip manifest.xml > /dev/null
-diff -urNp codeblocks-10.05-release.orig/src/plugins/contrib/Valgrind/resources/Makefile.am codeblocks-10.05-release/src/plugins/contrib/Valgrind/resources/Makefile.am
---- codeblocks-10.05-release.orig/src/plugins/contrib/Valgrind/resources/Makefile.am   2010-07-01 01:18:29.000000000 +0200
-+++ codeblocks-10.05-release/src/plugins/contrib/Valgrind/resources/Makefile.am        2010-07-01 01:30:04.000000000 +0200
-@@ -4,4 +4,4 @@ pkgdata_DATA = Valgrind.zip
- CLEANFILES = $(pkgdata_DATA)
- 
- Valgrind.zip: manifest.xml
--      PWD=`pwd` cd $(srcdir) && zip $(PWD)/Valgrind.zip manifest.xml > /dev/null
-+      zip Valgrind.zip manifest.xml > /dev/null
-diff -urNp codeblocks-10.05-release.orig/src/plugins/contrib/wxSmithAui/Makefile.am codeblocks-10.05-release/src/plugins/contrib/wxSmithAui/Makefile.am
---- codeblocks-10.05-release.orig/src/plugins/contrib/wxSmithAui/Makefile.am   2010-07-01 01:18:29.000000000 +0200
-+++ codeblocks-10.05-release/src/plugins/contrib/wxSmithAui/Makefile.am        2010-07-01 01:29:47.000000000 +0200
-@@ -29,7 +29,7 @@ pkgdata_DATA = wxSmithAui.zip
- CLEANFILES = $(pkgdata_DATA)
- 
- wxSmithAui.zip: manifest.xml
--      PWD=`pwd` cd $(srcdir) && zip $(PWD)/wxSmithAui.zip manifest.xml > /dev/null
-+      zip wxSmithAui.zip manifest.xml > /dev/null
- 
- libwxSmithAui_la_SOURCES = \
- ./wxAuiManager/wxsAuiManager.cpp \
+       PWD=`pwd` cd $(srcdir)/start_here && zip $(PWD)/start_here.zip *.htm* *.png > /dev/null

diff --git a/codeblocks.spec b/codeblocks.spec
index cbc933ad091297bb9b0147b326ca6a583fceed7a..dd322d31d60673d95e94de7420aecad4614a6dd3 100644 (file)
--- a/codeblocks.spec
+++ b/codeblocks.spec
@@ -2,12 +2,12 @@
 Summary:       An open source, cross platform, free C++ IDE
 Summary(pl.UTF-8):     Wieloplatformowe, darmowe IDE do C++ o otwartych źródłach
 Name:          codeblocks
-Version:       10.05
-Release:       3
+Version:       13.12
+Release:       1
 License:       GPL v3
 Group:         X11/Development/Tools
-Source0:       http://download.berlios.de/codeblocks/%{name}-%{version}-src.tar.bz2
-# Source0-md5: ab077d562e98b0586f2f86c14cb773ba
+Source0:       http://download.sourceforge.net/codeblocks/%{name}_%{version}-1.tar.gz
+# Source0-md5: 4b450f620d9f1875ecf6882ab3c11402
 Patch0:                %{name}-FHS-plugins.patch
 Patch2:                %{name}-ac.patch
 Patch3:                %{name}-pwd.patch
@@ -19,6 +19,7 @@ BuildRequires:        gtk+2-devel
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: sed >= 4.0
+BuildRequires: hunspell-devel
 BuildRequires: unixODBC-devel
 BuildRequires: wxGTK2-unicode-devel >= 2.8.0
 BuildRequires: zip
@@ -127,8 +128,7 @@ Ten pakiet dostarcza plików nagłówkowych Code::Blocks. Należy
 instalować ten pakiet tylko w celu pisania wtyczek do Code::Blocks.
 
 %prep
-%setup -q -n %{name}-%{version}-release
-
+%setup -q
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
@@ -158,7 +158,8 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        mimeicondir=%{_iconsdir}/hicolor/48x48/mimetypes
 
-rm -f $RPM_BUILD_ROOT%{_pluginsdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_pluginsdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/{codeblocks/wxContribItems/,}*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -195,28 +196,27 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/scripts/*
 %{_datadir}/%{name}/*.zip
 %{_datadir}/%{name}/*.txt
+%{_datadir}/%{name}/SpellChecker
+%{_datadir}/%{name}/compilers
 %{_datadir}/%{name}/icons
 %{_datadir}/%{name}/images
 %{_datadir}/%{name}/lexers
 %{_datadir}/%{name}/lib_finder
 %{_datadir}/%{name}/templates
 %dir %{_libdir}/%{name}
-%dir %{_libdir}/wxSmithContribItems
+%dir %{_libdir}/%{name}/wxContribItems
 %dir %{_pluginsdir}
 %attr(755,root,root) %{_pluginsdir}/*.so
-%attr(755,root,root) %{_libdir}/wxSmithContribItems/*.so.*
+%attr(755,root,root) %{_libdir}/%{name}/wxContribItems/*.so.*
 %{_mandir}/man1/*.1*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcodeblocks.so
 %attr(755,root,root) %{_libdir}/libwxsmithlib.so
-%attr(755,root,root) %{_libdir}/wxSmithContribItems/*.so
-%{_libdir}/libcodeblocks.la
-%{_libdir}/libwxsmithlib.la
-%{_libdir}/wxSmithContribItems/*.la
+%attr(755,root,root) %{_libdir}/%{name}/wxContribItems/*.so
+%{_pkgconfigdir}/cb_*.pc
 %{_pkgconfigdir}/codeblocks.pc
 %{_pkgconfigdir}/wxsmith*.pc
 %{_includedir}/codeblocks
-%{_includedir}/wxSmithContribItems
 %{_includedir}/wxsmith