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 (file)
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]\r
+ \r
+ // (You can add your own code in this section, and the Introjucer will not overwrite it)\r
++#include "../../../debian/libbuilder/build/libjuce_builddate.h"\r
+ \r
+ // [END_USER_CODE_SECTION]\r
+ \r

diff --git a/debian/patches/reproducible-date.patch b/debian/patches/reproducible-date.patch
index 7ac9e5858720c2a30144900b874ae5f912d7a96e..da479e50c9c74eb0be32027c3ff29981ef498c0e 100644 (file)
--- 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);\r
          }\r
  \r
---- juce.orig/extras/Introjucer/JuceLibraryCode/AppConfig.h
-+++ juce/extras/Introjucer/JuceLibraryCode/AppConfig.h
-@@ -18,6 +18,7 @@
- // [BEGIN_USER_CODE_SECTION]\r
- \r
- // (You can add your own code in this section, and the Introjucer will not overwrite it)\r
-+#include "../../../debian/libbuilder/build/libjuce_builddate.h"\r
- \r
- // [END_USER_CODE_SECTION]\r
- \r

diff --git a/debian/patches/series b/debian/patches/series
index d28f40e070d6cdb13bd2c9ecf85997201861b0b9..18a5f0100808c6586c335ef490c01734541ee509 100644 (file)
--- 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