We are reverting/removing the "qpid-cpp" package from Trunk:Testing until the qmf-devel naming conflict is resolved...
(I.e. qmf provides qmf-devel, and so does qpid-cpp...qpid-cpp should not provide qmf-devel) rs On 2/1/11 3:26 AM, "Joonas Kylänpää" <[email protected]> wrote: >Hi, >I have made the following changes to qpid-cpp in project Trunk:Testing. >Please review and accept ASAP. > >Thank You, >Joonas Kylänpää > >[This message was auto-generated] > >--- > >Request #13147: > > submit: devel:quality/qpid-cpp(r21) -> Trunk:Testing/qpid-cpp > > >Message: > Fixes BMC#12804. Also fixes package name conflict with qt messaging >framework (qmf-* renamed to qpid-cpp-qmf-*) > >State: new 2011-02-01T03:26:43 jokylanp >Comment: None > > > >changes files: >-------------- > >spec files: >----------- >--- qpid-cpp.spec >+++ qpid-cpp.spec >@@ -36,11 +36,6 @@ > Group: System/Libraries > Requires: boost > >-Requires(post):/sbin/chkconfig >-Requires(preun):/sbin/chkconfig >-Requires(preun):/sbin/service >-Requires(postun):/sbin/service >- > %description -n %{name}-client > Run-time libraries for AMQP client applications developed using Qpid > C++. Clients exchange messages with an AMQP message broker using >@@ -183,42 +178,42 @@ > %postun -n %{name}-server-devel > /sbin/ldconfig > >-# === Package: qmf === >+# === Package: qpid-cpp-qmf === > >-%package -n qmf >+%package -n qpid-cpp-qmf > Summary: The QPID Management Framework > Group: System/Daemons > Requires: %{name}-client >= %{version} > >-%description -n qmf >+%description -n qpid-cpp-qmf > An extensible management framework layered on QPID messaging. > >-%files -n qmf >+%files -n qpid-cpp-qmf > %defattr(-,root,root,-) > %_libdir/libqmf.so.* > %_libdir/libqmf2.so.* > %_libdir/libqmfengine.so.* > %_libdir/libqmfconsole.so.* > >-%post -n qmf >+%post -n qpid-cpp-qmf > /sbin/ldconfig > >-%postun -n qmf >+%postun -n qpid-cpp-qmf > /sbin/ldconfig > >-# === Package: qmf-devel === >+# === Package: qpid-cpp-qmf-devel === > >-%package -n qmf-devel >+%package -n qpid-cpp-qmf-devel > Summary: Header files and tools for developing QMF extensions > Group: Development/System >-Requires: qmf >= %{version} >+Requires: qpid-cpp-qmf >= %{version} > Requires: %{name}-client-devel = %version-%release > >-%description -n qmf-devel >+%description -n qpid-cpp-qmf-devel > Header files and code-generation tools needed for developers of >QMF-managed > components. > >-%files -n qmf-devel >+%files -n qpid-cpp-qmf-devel > %defattr(-,root,root,-) > %_libdir/libqmf.so > %_libdir/libqmf2.so >@@ -227,10 +222,10 @@ > %_bindir/qmf-gen > %{python_sitelib}/qmfgen > >-%post -n qmf-devel >+%post -n qpid-cpp-qmf-devel > /sbin/ldconfig > >-%postun -n qmf-devel >+%postun -n qpid-cpp-qmf-devel > /sbin/ldconfig > > # === Package: qpid-cpp-examples === > >dsc files: >---------- > >other changes: >-------------- > >++++++ debian.tar.gz >--- control >+++ control >@@ -23,7 +23,7 @@ > . > This package contains the AMQP client support. > >-Package: qmf >+Package: qpid-cpp-qmf > Architecture: any > Depends: ${shlibs:Depends}, ${misc:Depends} > Description: Apache qpid AMQP libraries >@@ -32,10 +32,10 @@ > . > This package contains the AMQP libraries. > >-Package: qmf-dev >+Package: qpid-cpp-qmf-dev > Architecture: any > Section: libdevel >-Depends: ${shlibs:Depends}, ${misc:Depends}, qmf >+Depends: ${shlibs:Depends}, ${misc:Depends}, qpid-cpp-qmf > Description: Apache qpid AMQP development files > Qpid/C++ is a C++ implementation of the AMQP protocol described at > http://amqp.org/ >--- qmf-dev.dirs >+++ qmf-dev.dirs >(renamed to qpid-cpp-qmf-dev.dirs) >--- qmf-dev.install >+++ qmf-dev.install >(renamed to qpid-cpp-qmf-dev.install) >--- qmf.install >+++ qmf.install >(renamed to qpid-cpp-qmf.install) >--- qpid-cpp-qmf-dev.dirs >+++ qpid-cpp-qmf-dev.dirs >(renamed from qmf-dev.dirs) >--- qpid-cpp-qmf-dev.install >+++ qpid-cpp-qmf-dev.install >(renamed from qmf-dev.install) >--- qpid-cpp-qmf.install >+++ qpid-cpp-qmf.install >(renamed from qmf.install) > >++++++ qpid-cpp-xUbuntu_10.10.control >--- qpid-cpp-xUbuntu_10.10.control >+++ qpid-cpp-xUbuntu_10.10.control >@@ -23,7 +23,7 @@ > . > This package contains the AMQP client support. > >-Package: qmf >+Package: qpid-cpp-qmf > Architecture: any > Depends: ${shlibs:Depends}, ${misc:Depends} > Description: Apache qpid AMQP libraries >@@ -32,10 +32,10 @@ > . > This package contains the AMQP libraries. > >-Package: qmf-dev >+Package: qpid-cpp-dev > Architecture: any > Section: libdevel >-Depends: ${shlibs:Depends}, ${misc:Depends}, qmf >+Depends: ${shlibs:Depends}, ${misc:Depends}, qpid-cpp-qmf > Description: Apache qpid AMQP development files > Qpid/C++ is a C++ implementation of the AMQP protocol described at > http://amqp.org/ > >_______________________________________________ >MeeGo-commits mailing list >[email protected] >http://lists.meego.com/listinfo/meego-commits _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
