Control: severity -1 grave
Control: tags -1 + patch
Timo van Roermund wrote:
> Thanks for the prompt response.
>
> With these changes it indeed works again.
OK, thanks for the confirmation.
Jordi, I'm sorry about this. Hope it's my last snafu...
diff -Nru sogo-5.11.2/debian/changelog sogo-5.11.2/debian/changelog
--- sogo-5.11.2/debian/changelog 2025-02-11 17:49:11.000000000 +0200
+++ sogo-5.11.2/debian/changelog 2025-02-19 10:49:12.000000000 +0200
@@ -1,3 +1,16 @@
+sogo (5.11.2-4) UNRELEASED; urgency=medium
+
+ * debian/rules (override_dh_auto_install): Patch the Apache
+ configuration file to cope with multiarch (Closes: #1098311).
+ Thanks Timo van Roermund for the report.
+ * debian/sogo-common.install: Replace usr/share/* with usr/share/GNUstep
+ because apache.conf must be in the sogo package.
+ * debian/sogo.docs: Add apache.conf.
+ * debian/clean: New file.
+ * debian/control: Add necessary Breaks+Replaces.
+
+ -- Yavor Doganov <ya...@gnu.org> Wed, 19 Feb 2025 10:49:12 +0200
+
sogo (5.11.2-3) unstable; urgency=medium
[ Yavor Doganov ]
diff -Nru sogo-5.11.2/debian/clean sogo-5.11.2/debian/clean
--- sogo-5.11.2/debian/clean 1970-01-01 02:00:00.000000000 +0200
+++ sogo-5.11.2/debian/clean 2025-02-19 10:49:12.000000000 +0200
@@ -0,0 +1 @@
+apache.conf
diff -Nru sogo-5.11.2/debian/control sogo-5.11.2/debian/control
--- sogo-5.11.2/debian/control 2025-02-11 17:44:55.000000000 +0200
+++ sogo-5.11.2/debian/control 2025-02-19 10:49:12.000000000 +0200
@@ -32,6 +32,8 @@
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, systemd | tmpreaper, sogo-common
(= ${source:Version}), adduser, zip, lsb-base (>= 3.0-6), memcached
Suggests: postgresql | default-mysql-server | virtual-mysql-server
+Breaks: sogo-common (<< 5.11.2-4)
+Replaces: sogo-common (<< 5.11.2-4)
Description: Scalable groupware server
SOGo is a groupware server built around OpenGroupware.org (OGo) and
the SOPE application server with focus on scalability. It has many
diff -Nru sogo-5.11.2/debian/rules sogo-5.11.2/debian/rules
--- sogo-5.11.2/debian/rules 2025-02-11 17:44:55.000000000 +0200
+++ sogo-5.11.2/debian/rules 2025-02-19 10:49:12.000000000 +0200
@@ -38,7 +38,8 @@
cp Scripts/sogo.cron debian/tmp/etc/cron.d/sogo
cp Scripts/sogo-backup.sh debian/tmp/usr/sbin/sogo-backup
cp Scripts/logrotate debian/tmp/etc/logrotate.d/sogo
- cp Apache/SOGo.conf debian/tmp/usr/share/doc/sogo/apache.conf
+ sed -e 's|/usr/lib/GNUstep|$(GNUSTEP_SYSTEM_LIBRARY)|g' \
+ Apache/SOGo.conf > apache.conf
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
diff -Nru sogo-5.11.2/debian/sogo-common.install
sogo-5.11.2/debian/sogo-common.install
--- sogo-5.11.2/debian/sogo-common.install 2025-02-01 23:42:05.000000000
+0200
+++ sogo-5.11.2/debian/sogo-common.install 2025-02-19 10:49:12.000000000
+0200
@@ -1,2 +1,2 @@
usr/lib/*/GNUstep/Libraries
-usr/share/*
+usr/share/GNUstep
diff -Nru sogo-5.11.2/debian/sogo.docs sogo-5.11.2/debian/sogo.docs
--- sogo-5.11.2/debian/sogo.docs 2024-08-12 23:39:08.000000000 +0300
+++ sogo-5.11.2/debian/sogo.docs 2025-02-19 10:49:12.000000000 +0200
@@ -1,3 +1,4 @@
+apache.conf
Documentation/*.asciidoc
Scripts/mysql-utf8mb4.sql
Scripts/sql-update-1.2.2_to_1.3.0.sh
