diff -Nru dbus-c++-0.9.0/debian/changelog dbus-c++-0.9.0/debian/changelog --- dbus-c++-0.9.0/debian/changelog 2012-05-31 15:30:24.000000000 +0530 +++ dbus-c++-0.9.0/debian/changelog 2012-07-01 07:23:22.000000000 +0530 @@ -1,3 +1,10 @@ +dbus-c++ (0.9.0-6ubuntu1) quantal; urgency=low + + * Merge from Debian Unstable (LP: #1019702). Remaining Changes: + - Disable ecore integration for now, as ecore isn't in Ubuntu main. + + -- Vibhav Pant Sun, 01 Jul 2012 07:20:43 +0530 + dbus-c++ (0.9.0-6) unstable; urgency=low * Add Breaks/Replaces relation against libdbus-c++-dev on libdbus-c++-bin. @@ -7,6 +14,13 @@ -- Vincent Cheng Thu, 31 May 2012 01:24:21 -0700 +dbus-c++ (0.9.0-5ubuntu1) quantal; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Disable ecore integration for now, as ecore isn't in Ubuntu main. + + -- Mathieu Trudel-Lapierre Wed, 30 May 2012 15:08:58 -0400 + dbus-c++ (0.9.0-5) unstable; urgency=low * Add libdbus-c++-bin as a dependency for libdbus-c++-dev (refer to #674311 @@ -34,6 +48,13 @@ * Update Standards version from 3.9.2 to 3.9.3 (no changes needed). -- Vincent Cheng Tue, 08 May 2012 10:59:35 -0700 + +dbus-c++ (0.9.0-2.1ubuntu1) precise; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Disable ecore integration for now, as ecore isn't in Ubuntu main. + + -- Colin Watson Tue, 03 Apr 2012 14:34:32 +0100 dbus-c++ (0.9.0-2.1) unstable; urgency=high @@ -45,6 +66,14 @@ * Set urgency to “high” for the RC bug fix. -- Cyril Brulebois Sat, 03 Mar 2012 14:32:38 +0000 + +dbus-c++ (0.9.0-2ubuntu1) precise; urgency=low + + * Disable ecore integration for now, as ecore isn't in Ubuntu main. If we + actually need this later then we'll need to either promote ecore and + friends to main or demote dbus-c++ to universe. + + -- Colin Watson Tue, 03 Jan 2012 12:15:36 +0000 dbus-c++ (0.9.0-2) unstable; urgency=low diff -Nru dbus-c++-0.9.0/debian/control dbus-c++-0.9.0/debian/control --- dbus-c++-0.9.0/debian/control 2012-05-31 14:06:24.000000000 +0530 +++ dbus-c++-0.9.0/debian/control 2012-07-01 07:18:36.000000000 +0530 @@ -11,7 +11,6 @@ dpkg-dev (>= 1.16.1), graphviz, libdbus-1-dev (>= 0.60), - libecore-dev, libexpat1-dev, libglib2.0-dev, libgtkmm-2.4-dev, diff -Nru dbus-c++-0.9.0/debian/rules dbus-c++-0.9.0/debian/rules --- dbus-c++-0.9.0/debian/rules 2012-05-04 05:23:22.000000000 +0530 +++ dbus-c++-0.9.0/debian/rules 2012-07-01 07:19:07.000000000 +0530 @@ -8,7 +8,7 @@ dh $@ --with autoreconf override_dh_auto_configure: - dh_auto_configure -- --enable-glib --enable-ecore \ + dh_auto_configure -- --enable-glib --disable-ecore \ --enable-doxygen-docs override_dh_install: