Package: sogo-activesync
Version: 5.11.2-2
Severity: serious
Tags: patch
Control: block 1093620 with -1
User: debian...@lists.debian.org
Usertags: piuparts
I am sorry but my patch for #1094304 introduced a piuparts regression:
0m14.9s ERROR: FAIL: silently overwrites files via directory symlinks:
/usr/lib/x86_64-linux-gnu/GNUstep/SOGo/ActiveSync.SOGo/Resources/Info-gnustep.plist
(sogo-activesync) != /usr/share/GNUstep/ActiveSync.SOGo/Info-gnustep.plist
(sogo-common)
/usr/lib/x86_64-linux-gnu/GNUstep/SOGo/ActiveSync.SOGo/Resources ->
../../../../../share/GNUstep/ActiveSync.SOGo
/usr/lib/x86_64-linux-gnu/GNUstep/SOGo/ActiveSync.SOGo/Resources/product.plist
(sogo-activesync) != /usr/share/GNUstep/ActiveSync.SOGo/product.plist
(sogo-common)
/usr/lib/x86_64-linux-gnu/GNUstep/SOGo/ActiveSync.SOGo/Resources ->
../../../../../share/GNUstep/ActiveSync.SOGo
I still keep the .debs I produced then and they don't have this
problem so I wonder what happened. One possible explanation is that I
made a last minute change because the patch for #1094304 didn't
include config.mk (which would make GNUSTEP_SYSTEM_LIBRARY undefined)
and I was careless. Please accept my sincere apologies.
I tested the attached path by doing a full build, arch:any only,
arch:all only and also ran piuparts locally.
>From 7210f4debcfc1f6cecc2d81cc74d808a4ddecc50 Mon Sep 17 00:00:00 2001
From: Yavor Doganov <ya...@gnu.org>
Date: Thu, 6 Feb 2025 11:42:23 +0200
Subject: [PATCH] Fix piuparts error
---
debian/changelog | 10 ++++++++++
debian/control | 2 ++
debian/rules | 2 +-
debian/sogo-activesync.maintscript | 1 +
4 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 debian/sogo-activesync.maintscript
diff --git a/debian/changelog b/debian/changelog
index 479720d99..a80c579a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+sogo (5.11.2-3) UNRELEASED; urgency=medium
+
+ * debian/rules (execute_before_dh_link): Fix piuparts regression
+ (Closes: #-1).
+ * debian/control (sogo-activesync): Add necessary Breaks/Replaces.
+ * debian/sogo-activesync.maintscript: New file; handle the symlink to
+ directory conversion.
+
+ -- Yavor Doganov <ya...@gnu.org> Thu, 06 Feb 2025 09:15:06 +0200
+
sogo (5.11.2-2) unstable; urgency=medium
[ Yavor Doganov ]
diff --git a/debian/control b/debian/control
index 056f6e233..59a6414fd 100644
--- a/debian/control
+++ b/debian/control
@@ -50,6 +50,8 @@ Description: Scalable groupware server
Package: sogo-activesync
Architecture: any
Depends: sogo (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Breaks: sogo (<< 5.11.2-3)
+Replaces: sogo (<< 5.11.2-3)
Description: Scalable groupware server - ActiveSync module
SOGo is a groupware server built around OpenGroupware.org (OGo) and
the SOPE application server with focus on scalability.
diff --git a/debian/rules b/debian/rules
index c0fdd654c..73ec5eb7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,5 +52,5 @@ override_dh_installchangelogs:
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
+ rm -rf debian/tmp$(GNUSTEP_SYSTEM_LIBRARY)/SOGo/ActiveSync*
gsdh_gnustep --bundle-dir=SOGo --move-to=sogo-common
diff --git a/debian/sogo-activesync.maintscript
b/debian/sogo-activesync.maintscript
new file mode 100644
index 000000000..f6d02a80c
--- /dev/null
+++ b/debian/sogo-activesync.maintscript
@@ -0,0 +1 @@
+symlink_to_dir
/usr/lib/${DEB_HOST_MULTIARCH}/GNUstep/SOGo/ActiveSync.SOGo/Resources
/usr/share/GNUstep/ActiveSync.SOGo 5.11.2-3~
--
2.47.2
