[med-svn] [Git][med-team/simka][master] 6 commits: use_debian_packaged_libraries.patch: update.

Étienne Mollier (@emollier) gitlab at salsa.debian.org
Mon Dec 8 18:39:59 GMT 2025



Étienne Mollier pushed to branch master at Debian Med / simka


Commits:
7000eadb by Étienne Mollier at 2025-12-08T19:30:10+01:00
use_debian_packaged_libraries.patch: update.

The patch is adjusted to account for Debian default flags.  Initial
version explicitly excluded system build flags but does not state why,
and the package proves to operate properly with the system flags.

Closes: #1119558

- - - - -
750f5983 by Étienne Mollier at 2025-12-08T19:35:05+01:00
detailed_errors.patch: unfuzz.

- - - - -
094da47b by Étienne Mollier at 2025-12-08T19:37:06+01:00
fix_temp_arrays.patch: normalize dep3 header.

- - - - -
f5122ec9 by Étienne Mollier at 2025-12-08T19:37:26+01:00
d/control: drop redundant Rules-Requires-Root: no.

- - - - -
2a54e278 by Étienne Mollier at 2025-12-08T19:37:48+01:00
d/salsa-ci.yml: reinstate blhc testing.

- - - - -
69306f62 by Étienne Mollier at 2025-12-08T19:39:19+01:00
d/changelog: ready for upload to unstable.

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/patches/detailed_errors.patch
- debian/patches/fix_temp_arrays.patch
- debian/patches/use_debian_packaged_libraries.patch
- debian/salsa-ci.yml


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,22 @@
+simka (1.5.3-10) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Andreas Tille ]
+  * Do not try to build for i386 in Salsa CI.
+
+  [ Étienne Mollier ]
+  * use_debian_packaged_libraries.patch: update.
+    The patch is adjusted to account for Debian default flags.  Initial
+    version explicitly excluded system build flags but does not state why,
+    and the package proves to operate properly with the system flags.
+    (Closes: #1119558)
+  * detailed_errors.patch: unfuzz.
+  * fix_temp_arrays.patch: normalize dep3 header.
+  * d/control: drop redundant Rules-Requires-Root: no.
+
+ -- Étienne Mollier <emollier at debian.org>  Mon, 08 Dec 2025 19:38:36 +0100
+
 simka (1.5.3-9) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -18,7 +18,6 @@ Build-Depends:
 Vcs-Browser: https://salsa.debian.org/med-team/simka
 Vcs-Git: https://salsa.debian.org/med-team/simka.git
 Homepage: https://github.com/GATB/simka
-Rules-Requires-Root: no
 
 Package: simka
 Architecture: any-amd64 arm64 loong64 mips64el ppc64el ia64 ppc64 riscv64 sparc64 alpha


=====================================
debian/patches/detailed_errors.patch
=====================================
@@ -4,10 +4,8 @@ Author: Shayan Doust <hello at shayandoust.me>
 Last-Update: 2019-09-13
 ---
 
-Index: simka/src/core/main.cpp
-===================================================================
---- simka.orig/src/core/main.cpp	2019-09-13 08:27:17.191648329 +0100
-+++ simka/src/core/main.cpp	2019-09-13 08:27:17.187648345 +0100
+--- simka.orig/src/core/main.cpp
++++ simka/src/core/main.cpp
 @@ -33,7 +33,7 @@
      }
      catch (Exception& e)
@@ -17,10 +15,8 @@ Index: simka/src/core/main.cpp
          return EXIT_FAILURE;
      }
  
-Index: simka/src/core/SimkaAlgorithm.cpp
-===================================================================
---- simka.orig/src/core/SimkaAlgorithm.cpp	2019-09-13 08:27:17.191648329 +0100
-+++ simka/src/core/SimkaAlgorithm.cpp	2019-09-13 08:27:17.187648345 +0100
+--- simka.orig/src/core/SimkaAlgorithm.cpp
++++ simka/src/core/SimkaAlgorithm.cpp
 @@ -162,7 +162,7 @@
  		layoutInputFilename();
  	}
@@ -39,10 +35,8 @@ Index: simka/src/core/SimkaAlgorithm.cpp
  			return false;
  		}
  
-Index: simka/src/core/SimkaCommons.hpp
-===================================================================
---- simka.orig/src/core/SimkaCommons.hpp	2019-09-13 08:27:17.191648329 +0100
-+++ simka/src/core/SimkaCommons.hpp	2019-09-13 08:27:17.187648345 +0100
+--- simka.orig/src/core/SimkaCommons.hpp
++++ simka/src/core/SimkaCommons.hpp
 @@ -129,7 +129,7 @@
  				nbDatasets += 1;
  			}
@@ -52,10 +46,8 @@ Index: simka/src/core/SimkaCommons.hpp
  				error = true;
  			}
  
-Index: simka/src/SimkaCount.cpp
-===================================================================
---- simka.orig/src/SimkaCount.cpp	2019-09-13 08:27:17.191648329 +0100
-+++ simka/src/SimkaCount.cpp	2019-09-13 08:27:17.187648345 +0100
+--- simka.orig/src/SimkaCount.cpp
++++ simka/src/SimkaCount.cpp
 @@ -385,7 +385,7 @@
      }
      catch (Exception& e)
@@ -65,10 +57,8 @@ Index: simka/src/SimkaCount.cpp
          return EXIT_FAILURE;
      }
  }
