[med-svn] r20750 - in trunk/packages/gmod/chado/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2015-12-12 20:14:41 +0000 (Sat, 12 Dec 2015)
New Revision: 20750

Added:
   trunk/packages/gmod/chado/trunk/debian/patches/0001-Sort-installed-configuration-file-for-reproducibilit.patch
Modified:
   trunk/packages/gmod/chado/trunk/debian/changelog
   trunk/packages/gmod/chado/trunk/debian/patches/series
Log:
Enhanced patch from Niko Tyni


Modified: trunk/packages/gmod/chado/trunk/debian/changelog
===================================================================
--- trunk/packages/gmod/chado/trunk/debian/changelog	2015-12-12 19:16:41 UTC (rev 20749)
+++ trunk/packages/gmod/chado/trunk/debian/changelog	2015-12-12 20:14:41 UTC (rev 20750)
@@ -1,3 +1,10 @@
+libchado-perl (1.23-5) unstable; urgency=medium
+
+  * Enhanced patch from Niko Tyni really
+    Closes: #802042
+
+ -- Andreas Tille <tille at debian.org>  Sat, 12 Dec 2015 20:35:21 +0100
+
 libchado-perl (1.23-4) unstable; urgency=medium
 
   * Enable reproducible builds (Thanks for the patch to Niko Tyni

Added: trunk/packages/gmod/chado/trunk/debian/patches/0001-Sort-installed-configuration-file-for-reproducibilit.patch
===================================================================
--- trunk/packages/gmod/chado/trunk/debian/patches/0001-Sort-installed-configuration-file-for-reproducibilit.patch	                        (rev 0)
+++ trunk/packages/gmod/chado/trunk/debian/patches/0001-Sort-installed-configuration-file-for-reproducibilit.patch	2015-12-12 20:14:41 UTC (rev 20750)
@@ -0,0 +1,20 @@
+From: Niko Tyni <ntyni at debian.org>
+Last-Update: Sat, 17 Oct 2015 11:44:57 +0300
+Subject: Sort installed configuration file for reproducibility
+
+This makes the file stable between builds.
+---
+ install_util/conf_install.PLS | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/install_util/conf_install.PLS
++++ b/install_util/conf_install.PLS
+@@ -71,7 +71,7 @@ print GMODCONF "VERSION=$version\n";
+ close GMODCONF;
+ 
+ open DBCONF,  ">$dbconf" or die "unable to open $dbconf: $!";
+-foreach my $key (keys %confitems) {
++foreach my $key (sort keys %confitems) {
+     print DBCONF  "$key=$confitems{$key}\n";
+ }
+ print DBCONF  "SQLFILE=$gmod_root/src/chado/modules/complete.sql\n";

Modified: trunk/packages/gmod/chado/trunk/debian/patches/series
===================================================================
--- trunk/packages/gmod/chado/trunk/debian/patches/series	2015-12-12 19:16:41 UTC (rev 20749)
+++ trunk/packages/gmod/chado/trunk/debian/patches/series	2015-12-12 20:14:41 UTC (rev 20750)
@@ -5,3 +5,4 @@
 setBinPathForBuilder
 remove_pl_extension.patch
 0001-Sort-generated-build.conf-for-reproducibility.patch
+0001-Sort-installed-configuration-file-for-reproducibilit.patch