[med-svn] [Git][med-team/disulfinder][master] 7 commits: d/rules: protect deps.mk on dh_auto_clean.
Étienne Mollier (@emollier)
gitlab at salsa.debian.org
Mon Nov 3 20:19:34 GMT 2025
Étienne Mollier pushed to branch master at Debian Med / disulfinder
Commits:
8830c2a2 by Étienne Mollier at 2025-11-03T21:05:15+01:00
d/rules: protect deps.mk on dh_auto_clean.
This file may get changed if some patch reorders "include" stanzas.
- - - - -
e40b484d by Étienne Mollier at 2025-11-03T21:11:28+01:00
gcc-15.patch: new: fix "complex" double definition.
Closes: #1114089
- - - - -
16f57865 by Étienne Mollier at 2025-11-03T21:16:11+01:00
d/watch: convert to v5 untrackable upstream.
- - - - -
dcdc903e by Étienne Mollier at 2025-11-03T21:16:54+01:00
d/copyright: remove reference to the old fsf address.
- - - - -
a954231a by Étienne Mollier at 2025-11-03T21:17:50+01:00
d/patches/*: normalise Last-Update timestamp.
- - - - -
d6178dba by Étienne Mollier at 2025-11-03T21:18:29+01:00
d/control: drop redundant Rules-Requires-Root: no.
- - - - -
f1cddbaa by Étienne Mollier at 2025-11-03T21:19:04+01:00
d/changelog: ready for upload to unstable.
- - - - -
9 changed files:
- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/gcc-15.patch
- debian/patches/gcc-6.patch
- debian/patches/gcc-7.patch
- debian/patches/series
- debian/rules
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+disulfinder (1.2.11-13) unstable; urgency=medium
+
+ * Team upload.
+ * d/rules: protect deps.mk on dh_auto_clean.
+ This file may get changed if some patch reorders "include" stanzas.
+ * gcc-15.patch: new: fix "complex" double definition. (Closes: #1114089)
+ * d/watch: convert to v5 untrackable upstream.
+ * d/copyright: remove reference to the old fsf address.
+ * d/patches/*: normalise Last-Update timestamp.
+ * d/control: drop redundant Rules-Requires-Root: no.
+
+ -- Étienne Mollier <emollier at debian.org> Mon, 03 Nov 2025 21:18:49 +0100
+
disulfinder (1.2.11-12) unstable; urgency=medium
* Upstream download vanished
=====================================
debian/control
=====================================
@@ -14,7 +14,6 @@ Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/med-team/disulfinder
Vcs-Git: https://salsa.debian.org/med-team/disulfinder.git
Homepage: https://disulfind.dsi.unifi.it/
-Rules-Requires-Root: no
Package: disulfinder
Architecture: any
=====================================
debian/copyright
=====================================
@@ -35,11 +35,6 @@ License: GPL-2+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
.
- You should have received a copy of the GNU General Public License
- along with this Disulfinder release, in the file LICENSE; if not,
- write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
- Floor, Boston, MA 02110-1301 USA
- .
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-2'.
=====================================
debian/patches/gcc-15.patch
=====================================
@@ -0,0 +1,29 @@
+Description: fix build failure due to conflicting "complex" definition
+ This inclusion reordering fixes the following build failure, which
+ otherwise really felt like f2c.h bug in the first place:
+ .
+ In file included from /usr/include/c++/15/bits/stl_algobase.h:64,
+ from /usr/include/c++/15/vector:64,
+ from FSA-Alignment/fsa.h:3,
+ from FSA-Alignment/fsa.cpp:1:
+ /usr/include/c++/15/bits/stl_pair.h:105:11: note: candidates are: ‘template<class _Tp> class std::complex’
+ 105 | class complex;
+ | ^~~~~~~
+ /usr/include/f2c.h:17:31: note: ‘typedef struct complex complex’
+ 17 | typedef struct { real r, i; } complex;
+ | ^~~~~~~
+Author: Étienne Mollier <emollier at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1114089
+Forwarded: no
+Last-Update: 2025-11-03
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- disulfinder.orig/disulfind/src/FSA-Alignment/fsa.cpp
++++ disulfinder/disulfind/src/FSA-Alignment/fsa.cpp
+@@ -1,5 +1,5 @@
+-#include "fsa.h"
+ #include "../Common/CommonMethods.h"
++#include "fsa.h"
+
+ void FiniteStateAutomata::Clear()
+ {
=====================================
debian/patches/gcc-6.patch
=====================================
@@ -6,7 +6,7 @@ Description: compile with gcc-6
Forwarded: no
Bug-Debian: https://bugs.debian.org/811876
Author: Gert Wollny <gw.fossdev at gmail.com>
-Last-Update: Fri, 1 Jul 2016
+Last-Update: 2016-07-01
--- a/disulfind/src/Common/Exception.h
+++ b/disulfind/src/Common/Exception.h
=====================================
debian/patches/gcc-7.patch
=====================================
@@ -1,5 +1,5 @@
Author: Christian Seiler <christian at iwakd.de>
-Last-Update: Sat, 26 Aug 2017 23:05:16 +0200
+Last-Update: 2017-08-26
Bug-Debian: https://bugs.debian.org/853375
Description: Avoid duplicated definition of guard macro. Double underscore
start is reserved for gcc.
=====================================
debian/patches/series
=====================================
@@ -4,3 +4,4 @@ unknown_escape
gcc-6.patch
gcc-7.patch
cross.patch
+gcc-15.patch
=====================================
debian/rules
=====================================
@@ -13,6 +13,12 @@ pkgdata := $(DEB_SOURCE)-data
%:
dh $@
+override_dh_auto_clean:
+ # Workaround patches reordering deps.mk during cleaning.
+ cp disulfind/src/deps.mk disulfind/src/deps.mk.orig
+ dh_auto_clean
+ mv disulfind/src/deps.mk.orig disulfind/src/deps.mk
+
override_dh_auto_build:
dh_auto_build --no-parallel
=====================================
debian/watch
=====================================
@@ -1,4 +1,2 @@
-version=4
-opts=dversionmangle=s/.*/0.No-Site/ \
-https://people.debian.org/~eriberto/ FakeWatchNoUpstreamSiteForThisPackage-(\d\S+)\.gz
-
+Version: 5
+Untrackable: source code disappeared upstream.
View it on GitLab: https://salsa.debian.org/med-team/disulfinder/-/compare/2692394d6480f02803d18ec793050e77cfad606d...f1cddbaab0af25c407becc433b799cdceb372d05
--
View it on GitLab: https://salsa.debian.org/med-team/disulfinder/-/compare/2692394d6480f02803d18ec793050e77cfad606d...f1cddbaab0af25c407becc433b799cdceb372d05
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/20251103/c459fd74/attachment-0001.htm>
More information about the debian-med-commit
mailing list