[libosmocore] 04/05: merge patched into master

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository libosmocore.

commit d3c179df598066d55516013006144b79b71d7ecf
Merge: 22fdb76 4185a31
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Wed Feb 10 20:35:01 2016 +0100

    merge patched into master

 Doxyfile.codec.in                                  |  2 +-
 Doxyfile.core.in                                   |  2 +-
 Doxyfile.gsm.in                                    |  2 +-
 Doxyfile.vty.in                                    |  2 +-
 debian/.git-dpm                                    |  4 +-
 ...IMESTAMP-to-NO-to-make-build-reproducible.patch | 64 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 7 files changed, 71 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 09bc9e3,0000000..0e9f9c6
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 6c61dd2448f6209ea260bdc6f6cb43cdf12c779d
- 6c61dd2448f6209ea260bdc6f6cb43cdf12c779d
++4185a3125a296c55a4e8b5dbb0153233a0cecb4c
++4185a3125a296c55a4e8b5dbb0153233a0cecb4c
 +16ca4aeb70817af9c2739dc58e910ac67e9b0864
 +16ca4aeb70817af9c2739dc58e910ac67e9b0864
 +libosmocore_0.9.0.orig.tar.gz
 +705eca7a77d295fcaf08ed4c3d0feb8b696fe914
 +574737
diff --cc debian/patches/0005-Set-HTML_TIMESTAMP-to-NO-to-make-build-reproducible.patch
index 0000000,0000000..dbf5ec6
new file mode 100644
--- /dev/null
+++ b/debian/patches/0005-Set-HTML_TIMESTAMP-to-NO-to-make-build-reproducible.patch
@@@ -1,0 -1,0 +1,64 @@@
++From 4185a3125a296c55a4e8b5dbb0153233a0cecb4c Mon Sep 17 00:00:00 2001
++From: Ruben Undheim <ruben.undheim at gmail.com>
++Date: Wed, 10 Feb 2016 20:34:39 +0100
++Subject: Set HTML_TIMESTAMP to NO to make build reproducible
++
++---
++ Doxyfile.codec.in | 2 +-
++ Doxyfile.core.in  | 2 +-
++ Doxyfile.gsm.in   | 2 +-
++ Doxyfile.vty.in   | 2 +-
++ 4 files changed, 4 insertions(+), 4 deletions(-)
++
++diff --git a/Doxyfile.codec.in b/Doxyfile.codec.in
++index 4f539c7..fd1e6b3 100644
++--- a/Doxyfile.codec.in
+++++ b/Doxyfile.codec.in
++@@ -891,7 +891,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_ALIGN_MEMBERS tag is set to YES, the members of classes,
++ # files or namespaces will be aligned in HTML using tables. If set to
++diff --git a/Doxyfile.core.in b/Doxyfile.core.in
++index 71843cc..ebe2058 100644
++--- a/Doxyfile.core.in
+++++ b/Doxyfile.core.in
++@@ -891,7 +891,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_ALIGN_MEMBERS tag is set to YES, the members of classes,
++ # files or namespaces will be aligned in HTML using tables. If set to
++diff --git a/Doxyfile.gsm.in b/Doxyfile.gsm.in
++index c4a837f..6c4e2e9 100644
++--- a/Doxyfile.gsm.in
+++++ b/Doxyfile.gsm.in
++@@ -891,7 +891,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_ALIGN_MEMBERS tag is set to YES, the members of classes,
++ # files or namespaces will be aligned in HTML using tables. If set to
++diff --git a/Doxyfile.vty.in b/Doxyfile.vty.in
++index 5f7a158..ddda629 100644
++--- a/Doxyfile.vty.in
+++++ b/Doxyfile.vty.in
++@@ -891,7 +891,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_ALIGN_MEMBERS tag is set to YES, the members of classes,
++ # files or namespaces will be aligned in HTML using tables. If set to
diff --cc debian/patches/series
index a0d32c4,0ca407b..d59e22f
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,1 +1,5 @@@
 -debian-changes-0.1.17-1
 +0001-Removed-illegal-pkg-config-directive.patch
 +0002-Some-spelling-errors-corrected.patch
 +0003-Setting-library-version-explicitly.patch
 +0004-Patched-struct-for-big-endian-architectures.patch
++0005-Set-HTML_TIMESTAMP-to-NO-to-make-build-reproducible.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libosmocore.git