Your message dated Sat, 01 Feb 2025 22:50:22 +0000
with message-id <e1temji-006px1...@fasolo.debian.org>
and subject line Bug#1094304: fixed in sogo 5.11.2-2
has caused the Debian Bug report #1094304,
regarding sogo: FTBFS with the GNUstep multiarch layout: hard codes paths in
debian/rules
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 ow...@bugs.debian.org
immediately.)
--
1094304: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1094304
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: sogo
Version: 5.11.2-1
Severity: important
Tags: sid trixie ftbfs patch
Control: block 1093620 with -1
Control: block -1 with 1093948 1094171 1094178
User: pkg-gnustep-maintain...@lists.alioth.debian.org
Usertags: gnustep-multiarch
This package fails to build with multiarch-based GNUstep with the
following error:
# Put arch independent files in /usr/share instead of /usr/lib
mkdir -p debian/tmp/usr/share/GNUstep/SOGo
for i in AdministrationUI.SOGo Appointments.SOGo CommonUI.SOGo Contacts.SOGo
ContactsUI.SOGo MailPartViewers.SOGo \
Mailer.SOGo MailerUI.SOGo MainUI.SOGo PreferencesUI.SOGo
SchedulerUI.SOGo; do \
mkdir debian/tmp/usr/share/GNUstep/SOGo/$i \
&& mv debian/tmp/usr/lib/GNUstep/SOGo/$i/Resources
debian/tmp/usr/share/GNUstep/SOGo/$i/ ; \
done
mv: cannot stat
'debian/tmp/usr/lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources': No such file
or directory
mv: cannot stat 'debian/tmp/usr/lib/GNUstep/SOGo/Appointments.SOGo/Resources':
No such file or directory
mv: cannot stat 'debian/tmp/usr/lib/GNUstep/SOGo/CommonUI.SOGo/Resources': No
such file or directory
mv: cannot stat 'debian/tmp/usr/lib/GNUstep/SOGo/Contacts.SOGo/Resources': No
such file or directory
mv: cannot stat 'debian/tmp/usr/lib/GNUstep/SOGo/ContactsUI.SOGo/Resources': No
such file or directory
mv: cannot stat
'debian/tmp/usr/lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources': No such file
or directory
mv: cannot stat 'debian/tmp/usr/lib/GNUstep/SOGo/Mailer.SOGo/Resources': No
such file or directory
mv: cannot stat 'debian/tmp/usr/lib/GNUstep/SOGo/MailerUI.SOGo/Resources': No
such file or directory
mv: cannot stat 'debian/tmp/usr/lib/GNUstep/SOGo/MainUI.SOGo/Resources': No
such file or directory
mv: cannot stat 'debian/tmp/usr/lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources':
No such file or directory
mv: cannot stat 'debian/tmp/usr/lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources':
No such file or directory
make[1]: *** [debian/rules:44: override_dh_auto_install] Error 1
Attached are two patches which are mutually exclusive so you can apply
only one of them. 0001-Fix-FTBFS-with-multiarch.patch follows your
packaging pattern while
0001-Fix-FTBFS-with-multiarch-use-dh_gnustep-for-moving-f.patch uses
dh_gnustep to move files and create symlinks. Note that in both cases
the symlinks are created in the sogo package; if they are in
sogo-common they are lintian errors and of course sogo will be usable
only on amd64 (because the arch:all buildds are amd64). I've made the
same mistake in several packages and also when I implemented the
--move-to option in dh_gnustep (now fixed).
IMVHO using dh_gnustep simplifies the packaging as you'll only have to
edit sogo.install if a new bundle appears. Certainly, you are the
maintainers so the decision is yours. Note that when dh_gnustep is
used to move files, it will move bundles' resources directly at
/usr/share/GNUstep and not /usr/share/GNUstep/SOGo. That's because
sogo violates the convention and installs stuff directly in
GNUSTEP_LIBRARY. AFAICT the only other packages which do that are
sope and cenon.app (steptalk is an exception for being the offical
GNUstep scripting language). It should install its bundles in a
subdirectory of GNUSTEP_BUNDLES or even better, in a subdirectory of
GNUSTEP_APPLICATION_SUPPORT.
By default, dh_gnustep shuffles files in frameworks to make them
policy-compliant so that's why the --no-move option is used in the
first patch.
>From de2a0e00b42a88e38601427c54dd29c8acf34c6c Mon Sep 17 00:00:00 2001
From: Yavor Doganov <ya...@gnu.org>
Date: Mon, 27 Jan 2025 02:10:46 +0200
Subject: [PATCH] Fix FTBFS with multiarch.
---
debian/changelog | 13 ++++++++++++
debian/control | 4 ++--
debian/rules | 13 ++++++++----
debian/sogo-activesync.install | 2 +-
debian/sogo-common.links | 13 ------------
debian/sogo.install | 36 +++++++++++++++++-----------------
debian/sogo.links | 13 ++++++++++++
7 files changed, 56 insertions(+), 38 deletions(-)
delete mode 100644 debian/sogo-common.links
create mode 100644 debian/sogo.links
diff --git a/debian/changelog b/debian/changelog
index c572747eb..ea393e4d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+sogo (5.11.2-2) UNRELEASED; urgency=medium
+
+ * debian/control (Build-Depends): Bump libsbjson-dev and libsope-dev to
+ ensure the package is rebuilt for the multiarch layout.
+ * debian/rules (override_dh_auto_install): Fix paths when moving files.
+ (execute_before_dh_link): Run dh_gnustep --no-move.
+ * debian/sogo.install: Update for multiarch.
+ * debain/sogo-activesync.install: Likewise.
+ * debian/sogo-common.links: Delete.
+ * debian/sogo.links: New file.
+
+ -- Yavor Doganov <ya...@gnu.org> Sun, 26 Jan 2025 04:08:13 +0200
+
sogo (5.11.2-1) unstable; urgency=medium
* New upstream release, with two important fixes introduced in 5.11.1:
diff --git a/debian/control b/debian/control
index c80b84d69..a80d3005f 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,9 @@ Build-Depends: debhelper-compat (= 13),
libldap2-dev,
libmemcached-dev,
liboath-dev,
- libsbjson-dev,
+ libsbjson-dev (>= 2.3.2-5),
libsodium-dev,
- libsope-dev (>= 5.7.1),
+ libsope-dev (>= 5.11.1-2),
libssl-dev,
libwbxml2-dev (>= 0.11),
libxml2-dev,
diff --git a/debian/rules b/debian/rules
index 4578e9025..ce258b63b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,14 +44,19 @@ override_dh_auto_install:
for i in AdministrationUI.SOGo Appointments.SOGo CommonUI.SOGo
Contacts.SOGo ContactsUI.SOGo MailPartViewers.SOGo \
Mailer.SOGo MailerUI.SOGo MainUI.SOGo PreferencesUI.SOGo
SchedulerUI.SOGo; do \
mkdir debian/tmp/usr/share/GNUstep/SOGo/$$i \
- && mv debian/tmp/usr/lib/GNUstep/SOGo/$$i/Resources
debian/tmp/usr/share/GNUstep/SOGo/$$i/ ; \
+ && mv debian/tmp/usr/lib/*/GNUstep/SOGo/$$i/Resources
debian/tmp/usr/share/GNUstep/SOGo/$$i/ ; \
done
- mv debian/tmp/usr/lib/GNUstep/SOGo/Templates
debian/tmp/usr/lib/GNUstep/SOGo/WebServerResources
debian/tmp/usr/share/GNUstep/SOGo
+ mv debian/tmp/usr/lib/*/GNUstep/SOGo/Templates
debian/tmp/usr/lib/*/GNUstep/SOGo/WebServerResources
debian/tmp/usr/share/GNUstep/SOGo
mkdir -p debian/tmp/usr/share/GNUstep/Libraries/Resources
- mv debian/tmp/usr/lib/GNUstep/Libraries/Resources/NGCards
debian/tmp/usr/share/GNUstep/Libraries/Resources
- rmdir debian/tmp/usr/lib/GNUstep/Libraries/Resources
debian/tmp/usr/lib/GNUstep/Libraries
+ mv debian/tmp/usr/lib/*/GNUstep/Libraries/Resources/NGCards
debian/tmp/usr/share/GNUstep/Libraries/Resources
+ rmdir debian/tmp/usr/lib/*/GNUstep/Libraries/Resources
debian/tmp/usr/lib/*/GNUstep/Libraries
dh_install
override_dh_installchangelogs:
dh_installchangelogs CHANGELOG.md
+
+execute_before_dh_link:
+# Obtain the necessary gnustep-multiarch dependency and delete useless
+# stamp.make files.
+ gsdh_gnustep --no-move
diff --git a/debian/sogo-activesync.install b/debian/sogo-activesync.install
index 7f0e316d8..24fa49b5d 100644
--- a/debian/sogo-activesync.install
+++ b/debian/sogo-activesync.install
@@ -1 +1 @@
-usr/lib/GNUstep/SOGo/ActiveSync.SOGo
+usr/lib/*/GNUstep/SOGo/ActiveSync.SOGo
diff --git a/debian/sogo-common.links b/debian/sogo-common.links
deleted file mode 100644
index e2462303b..000000000
--- a/debian/sogo-common.links
+++ /dev/null
@@ -1,13 +0,0 @@
-usr/share/GNUstep/SOGo/AdministrationUI.SOGo/Resources
usr/lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources
-usr/share/GNUstep/SOGo/Appointments.SOGo/Resources
usr/lib/GNUstep/SOGo/Appointments.SOGo/Resources
-usr/share/GNUstep/SOGo/CommonUI.SOGo/Resources
usr/lib/GNUstep/SOGo/CommonUI.SOGo/Resources
-usr/share/GNUstep/SOGo/Contacts.SOGo/Resources
usr/lib/GNUstep/SOGo/Contacts.SOGo/Resources
-usr/share/GNUstep/SOGo/ContactsUI.SOGo/Resources
usr/lib/GNUstep/SOGo/ContactsUI.SOGo/Resources
-usr/share/GNUstep/SOGo/MailPartViewers.SOGo/Resources
usr/lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources
-usr/share/GNUstep/SOGo/Mailer.SOGo/Resources
usr/lib/GNUstep/SOGo/Mailer.SOGo/Resources
-usr/share/GNUstep/SOGo/MailerUI.SOGo/Resources
usr/lib/GNUstep/SOGo/MailerUI.SOGo/Resources
-usr/share/GNUstep/SOGo/MainUI.SOGo/Resources
usr/lib/GNUstep/SOGo/MainUI.SOGo/Resources
-usr/share/GNUstep/SOGo/PreferencesUI.SOGo/Resources
usr/lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources
-usr/share/GNUstep/SOGo/SchedulerUI.SOGo/Resources
usr/lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources
-usr/share/GNUstep/SOGo/Templates usr/lib/GNUstep/SOGo/Templates
-usr/share/GNUstep/SOGo/WebServerResources
usr/lib/GNUstep/SOGo/WebServerResources
diff --git a/debian/sogo.install b/debian/sogo.install
index cf2da2089..8dc09a832 100644
--- a/debian/sogo.install
+++ b/debian/sogo.install
@@ -2,23 +2,23 @@ etc/cron.d/sogo
etc/default/sogo
etc/logrotate.d/sogo
debian/sogo.conf etc/sogo
-usr/include/GNUstep/*
-usr/lib/GNUstep/Frameworks/*
-usr/lib/GNUstep/OCSTypeModels/*
-usr/lib/GNUstep/SOGo/AdministrationUI.SOGo
-usr/lib/GNUstep/SOGo/Appointments.SOGo
-usr/lib/GNUstep/SOGo/CommonUI.SOGo
-usr/lib/GNUstep/SOGo/Contacts.SOGo
-usr/lib/GNUstep/SOGo/ContactsUI.SOGo
-usr/lib/GNUstep/SOGo/MailPartViewers.SOGo
-usr/lib/GNUstep/SOGo/Mailer.SOGo
-usr/lib/GNUstep/SOGo/MailerUI.SOGo
-usr/lib/GNUstep/SOGo/MainUI.SOGo
-usr/lib/GNUstep/SOGo/PreferencesUI.SOGo
-usr/lib/GNUstep/SOGo/SchedulerUI.SOGo
-usr/lib/GNUstep/SaxDrivers-4.9/*
-usr/lib/GNUstep/SaxMappings/*
-usr/lib/GNUstep/WOxElemBuilders-4.9/*
-usr/lib/sogo/*
+usr/include/*/GNUstep/*
+usr/lib/*/GNUstep/Frameworks/*
+usr/lib/*/GNUstep/OCSTypeModels/*
+usr/lib/*/GNUstep/SOGo/AdministrationUI.SOGo
+usr/lib/*/GNUstep/SOGo/Appointments.SOGo
+usr/lib/*/GNUstep/SOGo/CommonUI.SOGo
+usr/lib/*/GNUstep/SOGo/Contacts.SOGo
+usr/lib/*/GNUstep/SOGo/ContactsUI.SOGo
+usr/lib/*/GNUstep/SOGo/MailPartViewers.SOGo
+usr/lib/*/GNUstep/SOGo/Mailer.SOGo
+usr/lib/*/GNUstep/SOGo/MailerUI.SOGo
+usr/lib/*/GNUstep/SOGo/MainUI.SOGo
+usr/lib/*/GNUstep/SOGo/PreferencesUI.SOGo
+usr/lib/*/GNUstep/SOGo/SchedulerUI.SOGo
+usr/lib/*/GNUstep/SaxDrivers-4.9/*
+usr/lib/*/GNUstep/SaxMappings/*
+usr/lib/*/GNUstep/WOxElemBuilders-4.9/*
+usr/lib/*/sogo/*
usr/lib/tmpfiles.d/sogo.conf
usr/sbin/*
diff --git a/debian/sogo.links b/debian/sogo.links
new file mode 100644
index 000000000..eb6a73379
--- /dev/null
+++ b/debian/sogo.links
@@ -0,0 +1,13 @@
+usr/share/GNUstep/SOGo/AdministrationUI.SOGo/Resources
usr/lib/${DEB_HOST_MULTIARCH}/GNUstep/SOGo/AdministrationUI.SOGo/Resources
+usr/share/GNUstep/SOGo/Appointments.SOGo/Resources
usr/lib/${DEB_HOST_MULTIARCH}/GNUstep/SOGo/Appointments.SOGo/Resources
+usr/share/GNUstep/SOGo/CommonUI.SOGo/Resources
usr/lib/${DEB_HOST_MULTIARCH}/GNUstep/SOGo/CommonUI.SOGo/Resources
+usr/share/GNUstep/SOGo/Contacts.SOGo/Resources
usr/lib/${DEB_HOST_MULTIARCH}/GNUstep/SOGo/Contacts.SOGo/Resources
+usr/share/GNUstep/SOGo/ContactsUI.SOGo/Resources
usr/lib/${DEB_HOST_MULTIARCH}/GNUstep/SOGo/ContactsUI.SOGo/Resources
+usr/share/GNUstep/SOGo/MailPartViewers.SOGo/Resources
usr/lib/${DEB_HOST_MULTIARCH}/GNUstep/SOGo/MailPartViewers.SOGo/Resources
+usr/share/GNUstep/SOGo/Mailer.SOGo/Resources
usr/lib/${DEB_HOST_MULTIARCH}/GNUstep/SOGo/Mailer.SOGo/Resources
+usr/share/GNUstep/SOGo/MailerUI.SOGo/Resources
usr/lib/${DEB_HOST_MULTIARCH}/GNUstep/SOGo/MailerUI.SOGo/Resources
+usr/share/GNUstep/SOGo/MainUI.SOGo/Resources
usr/lib/${DEB_HOST_MULTIARCH}/GNUstep/SOGo/MainUI.SOGo/Resources
+usr/share/GNUstep/SOGo/PreferencesUI.SOGo/Resources
usr/lib/${DEB_HOST_MULTIARCH}/GNUstep/SOGo/PreferencesUI.SOGo/Resources
+usr/share/GNUstep/SOGo/SchedulerUI.SOGo/Resources
usr/lib/${DEB_HOST_MULTIARCH}/GNUstep/SOGo/SchedulerUI.SOGo/Resources
+usr/share/GNUstep/SOGo/Templates
usr/lib/${DEB_HOST_MULTIARCH}/GNUstep/SOGo/Templates
+usr/share/GNUstep/SOGo/WebServerResources
usr/lib/${DEB_HOST_MULTIARCH}/GNUstep/SOGo/WebServerResources
--
2.47.2
>From 84d3a2da64956afdba1b31cd55b7cc24244c1a6f Mon Sep 17 00:00:00 2001
From: Yavor Doganov <ya...@gnu.org>
Date: Sun, 26 Jan 2025 20:01:35 +0200
Subject: [PATCH] Fix FTBFS with multiarch; use dh_gnustep for moving files.
---
debian/changelog | 16 +++++++++++++++
debian/control | 4 ++--
debian/rules | 16 +++++++--------
debian/sogo-activesync.install | 2 +-
debian/sogo-common.install | 1 +
debian/sogo-common.links | 13 ------------
debian/sogo.install | 36 +++++++++++++++++-----------------
debian/sogo.links | 2 ++
8 files changed, 47 insertions(+), 43 deletions(-)
delete mode 100644 debian/sogo-common.links
create mode 100644 debian/sogo.links
diff --git a/debian/changelog b/debian/changelog
index c572747eb..5dad566e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+sogo (5.11.2-2) UNRELEASED; urgency=medium
+
+ * debian/control (Build-Depends): Bump libsbjson-dev and libsope-dev to
+ ensure the package is rebuilt for the multiarch layout.
+ * debian/rules (override_dh_auto_install): Fix paths when moving files.
+ Delete statements handled by dh_gnustep.
+ (execute_before_dh_link): Run dh_gnustep --bundle-dir to create
+ symlinks and move files to sogo-common.
+ * debian/sogo.install: Update for multiarch.
+ * debain/sogo-activesync.install: Likewise.
+ * debian/sogo-common.links: Delete.
+ * debian/sogo-common.install: Add usr/lib/*/GNUstep/Libraries.
+ * debian/sogo.links: New file.
+
+ -- Yavor Doganov <ya...@gnu.org> Sun, 26 Jan 2025 19:53:26 +0200
+
sogo (5.11.2-1) unstable; urgency=medium
* New upstream release, with two important fixes introduced in 5.11.1:
diff --git a/debian/control b/debian/control
index c80b84d69..a80d3005f 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,9 @@ Build-Depends: debhelper-compat (= 13),
libldap2-dev,
libmemcached-dev,
liboath-dev,
- libsbjson-dev,
+ libsbjson-dev (>= 2.3.2-5),
libsodium-dev,
- libsope-dev (>= 5.7.1),
+ libsope-dev (>= 5.11.1-2),
libssl-dev,
libwbxml2-dev (>= 0.11),
libxml2-dev,
diff --git a/debian/rules b/debian/rules
index 4578e9025..7e4804beb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,17 +41,15 @@ override_dh_auto_install:
cp debian/sogo.tmpfiles.d debian/tmp/usr/lib/tmpfiles.d/sogo.conf
# Put arch independent files in /usr/share instead of /usr/lib
mkdir -p debian/tmp/usr/share/GNUstep/SOGo
- for i in AdministrationUI.SOGo Appointments.SOGo CommonUI.SOGo
Contacts.SOGo ContactsUI.SOGo MailPartViewers.SOGo \
- Mailer.SOGo MailerUI.SOGo MainUI.SOGo PreferencesUI.SOGo
SchedulerUI.SOGo; do \
- mkdir debian/tmp/usr/share/GNUstep/SOGo/$$i \
- && mv debian/tmp/usr/lib/GNUstep/SOGo/$$i/Resources
debian/tmp/usr/share/GNUstep/SOGo/$$i/ ; \
- done
- mv debian/tmp/usr/lib/GNUstep/SOGo/Templates
debian/tmp/usr/lib/GNUstep/SOGo/WebServerResources
debian/tmp/usr/share/GNUstep/SOGo
- mkdir -p debian/tmp/usr/share/GNUstep/Libraries/Resources
- mv debian/tmp/usr/lib/GNUstep/Libraries/Resources/NGCards
debian/tmp/usr/share/GNUstep/Libraries/Resources
- rmdir debian/tmp/usr/lib/GNUstep/Libraries/Resources
debian/tmp/usr/lib/GNUstep/Libraries
+ mv debian/tmp/usr/lib/*/GNUstep/SOGo/Templates
debian/tmp/usr/lib/*/GNUstep/SOGo/WebServerResources
debian/tmp/usr/share/GNUstep/SOGo
dh_install
override_dh_installchangelogs:
dh_installchangelogs CHANGELOG.md
+
+execute_before_dh_link:
+# Remove the ActiveSync bundle in advance, otherwise dh_gnustep will
+# happily move its Resources to /usr/share in the sogo-common package.
+ rm -rf debian/tmp/usr/lib/*/GNUstep/SOGo/ActiveSync
+ gsdh_gnustep --bundle-dir=SOGo --move-to=sogo-common
diff --git a/debian/sogo-activesync.install b/debian/sogo-activesync.install
index 7f0e316d8..24fa49b5d 100644
--- a/debian/sogo-activesync.install
+++ b/debian/sogo-activesync.install
@@ -1 +1 @@
-usr/lib/GNUstep/SOGo/ActiveSync.SOGo
+usr/lib/*/GNUstep/SOGo/ActiveSync.SOGo
diff --git a/debian/sogo-common.install b/debian/sogo-common.install
index d4a8a3549..65769ad1c 100644
--- a/debian/sogo-common.install
+++ b/debian/sogo-common.install
@@ -1 +1,2 @@
+usr/lib/*/GNUstep/Libraries
usr/share/*
diff --git a/debian/sogo-common.links b/debian/sogo-common.links
deleted file mode 100644
index e2462303b..000000000
--- a/debian/sogo-common.links
+++ /dev/null
@@ -1,13 +0,0 @@
-usr/share/GNUstep/SOGo/AdministrationUI.SOGo/Resources
usr/lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources
-usr/share/GNUstep/SOGo/Appointments.SOGo/Resources
usr/lib/GNUstep/SOGo/Appointments.SOGo/Resources
-usr/share/GNUstep/SOGo/CommonUI.SOGo/Resources
usr/lib/GNUstep/SOGo/CommonUI.SOGo/Resources
-usr/share/GNUstep/SOGo/Contacts.SOGo/Resources
usr/lib/GNUstep/SOGo/Contacts.SOGo/Resources
-usr/share/GNUstep/SOGo/ContactsUI.SOGo/Resources
usr/lib/GNUstep/SOGo/ContactsUI.SOGo/Resources
-usr/share/GNUstep/SOGo/MailPartViewers.SOGo/Resources
usr/lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources
-usr/share/GNUstep/SOGo/Mailer.SOGo/Resources
usr/lib/GNUstep/SOGo/Mailer.SOGo/Resources
-usr/share/GNUstep/SOGo/MailerUI.SOGo/Resources
usr/lib/GNUstep/SOGo/MailerUI.SOGo/Resources
-usr/share/GNUstep/SOGo/MainUI.SOGo/Resources
usr/lib/GNUstep/SOGo/MainUI.SOGo/Resources
-usr/share/GNUstep/SOGo/PreferencesUI.SOGo/Resources
usr/lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources
-usr/share/GNUstep/SOGo/SchedulerUI.SOGo/Resources
usr/lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources
-usr/share/GNUstep/SOGo/Templates usr/lib/GNUstep/SOGo/Templates
-usr/share/GNUstep/SOGo/WebServerResources
usr/lib/GNUstep/SOGo/WebServerResources
diff --git a/debian/sogo.install b/debian/sogo.install
index cf2da2089..6ca0d8dd2 100644
--- a/debian/sogo.install
+++ b/debian/sogo.install
@@ -2,23 +2,23 @@ etc/cron.d/sogo
etc/default/sogo
etc/logrotate.d/sogo
debian/sogo.conf etc/sogo
-usr/include/GNUstep/*
-usr/lib/GNUstep/Frameworks/*
-usr/lib/GNUstep/OCSTypeModels/*
-usr/lib/GNUstep/SOGo/AdministrationUI.SOGo
-usr/lib/GNUstep/SOGo/Appointments.SOGo
-usr/lib/GNUstep/SOGo/CommonUI.SOGo
-usr/lib/GNUstep/SOGo/Contacts.SOGo
-usr/lib/GNUstep/SOGo/ContactsUI.SOGo
-usr/lib/GNUstep/SOGo/MailPartViewers.SOGo
-usr/lib/GNUstep/SOGo/Mailer.SOGo
-usr/lib/GNUstep/SOGo/MailerUI.SOGo
-usr/lib/GNUstep/SOGo/MainUI.SOGo
-usr/lib/GNUstep/SOGo/PreferencesUI.SOGo
-usr/lib/GNUstep/SOGo/SchedulerUI.SOGo
-usr/lib/GNUstep/SaxDrivers-4.9/*
-usr/lib/GNUstep/SaxMappings/*
-usr/lib/GNUstep/WOxElemBuilders-4.9/*
-usr/lib/sogo/*
+usr/include/*/GNUstep/*
+usr/lib/*/GNUstep/Frameworks/*
+usr/lib/*/GNUstep/OCSTypeModels/*
+usr/lib/*/GNUstep/SOGo/AdministrationUI.SOGo/[!R]*
+usr/lib/*/GNUstep/SOGo/Appointments.SOGo/[!R]*
+usr/lib/*/GNUstep/SOGo/CommonUI.SOGo/[!R]*
+usr/lib/*/GNUstep/SOGo/Contacts.SOGo/[!R]*
+usr/lib/*/GNUstep/SOGo/ContactsUI.SOGo/[!R]*
+usr/lib/*/GNUstep/SOGo/MailPartViewers.SOGo/[!R]*
+usr/lib/*/GNUstep/SOGo/Mailer.SOGo/[!R]*
+usr/lib/*/GNUstep/SOGo/MailerUI.SOGo/[!R]*
+usr/lib/*/GNUstep/SOGo/MainUI.SOGo/[!R]*
+usr/lib/*/GNUstep/SOGo/PreferencesUI.SOGo/[!R]*
+usr/lib/*/GNUstep/SOGo/SchedulerUI.SOGo/[!R]*
+usr/lib/*/GNUstep/SaxDrivers-4.9/*
+usr/lib/*/GNUstep/SaxMappings/*
+usr/lib/*/GNUstep/WOxElemBuilders-4.9/*
+usr/lib/*/sogo/*
usr/lib/tmpfiles.d/sogo.conf
usr/sbin/*
diff --git a/debian/sogo.links b/debian/sogo.links
new file mode 100644
index 000000000..abce6827f
--- /dev/null
+++ b/debian/sogo.links
@@ -0,0 +1,2 @@
+usr/share/GNUstep/SOGo/Templates
usr/lib/${DEB_HOST_MULTIARCH}/GNUstep/SOGo/Templates
+usr/share/GNUstep/SOGo/WebServerResources
usr/lib/${DEB_HOST_MULTIARCH}/GNUstep/SOGo/WebServerResources
--
2.47.2
--- End Message ---
--- Begin Message ---
Source: sogo
Source-Version: 5.11.2-2
Done: Jordi Mallach <jo...@debian.org>
We believe that the bug you reported is fixed in the latest version of
sogo, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 1094...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Jordi Mallach <jo...@debian.org> (supplier of updated sogo package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sat, 01 Feb 2025 23:20:29 +0100
Source: sogo
Architecture: source
Version: 5.11.2-2
Distribution: unstable
Urgency: medium
Maintainer: Debian SOGo Maintainers
<pkg-sogo-maintain...@lists.alioth.debian.org>
Changed-By: Jordi Mallach <jo...@debian.org>
Closes: 1094304 1094306
Changes:
sogo (5.11.2-2) unstable; urgency=medium
.
[ Yavor Doganov ]
* debian/control (Build-Depends): Bump libsbjson-dev and libsope-dev to
ensure the package is rebuilt for the multiarch layout. Closes: #1094304.
Remove unnecessary gobjc; annotate python3 with :any.
* debian/rules: Include gnustep-make's config.mk.
(override_dh_auto_install): Fix paths when moving files.
Delete statements handled by dh_gnustep.
(execute_before_dh_link): Run dh_gnustep --bundle-dir to create
symlinks and move files to sogo-common.
* debian/sogo.install: Update for multiarch.
* debain/sogo-activesync.install: Likewise.
* debian/sogo-common.links: Delete.
* debian/sogo-common.install: Add usr/lib/*/GNUstep/Libraries.
* debian/sogo.links: New file.
* debian/patches/libxml2.patch: Dont' hard code pkg-config.
* debian/patches/cross.patch: New; fix FTCBFS. Closes: #1094306.
Checksums-Sha1:
1b318d9b3e72332b0fc17e4dd762fe52e6e45d34 2281 sogo_5.11.2-2.dsc
751f68df0f017f7ed168faeff27a0a617b160385 20012 sogo_5.11.2-2.debian.tar.xz
893d0435d26f25db0f57c48cc1b93031fb3edd4b 11865 sogo_5.11.2-2_amd64.buildinfo
Checksums-Sha256:
0b7f71d12450364822fa08d8271f07fee50545a3de6c75f9790707b693cc1839 2281
sogo_5.11.2-2.dsc
dc642aaae3f2dd224b6d0c45bdda12236880d576e425a4bc87d47888e6e4be9d 20012
sogo_5.11.2-2.debian.tar.xz
94e85e7a45d55ce4a8c3bd3b0bc7e16dd25367e5c79acfd91d52fa0e26369775 11865
sogo_5.11.2-2_amd64.buildinfo
Files:
ace3f601be01674938b5f4a8d965a7c7 2281 mail optional sogo_5.11.2-2.dsc
135a6e7a21b8bf9723ebf3e9ad03aee2 20012 mail optional
sogo_5.11.2-2.debian.tar.xz
5975f2428d51038024c88c8524cf46c9 11865 mail optional
sogo_5.11.2-2_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEE6BdUhsApKYN8KGoWJVAvb8vjywQFAmeen/sACgkQJVAvb8vj
ywQwbg//V2XDYR2Ehn3KKcBU5cyTNbeP+A26qBNLzqrYtcZAuT+uPc/KcXJ6m/Vs
1cFZwqz+ORB2R2Hjau+KF/AsSmZE1c3oZX5xQwzf2zWRG99P9CJIVWnTobzxtRyR
Cv7z4Iix/Q1DlMGfcc1/TS6WB1Wakz0NLqpr6ZPVriol9FUJTS6feK5gjwJaMRql
7UkFg50dC7U5XcTql764zb+Psrzo0gDSUzXGBDAjLawSPR+Bvrv+hGUVdGERIhfM
/n0ZnPtmnCxpy1vVW9ZxxIuPIkpMV2m+0EC1E2/YQsIqQq2aEg5kDmxRQHdEqYUQ
sW+btfcrQoA0EFBQJLhh/axTupu7Keps8ZClgC4J1cjHFu9kiciW96uzVqUCjJ27
T57pVWBkzbQojq8/u2h206w499R/k21Eh4Ev78u6PifKczjObk7eX+oHyIfzB1lL
MBd7cMyxh4rSfWktxA84PxgT/VKKDrb+freUQJ7x+cwl56diODkMXCthw/2CBmwC
924zACXP6fsU0Qil3vxH8HR0ibDiB0T6q4foa0Zfq3b8WXe9ILerdtNrpyrlzJdH
ffgecwa/sKqizjLDKyh2zaWlypOOJ9mDbh7WXWwEWV9PU6N7mWrBbjowZc6dc7yd
mPEQ50vSVtAb0HL8gIDqElIH7p+7gKFadNMezhZ6M6Z695sfMFs=
=/v2h
-----END PGP SIGNATURE-----
pgpZqHdDf0CiD.pgp
Description: PGP signature
--- End Message ---