--- a/components/desktop/libotr/libotr.p5m Tue Nov 17 13:06:18 2015 -0800
+++ b/components/desktop/libotr/libotr.p5m Tue Nov 17 15:17:11 2015 -0800
@@ -73,3 +73,8 @@
link path=usr/share/man/man1/otr_sesskeys.1 target=otr_toolkit.1
file path=usr/share/man/man1/otr_toolkit.1
license COPYING.LIB license=LGPLv2.1
+# libotr was previously in the 'desktop' consolidation as part of the pidgin
+# package. In moving it to Userland, libotr is now delivered in its own package.
+# In order to install libotr, if the pidgin package is already installed, it
+# must be at build #88 (or later). In other words, the Userland version.
+depend type=optional fmri=communication/im/[email protected],5.12-5.12.0.0.0.88.0
--- a/components/desktop/pidgin-otr/Makefile Tue Nov 17 13:06:18 2015 -0800
+++ b/components/desktop/pidgin-otr/Makefile Tue Nov 17 15:17:11 2015 -0800
@@ -58,6 +58,7 @@
system-test: $(NO_TESTS)
+REQUIRED_PACKAGES += communication/im/libotr
REQUIRED_PACKAGES += communication/im/pidgin
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/security/libgcrypt
--- a/components/desktop/pidgin-otr/pidgin-otr.p5m Tue Nov 17 13:06:18 2015 -0800
+++ b/components/desktop/pidgin-otr/pidgin-otr.p5m Tue Nov 17 15:17:11 2015 -0800
@@ -58,3 +58,9 @@
file path=usr/share/locale/vi/LC_MESSAGES/pidgin-otr.mo
file path=usr/share/locale/zh_CN/LC_MESSAGES/pidgin-otr.mo
license pidgin-otr.license license="GPLv2, LGPLv2.1"
+# pidgin-otr was previously in the 'desktop' consolidation as part of the
+# pidgin package. In moving it to Userland, pidgin-otr is now delivered in
+# its own package. In order to install pidgin-otr, if the pidgin package
+# is already installed, it must be at build #88 (or later). In other words,
+# the Userland version.
+depend type=optional fmri=communication/im/[email protected],5.12-5.12.0.0.0.88.0