[med-svn] [Git][med-team/adun-app][master] 5 commits: Fix FTBFS with the multiarch layout (#1094355).
Yavor Doganov (@yavor-guest)
gitlab at salsa.debian.org
Sat Feb 8 08:01:26 GMT 2025
Yavor Doganov pushed to branch master at Debian Med / adun.app
Commits:
8c3a73a9 by Yavor Doganov at 2025-02-08T08:39:00+02:00
Fix FTBFS with the multiarch layout (#1094355).
* Run wrap-and-sort -ast.
* debian/rules (override_dh_auto_install): Don't hard code paths;
fixes FTBFS with the multiarch layout (Closes: #1094355).
(execute_after_dh_fixperms): Don't hard code path.
* debian/control (Build-Depends): Require libsqlclient-dev (>= 1.9.0-4),
libsteptalk-dev (>= 0.10.0+git20200629-3) and libgnustep-gui-dev (>=
0.31.1-7) for the multiarch layout.
* debian/install: Update for the multiarch layout.
* debian/adun-core.install: Update for the multiarch layout.
- - - - -
0771bedd by Yavor Doganov at 2025-02-08T08:52:25+02:00
(execute_before_dh_link): Also pass --bundle to dh_gnustep for adun.app.
Now is the right time to do it because we don't have to do the
dir_to_symlink maintscript dance due to the multiarch transition.
Some bundles may contain images in the future, so that's some kind of
insurance in advance.
- - - - -
a5687578 by Yavor Doganov at 2025-02-08T09:30:40+02:00
cross.patch: New; fix FTCBFS (#1094362).
- - - - -
bfd5ffe6 by Yavor Doganov at 2025-02-08T09:35:49+02:00
fix-implicit-pointer.patch: Fix patch metadata.
- - - - -
ee02834c by Yavor Doganov at 2025-02-08T09:59:33+02:00
copyright: Update copyright years.
- - - - -
9 changed files:
- debian/adun-core.install
- debian/changelog
- debian/control
- debian/copyright
- debian/install
- + debian/patches/cross.patch
- debian/patches/fix-implicit-pointer.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/adun-core.install
=====================================
@@ -1,4 +1,4 @@
/usr/bin/Adun*
-/usr/lib/GNUstep/Frameworks/*
-/usr/lib/adun.app/*
-/usr/include/*
+/usr/include
+/usr/lib/*/GNUstep/Frameworks
+/usr/lib/adun.app
=====================================
debian/changelog
=====================================
@@ -1,20 +1,25 @@
-adun.app (0.81-15) UNRELEASED; urgency=medium
+adun.app (0.81-15) unstable; urgency=medium
+ * Run wrap-and-sort -ast.
* debian/rules (DEB_OBJCFLAGS_MAINT_APPEND): Add
-Wno-cast-function-type with a short explanation.
(override_dh_auto_install): Remove commands which are now handled by
- dh_gnustep. Move unrelated commands to other targets.
+ dh_gnustep. Move unrelated commands to other targets. Don't hard
+ code paths; fixes FTBFS with the multiarch layout (Closes: #1094355).
(override_dh_link): Rename as...
- (execute_before_dh_link): ...and use dh_gnustep --app for adun.app.
- Convert the app icon here, after /usr/share/GNUstep is created.
+ (execute_before_dh_link): ...and use dh_gnustep --app --bundle for
+ adun.app. Convert the app icon here, after /usr/share/GNUstep is created.
(execute_after_dh_fixperms): New target; move chmod invocations from
- override_dh_auto_install here.
- * debian/control (Build-Depends): Add gnustep-make (>= 2.9.2-2) for
- dh_gnustep's --app option.
+ override_dh_auto_install here. Don't hard code path.
+ * debian/control (Build-Depends): Require libsqlclient-dev (>= 1.9.0-4),
+ libsteptalk-dev (>= 0.10.0+git20200629-3) and libgnustep-gui-dev (>=
+ 0.31.1-7) for the multiarch layout.
(Depends): Remove steptalk; this was a workaround no longer needed.
(adun-core) <Suggests>: Add adun.app.
(Standards-Version): Bump to 4.7.0; no changes needed.
* debian/install: Remove /usr/share/GNUstep; now dh_gnustep's job.
+ Update for the multiarch layout.
+ * debian/adun-core.install: Update for the multiarch layout.
* debian/patches/enable-scripting-extension.patch: Replace a deprecated
method which is private and triggers a warning.
* debian/patches/gcc-warnings.patch: Fix more warnings.
@@ -27,9 +32,11 @@ adun.app (0.81-15) UNRELEASED; urgency=medium
ULTemplateViewController when switching the NSPopUpButton by setting
the delegate before the data source.
* debian/patches/15_link-properly.patch: Fix patch metadata.
+ * debian/patches/fix-implicit-pointer.patch: Likewise.
+ * debian/patches/cross.patch: New; fix FTCBFS (Closes: #1094362).
* debian/copyright: Update copyright years.
- -- Yavor Doganov <yavor at gnu.org> Thu, 25 Jul 2024 11:14:27 +0300
+ -- Yavor Doganov <yavor at gnu.org> Sat, 08 Feb 2025 09:37:19 +0200
adun.app (0.81-14) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -1,16 +1,17 @@
Source: adun.app
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Andreas Tille <tille at debian.org>,
- Yavor Doganov <yavor at gnu.org>
+Uploaders:
+ Andreas Tille <tille at debian.org>,
+ Yavor Doganov <yavor at gnu.org>,
Section: science
Priority: optional
-Build-Depends: debhelper-compat (= 13),
- gnustep-make (>= 2.9.2-2),
- imagemagick,
- libgnustep-gui-dev,
- libsteptalk-dev,
- libsqlclient-dev,
- libgsl-dev
+Build-Depends:
+ debhelper-compat (= 13),
+ imagemagick,
+ libgnustep-gui-dev (>= 0.31.1-7),
+ libgsl-dev,
+ libsqlclient-dev (>= 1.9.0-4),
+ libsteptalk-dev (>= 0.10.0+git20200629-3),
Rules-Requires-Root: no
Standards-Version: 4.7.0
Vcs-Browser: https://salsa.debian.org/med-team/adun-app
@@ -19,10 +20,12 @@ Homepage: http://wiki.gnustep.org/index.php/Adun
Package: adun.app
Architecture: any
-Depends: adun-core (= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
-Recommends: gnuplot
+Depends:
+ adun-core (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ gnuplot,
Description: Molecular Simulator for GNUstep (GUI)
Adun is a biomolecular simulator that also includes data management and
analysis capabilities. It was developed at the Computational Biophysics
@@ -33,9 +36,11 @@ Description: Molecular Simulator for GNUstep (GUI)
Package: adun-core
Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Suggests: adun.app
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Suggests:
+ adun.app,
Description: Molecular Simulator
Adun is a biomolecular simulator that also includes data management and
analysis capabilities. It was developed at the Computational Biophysics
=====================================
debian/copyright
=====================================
@@ -77,7 +77,7 @@ License: MIT
Files: debian/*
Copyright: 2006-2014 Gürkan Myczko <gurkan at phys.ethz.ch>
- 2008-2024 Yavor Doganov <yavor at gnu.org>
+ 2008-2025 Yavor Doganov <yavor at gnu.org>
2008-2019 Andreas Tille <tille at debian.org>
2016 Gert Wollny <gw.fossdev at gmail.com>
License: GPL-3+
=====================================
debian/install
=====================================
@@ -1,4 +1,4 @@
-debian/*.desktop usr/share/applications
/usr/bin/UL
-/usr/lib/GNUstep/Applications/*
-/usr/lib/GNUstep/Bundles/*
+/usr/lib/*/GNUstep/Applications
+/usr/lib/*/GNUstep/Bundles
+debian/*.desktop usr/share/applications
=====================================
debian/patches/cross.patch
=====================================
@@ -0,0 +1,18 @@
+Description: Adjust conditional to fix FTCBFS.
+Bug-Debian: https://bugs.debian.org/1094362
+Author: Yavor Doganov <yavor at gnu.org>
+Forwarded: no
+Last-Update: 2025-02-08
+---
+
+--- adun.app.orig/Kernel/Base/GNUmakefile
++++ adun.app/Kernel/Base/GNUmakefile
+@@ -6,7 +6,7 @@
+ libadun_base_INCLUDE_DIRS = -I../
+
+ CC = $(ADUN_LIBRARY_COMPILER)
+-ifeq ($(CC), gcc)
++ifneq (,$(findstring gcc,$(CC)))
+ libadun_base_CFLAGS = -W -static -O3
+ else
+ libadun_base_CFLAGS = -Wbrief -xP -ip -static -O3 -mtune=pentium4 -c99
=====================================
debian/patches/fix-implicit-pointer.patch
=====================================
@@ -1,11 +1,12 @@
Description: AdunCellListHandler.m was missing a include for the function
AdCreateError, resulting in a forced-FTBFS on 64 bit archs. See
http://wiki.debian.org/ImplicitPointerConversions for more information.
-Origin: Upstream CVS
+Origin: upstream
+Bug-Debian: https://bugs.debian.org/631641
Bug-Ubuntu: https://bugs.launchpad.net/bugs/771041
-Name: fix-implicit-pointer.patch
-Author: Andreas Moog <amoog at ubuntu.com>
-Bug: 631641
+Forwarded: not-needed
+Last-Update: 2011-06-28
+---
--- Adun-0.81.orig/Kernel/AdunKernel/Framework/AdunCellListHandler.m
+++ Adun-0.81/Kernel/AdunKernel/Framework/AdunCellListHandler.m
=====================================
debian/patches/series
=====================================
@@ -12,3 +12,4 @@ ftbfs-powerpcspe.patch
gcc-10.patch
scan-build-errors.patch
set-delegate-before-source.patch
+cross.patch
=====================================
debian/rules
=====================================
@@ -56,11 +56,11 @@ override_dh_auto_install:
GNUSTEP_SYSTEM_LIBRARIES=/usr/lib/adun.app \
GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
# Delete empty directories (fixes a lintian warning).
- rm -r $(d_app)/usr/include/GNUstep/Framework \
- $(d_app)/usr/lib/GNUstep/Tools
+ rm -r $(d_app)$(GNUSTEP_SYSTEM_HEADERS)/Framework \
+ $(d_app)$(GNUSTEP_SYSTEM_LIBRARY)/Tools
execute_before_dh_link:
- gsdh_gnustep -padun.app --app
+ gsdh_gnustep -padun.app --app --bundle
gsdh_gnustep -padun-core
convert UL/Resources/icon.tiff -resize 64x64 \
debian/adun.app/usr/share/GNUstep/UL.app/UL.png
@@ -68,7 +68,7 @@ execute_before_dh_link:
execute_after_dh_fixperms:
find debian/adun.app/usr/share/GNUstep/UL.app -type f \
-exec chmod -x '{}' \;
- chmod -x debian/adun-core/usr/lib/GNUstep/Frameworks/ULFramework.framework/Versions/0/Resources/ForceFields/Enzymix/*.ffml
+ chmod -x debian/adun-core$(GNUSTEP_SYSTEM_FRAMEWORKS)/ULFramework.framework/Versions/0/Resources/ForceFields/Enzymix/*.ffml
# We install the libraries at /usr/lib/adun.app.
override_dh_makeshlibs:
View it on GitLab: https://salsa.debian.org/med-team/adun-app/-/compare/5d21c5ac2f0ff80ca606523fa182e3c51c27baa2...ee02834c0702b52835e25b77c7a45205fe4dc1fe
--
View it on GitLab: https://salsa.debian.org/med-team/adun-app/-/compare/5d21c5ac2f0ff80ca606523fa182e3c51c27baa2...ee02834c0702b52835e25b77c7a45205fe4dc1fe
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/20250208/dbcf4c97/attachment-0001.htm>
More information about the debian-med-commit
mailing list