[SCM] juce/master: fixed demo makefile

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ec5edb198d62c335b822a7151ae72d752ae95fbc
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Fri Jan 22 21:00:17 2016 +0100

    fixed demo makefile

diff --git a/debian/patches/test-build b/debian/patches/test-build
index 0fe72f0..a870557 100644
--- a/debian/patches/test-build
+++ b/debian/patches/test-build
@@ -15,7 +15,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  endif
  
  ifeq ($(CONFIG),Debug)
-@@ -39,9 +39,24 @@
+@@ -39,9 +39,23 @@
    endif
  
    CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.0.0" -D "JUCE_APP_VERSION_HEX=0x30000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules
@@ -28,7 +28,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +	-L ../../../../debian/libbuilder -ljuce \
 +	-L$(BINDIR) \
 +	-L$(LIBDIR) \
-+	$(shell pkg-config --libs juce)
 +	-lGL
 +#  LDFLAGS += \
 +#	-lX11 \
@@ -42,7 +41,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
    TARGET := JuceDemo
    BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
-@@ -90,21 +105,6 @@
+@@ -90,21 +104,6 @@
    $(OBJDIR)/WindowsDemo_e8cfa428.o \
    $(OBJDIR)/XMLandJSONDemo_5bc88df3.o \
    $(OBJDIR)/BinaryData_ce4232d4.o \

-- 
juce packaging