-Index: simka/src/SimkaMerge.cpp
-===================================================================
---- simka.orig/src/SimkaMerge.cpp	2019-09-13 08:27:17.191648329 +0100
-+++ simka/src/SimkaMerge.cpp	2019-09-13 08:27:17.187648345 +0100
+--- simka.orig/src/SimkaMerge.cpp
++++ simka/src/SimkaMerge.cpp
 @@ -1585,7 +1585,7 @@
      }
      catch (Exception& e)
@@ -78,11 +68,9 @@ Index: simka/src/SimkaMerge.cpp
          return EXIT_FAILURE;
      }
  }
-Index: simka/src/SimkaPotara.hpp
-===================================================================
---- simka.orig/src/SimkaPotara.hpp	2019-09-13 08:27:17.191648329 +0100
-+++ simka/src/SimkaPotara.hpp	2019-09-13 08:27:17.187648345 +0100
-@@ -572,7 +572,7 @@
+--- simka.orig/src/SimkaPotara.hpp
++++ simka/src/SimkaPotara.hpp
+@@ -592,7 +592,7 @@
  		    }
  		    catch (Exception& e)
  		    {
@@ -91,10 +79,8 @@ Index: simka/src/SimkaPotara.hpp
  		    	System::file().remove(filename);
  		    	createConfig();
  		        return;
-Index: simka/src/simkaMin/SimkaMin.cpp
-===================================================================
---- simka.orig/src/simkaMin/SimkaMin.cpp	2019-09-13 08:27:17.191648329 +0100
-+++ simka/src/simkaMin/SimkaMin.cpp	2019-09-13 08:27:17.187648345 +0100
+--- simka.orig/src/simkaMin/SimkaMin.cpp
++++ simka/src/simkaMin/SimkaMin.cpp
 @@ -114,7 +114,7 @@
      }
      catch (Exception& e)
@@ -104,10 +90,8 @@ Index: simka/src/simkaMin/SimkaMin.cpp
          return EXIT_FAILURE;
      }
  
-Index: simka/src/SimkaPotara.cpp
-===================================================================
---- simka.orig/src/SimkaPotara.cpp	2019-09-13 08:27:17.191648329 +0100
-+++ simka/src/SimkaPotara.cpp	2019-09-13 08:27:17.187648345 +0100
+--- simka.orig/src/SimkaPotara.cpp
++++ simka/src/SimkaPotara.cpp
 @@ -155,7 +155,7 @@
      }
      catch (Exception& e)


=====================================
debian/patches/fix_temp_arrays.patch
=====================================
@@ -1,5 +1,8 @@
 Description: separate out array as a defined struct
- Some (newer) GCC throw error when accessing the address of a temporary array, so separate the array as a defined struct to prevent this address issue. 
+ Some (newer) GCC throw error when accessing the address of a temporary
+ array, so separate the array as a defined struct to prevent this address
+ issue.
+Author: Shayan Doust <hello at shayandoust.me>
 Last-Update: 2019-09-16
 ---
 


=====================================
debian/patches/use_debian_packaged_libraries.patch
=====================================
@@ -4,9 +4,9 @@ Author: Shayan Doust <hello at shayandoust.me>
 Last-Update: 2019-09-09
 ---
 
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -42,7 +42,10 @@ SET (CMAKE_MODULE_PATH ${GATB_CORE_HOME}
+--- simka.orig/CMakeLists.txt
++++ simka/CMakeLists.txt
+@@ -42,7 +42,10 @@
   SET (GATB_CORE_EXCLUDE_EXAMPLES  1)
  
  # GATB CORE
@@ -18,7 +18,7 @@ Last-Update: 2019-09-09
  
  ################################################################################
  # TOOL
-@@ -53,17 +56,22 @@ add_definitions (${gatb-core-flags})
+@@ -53,17 +56,21 @@
  
  # we add a new compilation variable
  if (PRINTALL)
@@ -26,8 +26,7 @@ Last-Update: 2019-09-09
 +	#SET( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -DPRINTALL -wno-error" )
  endif()
  
-+unset(CMAKE_CXX_FLAGS)
-+set(CMAKE_CXX_FLAGS "-Wno-error -O2 -g -Wunused-result")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error -O2 -g -Wunused-result")
 +
  # we give the headers directories from :
  #       - from project source
@@ -43,7 +42,7 @@ Last-Update: 2019-09-09
      configure_file (
          ${PROJECT_SOURCE_DIR}/src/core/SimkaAlgorithmTemplate.cpp.in
          ${PROJECT_BINARY_DIR}/src/core/template/SimkaAlgorithmTemplate_${KSIZE}.cpp
-@@ -78,18 +86,18 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMA
+@@ -78,18 +85,18 @@
  set(PROJECT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin)
  
  add_executable        (simka  src/SimkaPotara.cpp ${ProjectFiles})


=====================================
debian/salsa-ci.yml
=====================================
@@ -4,7 +4,3 @@ include:
 
 variables:
   SALSA_CI_DISABLE_BUILD_PACKAGE_I386: 1
-
-# Permit failure of blhc
-blhc:
-  allow_failure: true



View it on GitLab: https://salsa.debian.org/med-team/simka/-/compare/be51840f6da61578b4c27f995851330436258319...69306f62ba00e66cd502710ab5cf8caf38b29760

-- 
View it on GitLab: https://salsa.debian.org/med-team/simka/-/compare/be51840f6da61578b4c27f995851330436258319...69306f62ba00e66cd502710ab5cf8caf38b29760
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20251208/e73db1b2/attachment-0001.htm>


More information about the debian-med-commit mailing list