[SCM] juce/master: Refreshed manually-applied patch

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b10335c173b595df6a04a8448f07927dbd3fb6bb
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Thu Apr 28 17:29:04 2016 +0200

    Refreshed manually-applied patch

diff --git a/debian/patches/projucer-makegenerator.patch b/debian/patches/projucer-makegenerator.patch
index 560f1a4..a3d1310 100644
--- 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 @@
  
      void writeCppFlags (OutputStream& out, const BuildConfiguration& config) const
      {
@@ -31,7 +34,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
          {
              StringArray flags (makefileExtraLinkerFlags);
-@@ -207,7 +208,8 @@
+@@ -240,7 +241,8 @@
          if (libraries.size() != 0)
              out << " -l" << replacePreprocessorTokens (config, libraries.joinIntoString (" -l")).trim();
  
@@ -41,7 +44,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
              << newLine;
      }
  
-@@ -236,7 +238,7 @@
+@@ -269,7 +271,7 @@
  
          writeCppFlags (out, config);
  
@@ -50,7 +53,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
          if (config.isDebug())
              out << " -g -ggdb";
-@@ -246,6 +248,7 @@
+@@ -279,6 +281,7 @@
  
          out << " -O" << config.getGCCOptimisationFlag()
              << (" "  + replacePreprocessorTokens (config, getExtraCompilerFlagsString())).trimEnd()
@@ -58,7 +61,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
              << newLine;
  
          String cppStandardToUse (getCppStandardString());
-@@ -253,8 +256,9 @@
+@@ -286,8 +289,9 @@
          if (cppStandardToUse.isEmpty())
              cppStandardToUse = "-std=c++11";
  
@@ -69,7 +72,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
              << newLine;
  
          writeLinkerFlags (out, config);
-@@ -273,7 +277,7 @@
+@@ -306,7 +310,7 @@
          if (projectType.isStaticLibrary())
              out << "  BLDCMD = ar -rcs $(OUTDIR)/$(TARGET) $(OBJECTS)" << newLine;
          else
@@ -78,8 +81,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
          out << "  CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)" << newLine
              << "endif" << newLine
-@@ -297,6 +301,14 @@
-             << "# Don't edit this file! Your changes will be overwritten when you re-save the Introjucer project!" << newLine
+@@ -330,6 +334,14 @@
+             << "# Don't edit this file! Your changes will be overwritten when you re-save the Projucer project!" << newLine
              << newLine;
  
 +        out << "# build with \"V=1\" for verbose builds" << newLine
@@ -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
              << "DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)" << newLine
              << newLine;
-@@ -319,12 +331,12 @@
+@@ -352,12 +364,12 @@
              << "\t- at mkdir -p $(BINDIR)" << newLine
              << "\t- at mkdir -p $(LIBDIR)" << newLine
              << "\t- at mkdir -p $(OUTDIR)" << newLine
@@ -108,7 +111,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
              << newLine;
  
          out << "strip:" << newLine
-@@ -342,8 +354,8 @@
+@@ -375,8 +387,8 @@
                      << ": " << escapeSpaces (files.getReference(i).toUnixStyle()) << newLine
                      << "\t- at mkdir -p $(OBJDIR)" << newLine
                      << "\t at echo \"Compiling " << files.getReference(i).getFileName() << "\"" << newLine

-- 
juce packaging