[SCM] juce/master: prefix debian-specific patches with "debian".

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Wed Feb 10 20:53:49 UTC 2016


The following commit has been merged in the master branch:
commit 54fbbd1af2424cf194e174fa7cb74616a6154ab3
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Wed Feb 10 21:50:52 2016 +0100

    prefix debian-specific patches with "debian".

diff --git a/debian/patches/do-not-track.patch b/debian/patches/debian_do-not-track.patch
similarity index 100%
rename from debian/patches/do-not-track.patch
rename to debian/patches/debian_do-not-track.patch
diff --git a/debian/patches/introjucer-modulepath.patch b/debian/patches/debian_introjucer-modulepath.patch
similarity index 100%
rename from debian/patches/introjucer-modulepath.patch
rename to debian/patches/debian_introjucer-modulepath.patch
diff --git a/debian/patches/make-introjucer.patch b/debian/patches/debian_make-introjucer.patch
similarity index 96%
rename from debian/patches/make-introjucer.patch
rename to debian/patches/debian_make-introjucer.patch
index a32122a..69fadd0 100644
--- a/debian/patches/make-introjucer.patch
+++ b/debian/patches/debian_make-introjucer.patch
@@ -401,3 +401,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +	$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<"
  
  -include $(OBJECTS:%.o=%.d)
+--- juce.orig/extras/Introjucer/JuceLibraryCode/AppConfig.h
++++ juce/extras/Introjucer/JuceLibraryCode/AppConfig.h
+@@ -44,7 +44,7 @@
+ #endif
+ 
+ #ifndef    JUCE_LOG_ASSERTIONS
+- #define   JUCE_LOG_ASSERTIONS 1
++// #define   JUCE_LOG_ASSERTIONS 1
+ #endif
+ 
+ #ifndef    JUCE_CHECK_MEMORY_LEAKS
diff --git a/debian/patches/series b/debian/patches/series
index 18a5f01..6c8ce45 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,6 @@ no-ztypes.patch
 introjucer-makegenerator.patch
 reproducible-date.patch
 debian_apply-reproducible-date.patch
-introjucer-modulepath.patch
-make-introjucer.patch
-do-not-track.patch
+debian_introjucer-modulepath.patch
+debian_make-introjucer.patch
+debian_do-not-track.patch

-- 
juce packaging



More information about the pkg-multimedia-commits mailing list