Refreshed manually-applied patch

diff --git a/debian/patches/projucer-makegenerator.patch b/debian/patches/projucer-makegenerator.patch
index 560f1a4f3f178ec57adace68fe5c64e6926c673a..a3d13103b89e1284524fa97a8a9062688e2562e6 100644 (file)
--- a/debian/patches/projucer-makegenerator.patch
+++ b/debian/patches/projucer-makegenerator.patch
@@ -4,14 +4,17 @@ Description: introjucer fixes
  this patch changes introjucer to honor the "V" build variable, so "V=1" will
  build verbosely.
  it also renames *FLAGS to JUCE_*FLAGS and appends the ordinary *FLAGS to them.
+ .
+ Note: This patch is applied manually because the patched files contain spaces,
+ which makes problems during automated builds
 Author: IOhannes m zmölnig
 Origin: Debian
 Last-Update: 2015-02-10
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- "juce.orig/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h"
-+++ "juce/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h"
-@@ -169,15 +169,16 @@
+--- juce.orig/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Make.h
++++ juce/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Make.h
+@@ -202,15 +202,16 @@
  \r
      void writeCppFlags (OutputStream& out, const BuildConfiguration& config) const\r
      {\r
@@ -31,7 +34,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  \r
          {\r
              StringArray flags (makefileExtraLinkerFlags);\r
-@@ -207,7 +208,8 @@
+@@ -240,7 +241,8 @@
          if (libraries.size() != 0)\r
              out << " -l" << replacePreprocessorTokens (config, libraries.joinIntoString (" -l")).trim();\r
  \r
@@ -41,7 +44,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
              << newLine;\r
      }\r
  \r
-@@ -236,7 +238,7 @@
+@@ -269,7 +271,7 @@
  \r
          writeCppFlags (out, config);\r
  \r
@@ -50,7 +53,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  \r
          if (config.isDebug())\r
              out << " -g -ggdb";\r
-@@ -246,6 +248,7 @@
+@@ -279,6 +281,7 @@
  \r
          out << " -O" << config.getGCCOptimisationFlag()\r
              << (" "  + replacePreprocessorTokens (config, getExtraCompilerFlagsString())).trimEnd()\r
@@ -58,7 +61,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
              << newLine;\r
  \r
          String cppStandardToUse (getCppStandardString());\r
-@@ -253,8 +256,9 @@
+@@ -286,8 +289,9 @@
          if (cppStandardToUse.isEmpty())\r
              cppStandardToUse = "-std=c++11";\r
  \r
@@ -69,7 +72,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
              << newLine;\r
  \r
          writeLinkerFlags (out, config);\r
-@@ -273,7 +277,7 @@
+@@ -306,7 +310,7 @@
          if (projectType.isStaticLibrary())\r
              out << "  BLDCMD = ar -rcs $(OUTDIR)/$(TARGET) $(OBJECTS)" << newLine;\r
          else\r
@@ -78,8 +81,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  \r
          out << "  CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)" << newLine\r
              << "endif" << newLine\r
-@@ -297,6 +301,14 @@
-             << "# Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project!" << newLine\r
+@@ -330,6 +334,14 @@
+             << "# Don't edit this file! Your changes will be overwritten when you re-save the Projucer project!" << newLine\r
              << newLine;\r
  \r
 +        out << "# build with \"V=1\" for verbose builds" << newLine\r
@@ -93,7 +96,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          out << "# (this disables dependency generation if multiple architectures are set)" << newLine\r
              << "DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)" << newLine\r
              << newLine;\r
-@@ -319,12 +331,12 @@
+@@ -352,12 +364,12 @@
              << "\t-@mkdir -p $(BINDIR)" << newLine\r
              << "\t-@mkdir -p $(LIBDIR)" << newLine\r
              << "\t-@mkdir -p $(OUTDIR)" << newLine\r
@@ -108,7 +111,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
              << newLine;\r
  \r
          out << "strip:" << newLine\r
-@@ -342,8 +354,8 @@
+@@ -375,8 +387,8 @@
                      << ": " << escapeSpaces (files.getReference(i).toUnixStyle()) << newLine\r
                      << "\t-@mkdir -p $(OBJDIR)" << newLine\r
                      << "\t@echo \"Compiling " << files.getReference(i).getFileName() << "\"" << newLine\r