[SCM] pd-hcs/master: Fixed reproducible timestamp patch

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 813637f709b1d2b2c3a72c344352e0d49d8e6035
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Thu Aug 24 08:32:59 2017 +0200

    Fixed reproducible timestamp patch
    
    so it also works *without* PD_TIMESTAMP_STRING being set from outside

diff --git a/debian/patches/reproducible_builddate.patch b/debian/patches/reproducible_builddate.patch
index cfd2e11..e9c2d72 100644
--- a/debian/patches/reproducible_builddate.patch
+++ b/debian/patches/reproducible_builddate.patch
@@ -11,7 +11,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      post("[ce_path] %s", version);  
 -    post("\tcompiled on "__DATE__" at "__TIME__ " ");
 +#ifndef PD_TIMESTAMP_STRING
-+# define PD_TIMESTAMP_STRING "compiled on "__DATE__" at "__TIME__ " ";
++# define PD_TIMESTAMP_STRING "compiled on "__DATE__" at "__TIME__ " "
 +#endif
 +    post("\t"PD_TIMESTAMP_STRING);
      post("\tcompiled against Pd version %d.%d.%d", PD_MAJOR_VERSION, 
@@ -19,13 +19,13 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  }
 --- pd-hcs.orig/classpath.c
 +++ pd-hcs/classpath.c
-@@ -107,7 +107,10 @@
+@@ -119,7 +119,10 @@
  	{
  		post("[classpath] %s",version);  
  		post("\twritten by Hans-Christoph Steiner <hans at at.or.at>");
 -		post("\tcompiled on "__DATE__" at "__TIME__ " ");
 +#ifndef PD_TIMESTAMP_STRING
-+# define PD_TIMESTAMP_STRING "compiled on "__DATE__" at "__TIME__ " ";
++# define PD_TIMESTAMP_STRING "compiled on "__DATE__" at "__TIME__ " "
 +#endif
 +		post("\t"PD_TIMESTAMP_STRING);
  		post("\tcompiled against Pd version %d.%d.%d", PD_MAJOR_VERSION, 
@@ -39,7 +39,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  		post("\twritten by Hans-Christoph Steiner <hans at at.or.at>");
 -		post("\tcompiled on "__DATE__" at "__TIME__ " ");
 +#ifndef PD_TIMESTAMP_STRING
-+# define PD_TIMESTAMP_STRING "compiled on "__DATE__" at "__TIME__ " ";
++# define PD_TIMESTAMP_STRING "compiled on "__DATE__" at "__TIME__ " "
 +#endif
 +		post("\t"PD_TIMESTAMP_STRING);
  	}
@@ -47,18 +47,18 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
 --- pd-hcs.orig/helppath.c
 +++ pd-hcs/helppath.c
-@@ -129,7 +129,10 @@
+@@ -140,7 +140,10 @@
  					A_DEFSYMBOL, 0);
  
      post("[helppath] %s", version);  
 -    post("\tcompiled on "__DATE__" at "__TIME__ " ");
 +#ifndef PD_TIMESTAMP_STRING
-+# define PD_TIMESTAMP_STRING "compiled on "__DATE__" at "__TIME__ " ";
++# define PD_TIMESTAMP_STRING "compiled on "__DATE__" at "__TIME__ " "
 +#endif
 +    post("\t"PD_TIMESTAMP_STRING);
      post("\tcompiled against Pd version %d.%d.%d", PD_MAJOR_VERSION, 
           PD_MINOR_VERSION, PD_BUGFIX_VERSION);
- }
+ 
 --- pd-hcs.orig/passwd.c
 +++ pd-hcs/passwd.c
 @@ -166,7 +166,10 @@
@@ -67,7 +67,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  		post("\twritten by Hans-Christoph Steiner <hans at at.or.at>");
 -		post("\tcompiled on "__DATE__" at "__TIME__ " ");
 +#ifndef PD_TIMESTAMP_STRING
-+# define PD_TIMESTAMP_STRING "compiled on "__DATE__" at "__TIME__ " ";
++# define PD_TIMESTAMP_STRING "compiled on "__DATE__" at "__TIME__ " "
 +#endif
 +		post("\t"PD_TIMESTAMP_STRING);
  	}
@@ -81,7 +81,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  		post("\twritten by Hans-Christoph Steiner <hans at at.or.at>");
 -		post("\tcompiled on "__DATE__" at "__TIME__ " ");
 +#ifndef PD_TIMESTAMP_STRING
-+# define PD_TIMESTAMP_STRING "compiled on "__DATE__" at "__TIME__ " ";
++# define PD_TIMESTAMP_STRING "compiled on "__DATE__" at "__TIME__ " "
 +#endif
 +		post("\t"PD_TIMESTAMP_STRING);
  	}
@@ -89,7 +89,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
 --- pd-hcs.orig/version.c
 +++ pd-hcs/version.c
-@@ -55,8 +55,15 @@
+@@ -55,8 +55,18 @@
  	SETFLOAT(version_data + 1, (t_float) minor);
  	SETFLOAT(version_data + 2, (t_float) bugfix);
  	SETSYMBOL(version_data + 3, gensym(PD_TEST_VERSION));
@@ -101,6 +101,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +#ifndef PD_TIME
 +# define PD_TIME __TIME__
 +#endif
++#ifndef PD_TIMESTAMP_STRING
++# define PD_TIMESTAMP_STRING "compiled on "PD_DATE" at "PD_TIME " "
++#endif
 +		post("\t"PD_TIMESTAMP_STRING);
 +	SETSYMBOL(version_data + 4, gensym(PD_DATE));
 +	SETSYMBOL(version_data + 5, gensym(PD_TIME));

-- 
pd-hcs packaging