diff options
| author | Didier Raboud <odyx@debian.org> | 2017-10-23 08:06:35 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2017-10-23 08:06:35 +0200 |
| commit | 5d2c08996b7431688ec0e32eba54c7731e55ab9e (patch) | |
| tree | c754c9d154c4720d7a3512c308e34e4d7b2c2f1d | |
| parent | 2d395c67c83bd1bea7889a1fcd890ec725d83180 (diff) | |
| parent | aab16b5aaba58aaa431f9e40f77c814a4369904e (diff) | |
merge patched-debian/master into debian/master
| -rw-r--r-- | debian/.git-dpm | 4 | ||||
| -rw-r--r-- | debian/patches/0002-Make-the-build-reproducible.patch | 23 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | doc/doxygen.cfg.in | 2 |
4 files changed, 27 insertions, 3 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index 414d69d..66c83ec 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -51b7a810a1670b6511dc062bd159ed86faf6f875 -51b7a810a1670b6511dc062bd159ed86faf6f875 +aab16b5aaba58aaa431f9e40f77c814a4369904e +aab16b5aaba58aaa431f9e40f77c814a4369904e 4c8c86180cfafb1448f583ed0973da8c2f559dd6 4c8c86180cfafb1448f583ed0973da8c2f559dd6 argagg_0.4.6.orig.tar.gz diff --git a/debian/patches/0002-Make-the-build-reproducible.patch b/debian/patches/0002-Make-the-build-reproducible.patch new file mode 100644 index 0000000..c360d54 --- /dev/null +++ b/debian/patches/0002-Make-the-build-reproducible.patch @@ -0,0 +1,23 @@ +From aab16b5aaba58aaa431f9e40f77c814a4369904e Mon Sep 17 00:00:00 2001 +From: Chris Lamb <lamby@debian.org> +Date: Mon, 23 Oct 2017 08:06:28 +0200 +Subject: Make the build reproducible + +Closes: #879569 +--- + doc/doxygen.cfg.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/doxygen.cfg.in b/doc/doxygen.cfg.in +index 129d32c..7fa0a3e 100644 +--- a/doc/doxygen.cfg.in ++++ b/doc/doxygen.cfg.in +@@ -14,7 +14,7 @@ REPEAT_BRIEF = YES + ABBREVIATE_BRIEF = + ALWAYS_DETAILED_SEC = NO + INLINE_INHERITED_MEMB = NO +-FULL_PATH_NAMES = YES ++FULL_PATH_NAMES = NO + STRIP_FROM_PATH = + STRIP_FROM_INC_PATH = + SHORT_NAMES = NO diff --git a/debian/patches/series b/debian/patches/series index 1493d63..fa163d1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-Make-sure-to-use-the-system-s-doctest.patch +0002-Make-the-build-reproducible.patch diff --git a/doc/doxygen.cfg.in b/doc/doxygen.cfg.in index 129d32c..7fa0a3e 100644 --- a/doc/doxygen.cfg.in +++ b/doc/doxygen.cfg.in @@ -14,7 +14,7 @@ REPEAT_BRIEF = YES ABBREVIATE_BRIEF = ALWAYS_DETAILED_SEC = NO INLINE_INHERITED_MEMB = NO -FULL_PATH_NAMES = YES +FULL_PATH_NAMES = NO STRIP_FROM_PATH = STRIP_FROM_INC_PATH = SHORT_NAMES = NO |