Control: tags 991181 pending

On 2021-07-16, Vagrant Cascadian wrote:
> The build path is embedded in various documentation files:
>
>   
> https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/cmocka.html
>
>   ./usr/share/doc/cmocka-doc/html/cmocka_8h_source.html
>
>   <title>cmocka:·/build/1st/cmocka-1.1.5/include/cmocka.h·Source·File</title>
>   vs.
>   
> <title>cmocka:·/build/2/cmocka-1.1.5/2nd/include/cmocka.h·Source·File</title>
>
> The attached patch fixes this by setting configuration options in
> doc/CMakeLists.txt to pass FULL_PATH_NAMES = NO in the doxygen
> configuration used to generate the documentation.

I have uploaded an NMU fixing this issue and including pending changes
in git from Debian Janitor, and pushed the new changes to git.

diff -Nru cmocka-1.1.5/debian/changelog cmocka-1.1.5/debian/changelog
--- cmocka-1.1.5/debian/changelog       2019-08-10 20:34:42.000000000 -0700
+++ cmocka-1.1.5/debian/changelog       2022-12-29 10:55:47.000000000 -0800
@@ -1,3 +1,22 @@
+cmocka (1.1.5-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Debian Janitor ]
+  * Remove constraints unnecessary since buster
+  * Bump debhelper from old 12 to 13.
+  * Remove obsolete fields Contact, Name from debian/upstream/metadata
+    (already present in machine-readable debian/copyright).
+  * Update standards version to 4.6.0, no changes needed.
+  * Fix field name case in debian/control (Build-Depends-indep =>
+    Build-Depends-Indep).
+
+  [ Vagrant Cascadian ]
+  * debian/patches: Disable embedding of full path names in documentation
+    generated by doxygen. (Closes: #991181)
+
+ -- Vagrant Cascadian <vagr...@reproducible-builds.org>  Thu, 29 Dec 2022 
10:55:47 -0800
+
 cmocka (1.1.5-2) unstable; urgency=medium
 
   * Upload to unstable now that buster has been released
diff -Nru cmocka-1.1.5/debian/control cmocka-1.1.5/debian/control
--- cmocka-1.1.5/debian/control 2019-08-10 20:33:57.000000000 -0700
+++ cmocka-1.1.5/debian/control 2022-12-29 10:45:43.000000000 -0800
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: David Prévot <taf...@debian.org>
 Uploaders: Sandro Knauß <he...@debian.org>
-Build-Depends: cmake (>= 3.10), debhelper-compat (= 12)
-Build-Depends-indep: doxygen
-Standards-Version: 4.4.0
+Build-Depends: cmake, debhelper-compat (= 13)
+Standards-Version: 4.6.0
 Homepage: https://cmocka.org/
 Vcs-Git: https://salsa.debian.org/debian/cmocka.git
 Vcs-Browser: https://salsa.debian.org/debian/cmocka
+Build-Depends-Indep: doxygen
 
 Package: cmocka-doc
 Section: doc
diff -Nru 
cmocka-1.1.5/debian/patches/0001-doc-CMakeLists.txt-Disable-embedding-of-full-path-na.patch
 
cmocka-1.1.5/debian/patches/0001-doc-CMakeLists.txt-Disable-embedding-of-full-path-na.patch
--- 
cmocka-1.1.5/debian/patches/0001-doc-CMakeLists.txt-Disable-embedding-of-full-path-na.patch
 1969-12-31 16:00:00.000000000 -0800
+++ 
cmocka-1.1.5/debian/patches/0001-doc-CMakeLists.txt-Disable-embedding-of-full-path-na.patch
 2022-12-29 10:50:33.000000000 -0800
@@ -0,0 +1,26 @@
+From 54c4c552b27e180256593a019718b1a886dd31f7 Mon Sep 17 00:00:00 2001
+From: Vagrant Cascadian <vagr...@reproducible-builds.org>
+Date: Fri, 16 Jul 2021 15:13:48 +0000
+Subject: [PATCH] doc/CMakeLists.txt: Disable embedding of full path names in
+ documentation generated by doxygen. (Closes: #991181)
+
+https://reproducible-builds.org/docs/build-path/
+---
+ doc/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index 6ac7494..9d4e7b5 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -31,6 +31,7 @@ if (DOXYGEN_FOUND)
+                                  
${CMAKE_CURRENT_SOURCE_DIR}/that_style/img/folderclosed.svg
+                                  
${CMAKE_CURRENT_SOURCE_DIR}/that_style/img/folderopen.svg
+                                  
${CMAKE_CURRENT_SOURCE_DIR}/that_style/js/striped_bg.js)
++    set(DOXYGEN_FULL_PATH_NAMES no)
+ 
+     set(_doxyfile_template "${CMAKE_BINARY_DIR}/CMakeDoxyfile.in")
+     set(_target_doxyfile "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.docs")
+-- 
+2.30.2
+
diff -Nru cmocka-1.1.5/debian/patches/series cmocka-1.1.5/debian/patches/series
--- cmocka-1.1.5/debian/patches/series  1969-12-31 16:00:00.000000000 -0800
+++ cmocka-1.1.5/debian/patches/series  2022-12-29 10:50:54.000000000 -0800
@@ -0,0 +1 @@
+0001-doc-CMakeLists.txt-Disable-embedding-of-full-path-na.patch
diff -Nru cmocka-1.1.5/debian/upstream/metadata 
cmocka-1.1.5/debian/upstream/metadata
--- cmocka-1.1.5/debian/upstream/metadata       2019-08-10 20:33:56.000000000 
-0700
+++ cmocka-1.1.5/debian/upstream/metadata       1969-12-31 16:00:00.000000000 
-0800
@@ -1,2 +0,0 @@
-Name: CMocka
-Contact: Andreas Schneider <a...@cryptomilk.org>


live well,
  vagrant

Attachment: signature.asc
Description: PGP signature

Reply via email to