[SCM] juce/master: split repdroducible-date patches into debian/non-debian parts

[umlaeute at users.alioth.debian.org]

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

    split repdroducible-date patches into debian/non-debian parts

diff --git a/debian/patches/debian_apply-reproducible-date.patch b/debian/patches/debian_apply-reproducible-date.patch
new file mode 100644
index 0000000..5fdbfad
--- /dev/null
+++ b/debian/patches/debian_apply-reproducible-date.patch
@@ -0,0 +1,17 @@
+Description: use reproducible date/time
+ rather than using __DATE__ we use a value that is generated from the debian/changelog
+ timestamp. (included via a header-file to avoid escaping hell)
+Author: IOhannes m zmölnig
+Last-Update: 2016-02-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- juce.orig/extras/Introjucer/JuceLibraryCode/AppConfig.h
++++ juce/extras/Introjucer/JuceLibraryCode/AppConfig.h
+@@ -18,6 +18,7 @@
+ // [BEGIN_USER_CODE_SECTION]
+ 
+ // (You can add your own code in this section, and the Introjucer will not overwrite it)
++#include "../../../debian/libbuilder/build/libjuce_builddate.h"
+ 
+ // [END_USER_CODE_SECTION]
+ 
diff --git a/debian/patches/reproducible-date.patch b/debian/patches/reproducible-date.patch
index 7ac9e58..da479e5 100644
--- a/debian/patches/reproducible-date.patch
+++ b/debian/patches/reproducible-date.patch
@@ -1,6 +1,6 @@
-Description: use reproducible date/time
- rather than using __DATE__ we use a value that is baed on the debian/changelog
- timestamp.
+Description: allow reproducible date/time
+ if BUILD_DATE is defined use that instead of __DATE__.
+ this allows for making reproducible build.
 Author: IOhannes m zmölnig
 Last-Update: 2015-01-21
 ---
@@ -42,13 +42,3 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
              Logger::setCurrentLogger (logger);
          }
  
---- juce.orig/extras/Introjucer/JuceLibraryCode/AppConfig.h
-+++ juce/extras/Introjucer/JuceLibraryCode/AppConfig.h
-@@ -18,6 +18,7 @@
- // [BEGIN_USER_CODE_SECTION]
- 
- // (You can add your own code in this section, and the Introjucer will not overwrite it)
-+#include "../../../debian/libbuilder/build/libjuce_builddate.h"
- 
- // [END_USER_CODE_SECTION]
- 
diff --git a/debian/patches/series b/debian/patches/series
index d28f40e..18a5f01 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 no-ztypes.patch
-reproducible-date.patch
 introjucer-makegenerator.patch
+reproducible-date.patch
+debian_apply-reproducible-date.patch
 introjucer-modulepath.patch
 make-introjucer.patch
 do-not-track.patch

-- 
juce packaging