[Pkg-utopia-commits] r387 - packages/experimental/dbus/debian

[Sjoerd Simons]

Author: sjoerd
Date: 2005-12-04 15:37:00 +0000 (Sun, 04 Dec 2005)
New Revision: 387

Modified:
   packages/experimental/dbus/debian/control
   packages/experimental/dbus/debian/rules
Log:
Enable both qt3 and qt4 bindings

Modified: packages/experimental/dbus/debian/control
===================================================================
--- packages/experimental/dbus/debian/control	2005-12-04 14:21:37 UTC (rev 386)
+++ packages/experimental/dbus/debian/control	2005-12-04 15:37:00 UTC (rev 387)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: D-Bus Maintenance Team <debian-dbus at fooishbar.org>
 Uploaders: Daniel Stone <daniels at debian.org>, Daniel Silverstone <dsilvers at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: cdbs (>= 0.4.5.1), debhelper (>= 4.1.46), libglib2.0-dev, libexpat-dev, doxygen, docbook-utils, python2.4, libgtk2.0-dev, python-pyrex (>= 0.9.2.1-3), xmlto, python2.4-dev, libqt3-mt-dev, libmono-dev [i386 powerpc amd64], mono-mcs [i386 powerpc amd64], mono-gac [i386 powerpc amd64], monodoc [i386 powerpc amd64], libgtk-cil [i386 powerpc amd64], cli-common (>= 0.1.3) [i386 powerpc amd64]
+Build-Depends: cdbs (>= 0.4.5.1), debhelper (>= 4.1.46), libglib2.0-dev, libexpat-dev, doxygen, docbook-utils, python2.4, libgtk2.0-dev, python-pyrex (>= 0.9.2.1-3), xmlto, python2.4-dev, libqt3-mt-dev, libqt4-dev, libmono-dev [i386 powerpc amd64], mono-mcs [i386 powerpc amd64], mono-gac [i386 powerpc amd64], monodoc [i386 powerpc amd64], libgtk-cil [i386 powerpc amd64], cli-common (>= 0.1.3) [i386 powerpc amd64]
 Standards-Version: 3.6.1.0
 
 Package: dbus
@@ -125,7 +125,7 @@
 Package: libdbus-qt-1-dev
 Section: libdevel
 Architecture: any
-Depends: libdbus-qt-1-2 (= ${Source-Version}), libdbus-1-dev (= ${Source-Version}), libqt3-mt-dev 
+Depends: libdbus-qt-1-1c2 (= ${Source-Version}), libdbus-1-dev (= ${Source-Version}), libqt3-mt-dev 
 Conflicts: dbus-qt-1-dev
 Replaces: dbus-qt-1-dev
 Description: simple interprocess messaging system (Qt interface)
@@ -137,10 +137,12 @@
  .
  See the dbus description for more information about D-BUS in general.
 
-Package: libdbus-qt-1-2
+Package: libdbus-qt-1-1c2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
+Conflicts: dbus-qt-1, dbus-qt-1c2, libdbus-qt-1-1
+Replaces: dbus-qt-1, dbus-qt-1c2, libdbus-qt-1-1
 Description: simple interprocess messaging system (Qt-based shared library)
  D-BUS is a message bus, used for sending messages between applications.
  Conceptually, it fits somewhere in between raw sockets and CORBA in
@@ -151,6 +153,33 @@
  .
  See the dbus description for more information about D-BUS in general.
 
+Package: libdbus-qt4-1-dev
+Section: libdevel
+Architecture: any
+Depends: libdbus-qt4-1-1 (= ${Source-Version}), libdbus-1-dev (= ${Source-Version}), libqt4-dev 
+Description: simple interprocess messaging system (Qt4 interface)
+ D-BUS is a message bus, used for sending messages between applications.
+ Conceptually, it fits somewhere in between raw sockets and CORBA in
+ terms of complexity.
+ .
+ This package provides a Qt4-style interface to D-BUS.
+ .
+ See the dbus description for more information about D-BUS in general.
+
+Package: libdbus-qt4-1-1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: simple interprocess messaging system (Qt4-based shared library)
+ D-BUS is a message bus, used for sending messages between applications.
+ Conceptually, it fits somewhere in between raw sockets and CORBA in
+ terms of complexity.
+ .
+ This package provides the Qt4-based shared library for applications using the
+ Qt4 interface to D-BUS.
+ .
+ See the dbus description for more information about D-BUS in general.
+
 Package: python2.4-dbus
 Section: python
 Architecture: any

Modified: packages/experimental/dbus/debian/rules
===================================================================
--- packages/experimental/dbus/debian/rules	2005-12-04 14:21:37 UTC (rev 386)
+++ packages/experimental/dbus/debian/rules	2005-12-04 15:37:00 UTC (rev 387)
@@ -26,10 +26,11 @@
 
 
 DEB_CONFIGURE_SCRIPT_ENV += PYTHON=/usr/bin/python2.4
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-glib --enable-qt --enable-gtk \
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-glib --enable-gtk \
+                             --enable-qt3 --enable-qt \
                              --enable-python --with-xml=expat --enable-docs \
-														 --enable-xml-docs --enable-doxygen-docs \
-														 $(MONO_FLAGS)
+                             --enable-xml-docs --enable-doxygen-docs \
+                             $(MONO_FLAGS)
 
 DEB_SHLIBDEPS_INCLUDE_libdbus-glib-1-1 := debian/libdbus-1-1/usr/lib/
 DEB_SHLIBDEPS_INCLUDE_dbus-1-utils := debian/libdbus-1-1/usr/lib/ debian/dbus-glib-1-1/usr/lib/