From 9a0906235098e3514325830b3c6105049d79e331 Mon Sep 17 00:00:00 2001 From: Olivier Sallou <olivier.sallou@debian.org> Date: Wed, 22 Jul 2015 10:58:35 +0200 Subject: [PATCH] fix bug 790074 --- debian/changelog | 6 +++++ ...ders-in-include-architecture-triplet.patch | 2 +- ...o-use-the-library-either-from-build-.patch | 2 +- .../0003-Fix-segfault-on-sparc-powerpc.patch | 2 +- ...MESTAMP-to-be-able-to-reproduce-same.patch | 26 +++++++++++++++++++ debian/patches/series | 2 +- 6 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 debian/patches/0004-Turn-off-HTML_TIMESTAMP-to-be-able-to-reproduce-same.patch diff --git a/debian/changelog b/debian/changelog index 85e49620..ff327228 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +visp (2.10.0-4) unstable; urgency=medium + + * Add patch to make build reproductible (Closes: #790074). + + -- Fabien Spindler <Fabien.Spindler@inria.fr> Wed, 15 Jul 2015 10:31:53 +0200 + visp (2.10.0-3) unstable; urgency=medium * Override dh_install to avoid an error on kfreebsd where usr/lib/*/visp/* diff --git a/debian/patches/0001-Install-headers-in-include-architecture-triplet.patch b/debian/patches/0001-Install-headers-in-include-architecture-triplet.patch index 996e42eb..96a2aa7b 100644 --- a/debian/patches/0001-Install-headers-in-include-architecture-triplet.patch +++ b/debian/patches/0001-Install-headers-in-include-architecture-triplet.patch @@ -1,7 +1,7 @@ From 71b4fa650e393bc196220ec8cf59bb2fef68c7b5 Mon Sep 17 00:00:00 2001 From: Fabien Spindler <Fabien.Spindler@inria.fr> Date: Sat, 14 Mar 2015 18:25:07 +0100 -Subject: [PATCH] Install headers in include architecture triplet +Subject: [PATCH 1/4] Install headers in include architecture triplet --- src/CMakeLists.txt | 2 +- diff --git a/debian/patches/0002-Fix-to-be-able-to-use-the-library-either-from-build-.patch b/debian/patches/0002-Fix-to-be-able-to-use-the-library-either-from-build-.patch index 0fa7167b..b00a0b87 100644 --- a/debian/patches/0002-Fix-to-be-able-to-use-the-library-either-from-build-.patch +++ b/debian/patches/0002-Fix-to-be-able-to-use-the-library-either-from-build-.patch @@ -1,7 +1,7 @@ From a3de4582022b3e71a5ccfda7bca517af104624c7 Mon Sep 17 00:00:00 2001 From: Fabien Spindler <Fabien.Spindler@inria.fr> Date: Sun, 15 Mar 2015 10:22:11 +0100 -Subject: [PATCH 2/2] Fix to be able to use the library either from build dir +Subject: [PATCH 2/4] Fix to be able to use the library either from build dir of from install dir. Now VISP_SCENES_DIR, VISP_ROBOT_ARMS_DIR, VISP_HAVE_OGRE_PLUGINS_PATH, VISP_HAVE_OGRE_RESOURCES_PATH defined in vpConfig.h may contain multiple path locations separated with ; character. diff --git a/debian/patches/0003-Fix-segfault-on-sparc-powerpc.patch b/debian/patches/0003-Fix-segfault-on-sparc-powerpc.patch index d96704fa..c37db590 100644 --- a/debian/patches/0003-Fix-segfault-on-sparc-powerpc.patch +++ b/debian/patches/0003-Fix-segfault-on-sparc-powerpc.patch @@ -1,7 +1,7 @@ From 5e0cfb715a74209f1af039198cf4b82488fea677 Mon Sep 17 00:00:00 2001 From: Fabien Spindler <Fabien.Spindler@inria.fr> Date: Tue, 12 May 2015 10:56:07 +0200 -Subject: [PATCH 3/3] Fix segfault on sparc, powerpc... +Subject: [PATCH 3/4] Fix segfault on sparc, powerpc... --- src/tools/io/vpParseArgv.cpp | 2 +- diff --git a/debian/patches/0004-Turn-off-HTML_TIMESTAMP-to-be-able-to-reproduce-same.patch b/debian/patches/0004-Turn-off-HTML_TIMESTAMP-to-be-able-to-reproduce-same.patch new file mode 100644 index 00000000..dd981862 --- /dev/null +++ b/debian/patches/0004-Turn-off-HTML_TIMESTAMP-to-be-able-to-reproduce-same.patch @@ -0,0 +1,26 @@ +From 40d0e02748bb6c6eee1a8b57a4f1208f5ab934f9 Mon Sep 17 00:00:00 2001 +From: Fabien Spindler <Fabien.Spindler@inria.fr> +Date: Wed, 15 Jul 2015 10:24:18 +0200 +Subject: [PATCH 4/4] Turn off HTML_TIMESTAMP to be able to reproduce same + build + +--- + doc/config-doxygen.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/config-doxygen.in b/doc/config-doxygen.in +index 2a21e8e..fbc55b4 100644 +--- a/doc/config-doxygen.in ++++ b/doc/config-doxygen.in +@@ -972,7 +972,7 @@ HTML_COLORSTYLE_GAMMA = 80 + # page will contain the date and time when the page was generated. Setting + # this to NO can help when comparing the output of multiple runs. + +-HTML_TIMESTAMP = YES ++HTML_TIMESTAMP = NO + + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML + # documentation will contain sections that can be hidden and shown after the +-- +2.1.4 + diff --git a/debian/patches/series b/debian/patches/series index b28e5f0a..bba43f39 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ 0001-Install-headers-in-include-architecture-triplet.patch 0002-Fix-to-be-able-to-use-the-library-either-from-build-.patch 0003-Fix-segfault-on-sparc-powerpc.patch - +0004-Turn-off-HTML_TIMESTAMP-to-be-able-to-reproduce-same.patch -- GitLab