Followup-For: Bug #699197
Control: tag -1 patch
Hi,
I'm attaching a patch that fixes the two RC issues:
* missing Breaks/Replaces libpolyorb1-dev
* cleaning up the diversion properly
I'm now going to ask the RT for their opinion about this patch.
The patched packages pass the piuparts tests that utilize the
problematic code paths.
Andreas
diff -Nru polyorb-2.8~20110207/debian/changelog polyorb-2.8~20110207/debian/changelog
--- polyorb-2.8~20110207/debian/changelog 2012-09-29 09:55:26.000000000 +0200
+++ polyorb-2.8~20110207/debian/changelog 2013-02-03 06:06:27.000000000 +0100
@@ -1,3 +1,13 @@
+polyorb (2.8~20110207-5.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * libpolyorb2-dev: Add Conflicts/Replaces: libpolyorb1-dev due to file
+ conflict on /usr/bin/iac. (Closes: #699197)
+ * libpolyorb3.postinst: Cleanup the diversion created by 2.8~20110207-[34].
+ (Closes: #692780)
+
+ -- Andreas Beckmann <a...@debian.org> Sun, 03 Feb 2013 05:56:27 +0100
+
polyorb (2.8~20110207-5) unstable; urgency=low
* remove diversion of manpage polyorb.7
diff -Nru polyorb-2.8~20110207/debian/control polyorb-2.8~20110207/debian/control
--- polyorb-2.8~20110207/debian/control 2012-06-13 23:06:09.000000000 +0200
+++ polyorb-2.8~20110207/debian/control 2013-02-03 05:59:58.000000000 +0100
@@ -31,8 +31,8 @@
Section: libdevel
Architecture: amd64 hppa i386 ia64 mips mipsel powerpc ppc64 s390 sparc
Depends: ${misc:Depends}, ${shlibs:Depends}, libpolyorb3 (= ${binary:Version}), g++, gnat-4.6
-Conflicts: libpolyorb2-dev
-Replaces: libpolyorb2-dev
+Conflicts: libpolyorb1-dev, libpolyorb2-dev
+Replaces: libpolyorb1-dev, libpolyorb2-dev
Recommends: polyorb-servers (= ${binary:Version})
Description: Multiple-personality middleware for Ada (development)
PolyORB provides a uniform solution to build distributed applications; relying
diff -Nru polyorb-2.8~20110207/debian/libpolyorb3.postinst polyorb-2.8~20110207/debian/libpolyorb3.postinst
--- polyorb-2.8~20110207/debian/libpolyorb3.postinst 1970-01-01 01:00:00.000000000 +0100
+++ polyorb-2.8~20110207/debian/libpolyorb3.postinst 2013-02-03 06:06:38.000000000 +0100
@@ -0,0 +1,9 @@
+#! /bin/sh
+set -e
+
+if [ "$1" = "configure" ]; then
+ # remove the diversion created by libpolyorb3 2.8~20110207-3 and 2.8~20110207-4
+ dpkg-divert --quiet --package libpolyorb3 --remove --rename /usr/share/man/man7/polyorb.7.gz
+fi
+
+#DEBHELPER#
