[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1034382: marked as done (unblock: opm-upscaling/2022.10+ds-4)

Your message dated Sun, 16 Apr 2023 22:13:01 +0200
with message-id <620a80cb-38de-b41d-bf50-e05838586b61@debian.org>
and subject line Re: Bug#1034382: unblock: opm-upscaling/2022.10+ds-4
has caused the Debian Bug report #1034382,
regarding unblock: opm-upscaling/2022.10+ds-4
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1034382: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1034382
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package opm-upscaling

[ Reason ]
Package contains fixes to d/*control files, unneeded code is not compiled
anymore (backport from upstream). Package is blocked only because britney
thinks that not all autopkgtests have run, but those for official architectures
with binaries have run

[ Impact ]
No impact on user if this is not unblocked.

[ Tests ]
All autopkgtests for architectures with binaries have run

[ Risks ]
None, because no real code is changed

[ Checklist ]
  [X] all changes are documented in the d/changelog
  [X] I reviewed all changes and I approve them
  [X] attach debdiff against the package in testing

[ Other info ]
None


unblock opm-upscaling/2022.10+ds-4

diff --git a/debian/changelog b/debian/changelog
index 6cc7b59..abc63b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+opm-upscaling (2022.10+ds-4) unstable; urgency=medium
+
+  * Removed stale static benchmarks to really not need git.
+
+ -- Markus Blatt <markus@dr-blatt.de>  Thu, 09 Mar 2023 13:36:31 +0100
+
+opm-upscaling (2022.10+ds-3) unstable; urgency=medium
+
+  * d/control: Remove git from Build-Depends as it is not needed.
+
+ -- Markus Blatt <markus@dr-blatt.de>  Thu, 09 Mar 2023 00:01:19 +0100
+
+opm-upscaling (2022.10+ds-2) experimental; urgency=medium
+
+  * d/control: Bumped standards version to 4.6.2 (no-change)
+
+ -- Markus Blatt <markus@dr-blatt.de>  Mon, 09 Jan 2023 16:57:02 +0100
+
 opm-upscaling (2022.10+ds-1) unstable; urgency=medium
 
   * New upstream version 2022.10
diff --git a/debian/control b/debian/control
index 8fd5433..7226645 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,10 @@ Build-Depends: debhelper-compat (= 12), cmake (>=3.10), quilt,
                libboost-system-dev, libboost-date-time-dev, libboost-test-dev,
                libboost-iostreams-dev,
                gfortran, libtinyxml-dev, bc,
-               git, zlib1g-dev, libtool, libopm-material-dev (>= 2022.10), libopm-grid-dev (>= 2022.10),
+               zlib1g-dev, libtool, libopm-material-dev (>= 2022.10), libopm-grid-dev (>= 2022.10),
                doxygen, texlive-latex-extra, texlive-latex-recommended, ghostscript,
                pkg-config, mpi-default-dev, mpi-default-bin
-Standards-Version: 4.6.0
+Standards-Version: 4.6.2
 Section: libs
 Homepage: http://opm-project.org
 Vcs-Browser: https://salsa.debian.org/science-team/opm-upscaling
diff --git a/debian/patches/0001-Removed-stale-static-benchmarks-to-really-not-need-g.patch b/debian/patches/0001-Removed-stale-static-benchmarks-to-really-not-need-g.patch
new file mode 100644
index 0000000..a87c4b3
--- /dev/null
+++ b/debian/patches/0001-Removed-stale-static-benchmarks-to-really-not-need-g.patch
@@ -0,0 +1,35 @@
+From: Markus Blatt <markus@dr-blatt.de>
+Date: Thu, 9 Mar 2023 09:40:37 +0100
+Subject: Removed stale static benchmarks to really not need git.
+
+According to upstream those are from ancient time, not used and built,
+anyway.
+---
+ CMakeLists.txt | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0ea55dd..f4f68c6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -112,20 +112,5 @@ include (${CMAKE_CURRENT_SOURCE_DIR}/compareUpscaling.cmake)
+ # encode test cases so they can be embedded in the benchmark executables
+ include (${PROJECT_SOURCE_DIR}/EmbedCases.cmake)
+ 
+-# Setup static benchmarks
+-include(OpmStaticTargets)
+-opm_from_git(${PROJECT_SOURCE_DIR} benchmarks ${VCS_SHA1} benchmarks)
+-add_dependencies(benchmarks-static opm-grid-static)
+-
+-# Copy static benchmarks to main project binary directory
+-foreach(benchmark ${OPM_BENCHMARKS})
+-  add_custom_command(TARGET benchmarks-static POST_BUILD
+-                     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/static/benchmarks/src/benchmarks-static-build/bin/${benchmark}
+-                                                      ${CMAKE_BINARY_DIR}/bin/${benchmark}-static)
+-	if(INSTALL_BENCHMARKS)
+-		install(TARGETS ${benchmark} DESTINATION bin)
+-	endif()
+-endforeach()
+-
+ install(DIRECTORY doc/man1 DESTINATION ${CMAKE_INSTALL_MANDIR}
+   FILES_MATCHING PATTERN "*.1")
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0197cdd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Removed-stale-static-benchmarks-to-really-not-need-g.patch

--- End Message ---
--- Begin Message --- 
On 13-04-2023 23:10, Markus Blatt wrote:

unblock opm-upscaling/2022.10+ds-4


Done.

Paul

Attachment: OpenPGP_signature
Description: OpenPGP digital signature


--- End Message ---
Reply to: