From 0d6b61d67b331fd86cf489d4beceee39c0e9e60e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 26 Apr 2011 08:52:48 -0500 Subject: debian/control, debian/*: Renaming packages for library version bump from 3 to 4. --- debian/libdbusmenu-jsonloader4.install | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/libdbusmenu-jsonloader4.install (limited to 'debian/libdbusmenu-jsonloader4.install') diff --git a/debian/libdbusmenu-jsonloader4.install b/debian/libdbusmenu-jsonloader4.install new file mode 100644 index 0000000..bff47f5 --- /dev/null +++ b/debian/libdbusmenu-jsonloader4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-jsonloader.so.* -- cgit v1.2.3 From 4a1791ecf45589924462e444a1a44a7770003c21 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 24 Jun 2011 15:58:51 -0400 Subject: releasing version 0.4.90-0ubuntu1 --- debian/changelog | 19 +++- debian/control | 6 +- debian/gir1.2-dbusmenu-glib-0.4.install | 2 +- debian/gir1.2-dbusmenu-gtk-0.4.install | 2 +- debian/gir1.2-dbusmenu-gtk3-0.4.install | 2 +- debian/libdbusmenu-glib-dev.install | 12 +-- debian/libdbusmenu-glib-doc.install | 2 +- debian/libdbusmenu-glib4.install | 2 +- debian/libdbusmenu-glib4.symbols | 63 +------------ debian/libdbusmenu-gtk-dev.install | 12 +-- debian/libdbusmenu-gtk-doc.install | 2 +- debian/libdbusmenu-gtk3-3.symbols | 141 ------------------------------ debian/libdbusmenu-gtk3-4.install | 2 +- debian/libdbusmenu-gtk3-4.symbols | 25 ++++++ debian/libdbusmenu-gtk3-dev.install | 12 +-- debian/libdbusmenu-gtk4.install | 2 +- debian/libdbusmenu-gtk4.symbols | 118 +------------------------ debian/libdbusmenu-jsonloader-dev.install | 8 +- debian/libdbusmenu-jsonloader4.install | 2 +- debian/libdbusmenu-jsonloader4.symbols | 3 + debian/libdbusmenu-tools.install | 6 +- debian/rules | 45 +++------- 22 files changed, 99 insertions(+), 389 deletions(-) delete mode 100644 debian/libdbusmenu-gtk3-3.symbols create mode 100644 debian/libdbusmenu-gtk3-4.symbols create mode 100644 debian/libdbusmenu-jsonloader4.symbols (limited to 'debian/libdbusmenu-jsonloader4.install') diff --git a/debian/changelog b/debian/changelog index fb49c3a..27cf7ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -libdbusmenu (0.4.90-0ubuntu1~ppa1) oneiric; urgency=low +libdbusmenu (0.4.90-0ubuntu1) oneiric; urgency=low + [ Ted Gould ] * debian/control, debian/*: Renaming packages for library version bump from 3 to 4. * New upstream release. @@ -10,7 +11,21 @@ libdbusmenu (0.4.90-0ubuntu1~ppa1) oneiric; urgency=low * Removing the SerializableMenuitem object * debian/rules: Making GTK2 the special build - -- Ted Gould Mon, 20 Jun 2011 17:00:12 -0500 + [ Ken VanDine ] + * +debian/libdbusmenu-jsonloader4.symbols + * debian/*.symbols + - Fixed sonames and removed all the duplicate symbols + * debian/*.install, debian/rules + - Use cdbs to do the dual builds for gtk2/gtk3 + * debian/control + - Updated standards version to 3.9.2 + - Set version on the json-glib build depends to >= 0.13.4 + - Make gir1.2-dbusmenu-glib-0.4 break gir1.2-unity-3.0 and + gir1.2-indicate-0.5 built against older versions of dbusmenu to + prevent breakage in python apps that use gir loading multiple versions + of dbusmenu-glib + + -- Ken VanDine Fri, 24 Jun 2011 14:55:59 -0400 libdbusmenu (0.4.4-0ubuntu1~ppa1) natty; urgency=low diff --git a/debian/control b/debian/control index da0842d..85a8715 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 5.0), gtk-doc-tools, libtool, intltool, - libjson-glib-dev, + libjson-glib-dev (>= 0.13.4), gobject-introspection, libgirepository1.0-dev (>= 0.9.3), gir1.2-glib-2.0, @@ -24,7 +24,7 @@ Build-Depends: debhelper (>= 5.0), libx11-dev (>= 1.3), dh-autoreconf, valac-0.12 -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: https://launchpad.net/dbusmenu Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu @@ -108,6 +108,8 @@ Architecture: any Depends: ${misc:Depends}, libdbusmenu-glib4 (= ${binary:Version}), ${gir:Depends} +Breaks: gir1.2-unity-3.0 (<< 3.8.4-0ubuntu2), + gir1.2-indicate-0.5 (<< 0.5.0-0ubuntu4) Description: typelib file for libdbusmenu-glib4 libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the diff --git a/debian/gir1.2-dbusmenu-glib-0.4.install b/debian/gir1.2-dbusmenu-glib-0.4.install index 20751be..a9808fc 100644 --- a/debian/gir1.2-dbusmenu-glib-0.4.install +++ b/debian/gir1.2-dbusmenu-glib-0.4.install @@ -1 +1 @@ -debian/tmp/usr/lib/girepository-1.0/Dbusmenu-0.4.typelib +debian/tmp/gtk3/usr/lib/girepository-1.0/Dbusmenu-0.4.typelib /usr/lib/girepository-1.0/ diff --git a/debian/gir1.2-dbusmenu-gtk-0.4.install b/debian/gir1.2-dbusmenu-gtk-0.4.install index 16bad97..3493751 100644 --- a/debian/gir1.2-dbusmenu-gtk-0.4.install +++ b/debian/gir1.2-dbusmenu-gtk-0.4.install @@ -1 +1 @@ -debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.4.typelib +debian/tmp/gtk2/usr/lib/girepository-1.0/DbusmenuGtk-0.4.typelib /usr/lib/girepository-1.0/ diff --git a/debian/gir1.2-dbusmenu-gtk3-0.4.install b/debian/gir1.2-dbusmenu-gtk3-0.4.install index abf6fab..64a74b6 100644 --- a/debian/gir1.2-dbusmenu-gtk3-0.4.install +++ b/debian/gir1.2-dbusmenu-gtk3-0.4.install @@ -1 +1 @@ -debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.4.typelib +debian/tmp/gtk3/usr/lib/girepository-1.0/DbusmenuGtk3-0.4.typelib /usr/lib/girepository-1.0/ diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install index f8e0345..197e9de 100644 --- a/debian/libdbusmenu-glib-dev.install +++ b/debian/libdbusmenu-glib-dev.install @@ -1,6 +1,6 @@ -debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-glib/* -debian/tmp/usr/lib/pkgconfig/dbusmenu-glib-0.4.pc -debian/tmp/usr/lib/libdbusmenu-glib.a -debian/tmp/usr/lib/libdbusmenu-glib.so -debian/tmp/usr/share/gir-1.0/Dbusmenu-0.4.gir -debian/tmp/usr/share/vala/vapi/Dbusmenu-0.4.vapi +debian/tmp/gtk3/usr/include/libdbusmenu-0.4/libdbusmenu-glib /usr/include/libdbusmenu-0.4/ +debian/tmp/gtk3/usr/lib/pkgconfig/dbusmenu-glib-0.4.pc /usr/lib/pkgconfig/ +debian/tmp/gtk3/usr/lib/libdbusmenu-glib.a /usr/lib/ +debian/tmp/gtk3/usr/lib/libdbusmenu-glib.so /usr/lib/ +debian/tmp/gtk3/usr/share/gir-1.0/Dbusmenu-0.4.gir /usr/share/gir-1.0/ +debian/tmp/gtk3/usr/share/vala/vapi/Dbusmenu-0.4.vapi /usr/share/vala/vapi/ diff --git a/debian/libdbusmenu-glib-doc.install b/debian/libdbusmenu-glib-doc.install index 2fde7f6..ec8274e 100644 --- a/debian/libdbusmenu-glib-doc.install +++ b/debian/libdbusmenu-glib-doc.install @@ -1 +1 @@ -debian/tmp//usr/share/gtk-doc/html/libdbusmenu-glib/* +debian/tmp/gtk3/usr/share/gtk-doc/html/libdbusmenu-glib /usr/share/gtk-doc/html/ diff --git a/debian/libdbusmenu-glib4.install b/debian/libdbusmenu-glib4.install index acdbacf..a98765c 100644 --- a/debian/libdbusmenu-glib4.install +++ b/debian/libdbusmenu-glib4.install @@ -1 +1 @@ -debian/tmp/usr/lib/libdbusmenu-glib.so.* +debian/tmp/gtk3/usr/lib/libdbusmenu-glib.so.* /usr/lib/ diff --git a/debian/libdbusmenu-glib4.symbols b/debian/libdbusmenu-glib4.symbols index 5cac25d..0e0dcb4 100644 --- a/debian/libdbusmenu-glib4.symbols +++ b/debian/libdbusmenu-glib4.symbols @@ -1,4 +1,4 @@ -libdbusmenu-glib.so.3 libdbusmenu-glib3 #MINVER# +libdbusmenu-glib.so.4 libdbusmenu-glib4 #MINVER# dbus_menu_clean_xml@Base 0.4.2 dbusmenu_client_add_type_handler@Base 0.4.2 dbusmenu_client_add_type_handler_full@Base 0.4.2 @@ -78,64 +78,3 @@ libdbusmenu-glib.so.3 libdbusmenu-glib3 #MINVER# dbusmenu_text_direction_get_type@Base 0.4.2 dbusmenu_text_direction_get_value_from_nick@Base 0.4.2 session_bus_cb@Base 0.4.2 -libdbusmenu-gtk.so.3 libdbusmenu-glib3 #MINVER# - dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 - dbusmenu_gtk_parse_menu_structure@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2 - dbusmenu_gtkclient_get_accel_group@Base 0.4.2 - dbusmenu_gtkclient_get_type@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 - dbusmenu_gtkclient_new@Base 0.4.2 - dbusmenu_gtkclient_newitem_base@Base 0.4.2 - dbusmenu_gtkclient_set_accel_group@Base 0.4.2 - dbusmenu_gtkmenu_get_client@Base 0.4.2 - dbusmenu_gtkmenu_get_type@Base 0.4.2 - dbusmenu_gtkmenu_new@Base 0.4.2 - dbusmenu_menuitem_property_get_image@Base 0.4.2 - dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_image@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 - genericmenuitem_get_image@Base 0.4.2 - genericmenuitem_get_type@Base 0.4.2 - genericmenuitem_set_check_type@Base 0.4.2 - genericmenuitem_set_image@Base 0.4.2 - genericmenuitem_set_state@Base 0.4.2 - theme_dir_db@Base 0.4.2 -libdbusmenu-gtk3.so.3 libdbusmenu-glib3 #MINVER# - dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 - dbusmenu_gtk_parse_menu_structure@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2 - dbusmenu_gtkclient_get_accel_group@Base 0.4.2 - dbusmenu_gtkclient_get_type@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 - dbusmenu_gtkclient_new@Base 0.4.2 - dbusmenu_gtkclient_newitem_base@Base 0.4.2 - dbusmenu_gtkclient_set_accel_group@Base 0.4.2 - dbusmenu_gtkmenu_get_client@Base 0.4.2 - dbusmenu_gtkmenu_get_type@Base 0.4.2 - dbusmenu_gtkmenu_new@Base 0.4.2 - dbusmenu_menuitem_property_get_image@Base 0.4.2 - dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_image@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 - genericmenuitem_get_image@Base 0.4.2 - genericmenuitem_get_type@Base 0.4.2 - genericmenuitem_set_check_type@Base 0.4.2 - genericmenuitem_set_image@Base 0.4.2 - genericmenuitem_set_state@Base 0.4.2 - theme_dir_db@Base 0.4.2 -libdbusmenu-jsonloader.so.3 libdbusmenu-glib3 #MINVER# - dbusmenu_json_build_from_file@Base 0.4.2 - dbusmenu_json_build_from_node@Base 0.4.2 diff --git a/debian/libdbusmenu-gtk-dev.install b/debian/libdbusmenu-gtk-dev.install index 0ce2419..2e5dc02 100644 --- a/debian/libdbusmenu-gtk-dev.install +++ b/debian/libdbusmenu-gtk-dev.install @@ -1,6 +1,6 @@ -debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-gtk/* -debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk-0.4.pc -debian/tmp/usr/lib/libdbusmenu-gtk.a -debian/tmp/usr/lib/libdbusmenu-gtk.so -debian/tmp/usr/share/gir-1.0/DbusmenuGtk-0.4.gir -debian/tmp/usr/share/vala/vapi/DbusmenuGtk-0.4.vapi +debian/tmp/gtk2/usr/include/libdbusmenu-0.4/libdbusmenu-gtk /usr/include/libdbusmenu-0.4/ +debian/tmp/gtk2/usr/lib/pkgconfig/dbusmenu-gtk-0.4.pc /usr/lib/pkgconfig/ +debian/tmp/gtk2/usr/lib/libdbusmenu-gtk.a /usr/lib/ +debian/tmp/gtk2/usr/lib/libdbusmenu-gtk.so /usr/lib/ +debian/tmp/gtk2/usr/share/gir-1.0/DbusmenuGtk-0.4.gir /usr/share/gir-1.0/ +debian/tmp/gtk2/usr/share/vala/vapi/DbusmenuGtk-0.4.vapi /usr/share/vala/vapi/ diff --git a/debian/libdbusmenu-gtk-doc.install b/debian/libdbusmenu-gtk-doc.install index e349aaa..b7dae35 100644 --- a/debian/libdbusmenu-gtk-doc.install +++ b/debian/libdbusmenu-gtk-doc.install @@ -1 +1 @@ -debian/tmp//usr/share/gtk-doc/html/libdbusmenu-gtk/* +debian/tmp/gtk2/usr/share/gtk-doc/html/libdbusmenu-gtk /usr/share/gtk-doc/html/ diff --git a/debian/libdbusmenu-gtk3-3.symbols b/debian/libdbusmenu-gtk3-3.symbols deleted file mode 100644 index 3e44390..0000000 --- a/debian/libdbusmenu-gtk3-3.symbols +++ /dev/null @@ -1,141 +0,0 @@ -libdbusmenu-glib.so.3 libdbusmenu-gtk3-3 #MINVER# - dbus_menu_clean_xml@Base 0.4.2 - dbusmenu_client_add_type_handler@Base 0.4.2 - dbusmenu_client_add_type_handler_full@Base 0.4.2 - dbusmenu_client_get_icon_paths@Base 0.4.2 - dbusmenu_client_get_root@Base 0.4.2 - dbusmenu_client_get_status@Base 0.4.2 - dbusmenu_client_get_text_direction@Base 0.4.2 - dbusmenu_client_get_type@Base 0.4.2 - dbusmenu_client_menuitem_get_type@Base 0.4.2 - dbusmenu_client_menuitem_new@Base 0.4.2 - dbusmenu_client_new@Base 0.4.2 - dbusmenu_client_send_about_to_show@Base 0.4.2 - dbusmenu_client_send_event@Base 0.4.2 - dbusmenu_defaults_default_get@Base 0.4.2 - dbusmenu_defaults_default_get_type@Base 0.4.2 - dbusmenu_defaults_default_set@Base 0.4.2 - dbusmenu_defaults_get_type@Base 0.4.2 - dbusmenu_defaults_ref_default@Base 0.4.2 - dbusmenu_menuitem_build_variant@Base 0.4.2 - dbusmenu_menuitem_child_add_position@Base 0.4.2 - dbusmenu_menuitem_child_append@Base 0.4.2 - dbusmenu_menuitem_child_delete@Base 0.4.2 - dbusmenu_menuitem_child_find@Base 0.4.2 - dbusmenu_menuitem_child_prepend@Base 0.4.2 - dbusmenu_menuitem_child_reorder@Base 0.4.2 - dbusmenu_menuitem_exposed@Base 0.4.2 - dbusmenu_menuitem_find_id@Base 0.4.2 - dbusmenu_menuitem_foreach@Base 0.4.2 - dbusmenu_menuitem_get_children@Base 0.4.2 - dbusmenu_menuitem_get_id@Base 0.4.2 - dbusmenu_menuitem_get_parent@Base 0.4.2 - dbusmenu_menuitem_get_position@Base 0.4.2 - dbusmenu_menuitem_get_position_realized@Base 0.4.2 - dbusmenu_menuitem_get_root@Base 0.4.2 - dbusmenu_menuitem_get_type@Base 0.4.2 - dbusmenu_menuitem_handle_event@Base 0.4.2 - dbusmenu_menuitem_new@Base 0.4.2 - dbusmenu_menuitem_new_with_id@Base 0.4.2 - dbusmenu_menuitem_properties_copy@Base 0.4.2 - dbusmenu_menuitem_properties_list@Base 0.4.2 - dbusmenu_menuitem_properties_variant@Base 0.4.2 - dbusmenu_menuitem_property_exist@Base 0.4.2 - dbusmenu_menuitem_property_get@Base 0.4.2 - dbusmenu_menuitem_property_get_bool@Base 0.4.2 - dbusmenu_menuitem_property_get_int@Base 0.4.2 - dbusmenu_menuitem_property_get_variant@Base 0.4.2 - dbusmenu_menuitem_property_is_default@Base 0.4.2 - dbusmenu_menuitem_property_remove@Base 0.4.2 - dbusmenu_menuitem_property_set@Base 0.4.2 - dbusmenu_menuitem_property_set_bool@Base 0.4.2 - dbusmenu_menuitem_property_set_int@Base 0.4.2 - dbusmenu_menuitem_property_set_variant@Base 0.4.2 - dbusmenu_menuitem_proxy_get_type@Base 0.4.2 - dbusmenu_menuitem_proxy_get_wrapped@Base 0.4.2 - dbusmenu_menuitem_proxy_new@Base 0.4.2 - dbusmenu_menuitem_realized@Base 0.4.2 - dbusmenu_menuitem_send_about_to_show@Base 0.4.2 - dbusmenu_menuitem_set_parent@Base 0.4.2 - dbusmenu_menuitem_set_realized@Base 0.4.2 - dbusmenu_menuitem_set_root@Base 0.4.2 - dbusmenu_menuitem_show_to_user@Base 0.4.2 - dbusmenu_menuitem_take_children@Base 0.4.2 - dbusmenu_menuitem_unparent@Base 0.4.2 - dbusmenu_server_get_icon_paths@Base 0.4.2 - dbusmenu_server_get_status@Base 0.4.2 - dbusmenu_server_get_text_direction@Base 0.4.2 - dbusmenu_server_get_type@Base 0.4.2 - dbusmenu_server_new@Base 0.4.2 - dbusmenu_server_set_icon_paths@Base 0.4.2 - dbusmenu_server_set_root@Base 0.4.2 - dbusmenu_server_set_status@Base 0.4.2 - dbusmenu_server_set_text_direction@Base 0.4.2 - dbusmenu_status_get_nick@Base 0.4.2 - dbusmenu_status_get_type@Base 0.4.2 - dbusmenu_status_get_value_from_nick@Base 0.4.2 - dbusmenu_text_direction_get_nick@Base 0.4.2 - dbusmenu_text_direction_get_type@Base 0.4.2 - dbusmenu_text_direction_get_value_from_nick@Base 0.4.2 - session_bus_cb@Base 0.4.2 -libdbusmenu-gtk.so.3 libdbusmenu-gtk3-3 #MINVER# - dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 - dbusmenu_gtk_parse_menu_structure@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2 - dbusmenu_gtkclient_get_accel_group@Base 0.4.2 - dbusmenu_gtkclient_get_type@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 - dbusmenu_gtkclient_new@Base 0.4.2 - dbusmenu_gtkclient_newitem_base@Base 0.4.2 - dbusmenu_gtkclient_set_accel_group@Base 0.4.2 - dbusmenu_gtkmenu_get_client@Base 0.4.2 - dbusmenu_gtkmenu_get_type@Base 0.4.2 - dbusmenu_gtkmenu_new@Base 0.4.2 - dbusmenu_menuitem_property_get_image@Base 0.4.2 - dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_image@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 - genericmenuitem_get_image@Base 0.4.2 - genericmenuitem_get_type@Base 0.4.2 - genericmenuitem_set_check_type@Base 0.4.2 - genericmenuitem_set_image@Base 0.4.2 - genericmenuitem_set_state@Base 0.4.2 - theme_dir_db@Base 0.4.2 -libdbusmenu-gtk3.so.3 libdbusmenu-gtk3-3 #MINVER# - dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 - dbusmenu_gtk_parse_menu_structure@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2 - dbusmenu_gtkclient_get_accel_group@Base 0.4.2 - dbusmenu_gtkclient_get_type@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 - dbusmenu_gtkclient_new@Base 0.4.2 - dbusmenu_gtkclient_newitem_base@Base 0.4.2 - dbusmenu_gtkclient_set_accel_group@Base 0.4.2 - dbusmenu_gtkmenu_get_client@Base 0.4.2 - dbusmenu_gtkmenu_get_type@Base 0.4.2 - dbusmenu_gtkmenu_new@Base 0.4.2 - dbusmenu_menuitem_property_get_image@Base 0.4.2 - dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_image@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 - genericmenuitem_get_image@Base 0.4.2 - genericmenuitem_get_type@Base 0.4.2 - genericmenuitem_set_check_type@Base 0.4.2 - genericmenuitem_set_image@Base 0.4.2 - genericmenuitem_set_state@Base 0.4.2 - theme_dir_db@Base 0.4.2 -libdbusmenu-jsonloader.so.3 libdbusmenu-gtk3-3 #MINVER# - dbusmenu_json_build_from_file@Base 0.4.2 - dbusmenu_json_build_from_node@Base 0.4.2 diff --git a/debian/libdbusmenu-gtk3-4.install b/debian/libdbusmenu-gtk3-4.install index af2e9a3..2bf1f59 100644 --- a/debian/libdbusmenu-gtk3-4.install +++ b/debian/libdbusmenu-gtk3-4.install @@ -1 +1 @@ -debian/tmp/usr/lib/libdbusmenu-gtk3.so.* +debian/tmp/gtk3/usr/lib/libdbusmenu-gtk3.so.* /usr/lib/ diff --git a/debian/libdbusmenu-gtk3-4.symbols b/debian/libdbusmenu-gtk3-4.symbols new file mode 100644 index 0000000..1988a84 --- /dev/null +++ b/debian/libdbusmenu-gtk3-4.symbols @@ -0,0 +1,25 @@ +libdbusmenu-gtk3.so.4 libdbusmenu-gtk3-4 #MINVER# + dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 + dbusmenu_gtk_parse_menu_structure@Base 0.4.2 + dbusmenu_gtkclient_get_accel_group@Base 0.4.2 + dbusmenu_gtkclient_get_type@Base 0.4.2 + dbusmenu_gtkclient_menuitem_get@Base 0.4.2 + dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 + dbusmenu_gtkclient_new@Base 0.4.2 + dbusmenu_gtkclient_newitem_base@Base 0.4.2 + dbusmenu_gtkclient_set_accel_group@Base 0.4.2 + dbusmenu_gtkmenu_get_client@Base 0.4.2 + dbusmenu_gtkmenu_get_type@Base 0.4.2 + dbusmenu_gtkmenu_new@Base 0.4.2 + dbusmenu_menuitem_property_get_image@Base 0.4.2 + dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 + dbusmenu_menuitem_property_set_image@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 + genericmenuitem_get_image@Base 0.4.2 + genericmenuitem_get_type@Base 0.4.2 + genericmenuitem_set_check_type@Base 0.4.2 + genericmenuitem_set_image@Base 0.4.2 + genericmenuitem_set_state@Base 0.4.2 + theme_dir_db@Base 0.4.2 diff --git a/debian/libdbusmenu-gtk3-dev.install b/debian/libdbusmenu-gtk3-dev.install index dcd24a3..6d3fa0b 100644 --- a/debian/libdbusmenu-gtk3-dev.install +++ b/debian/libdbusmenu-gtk3-dev.install @@ -1,6 +1,6 @@ -debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-gtk3/* -debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk3-0.4.pc -debian/tmp/usr/lib/libdbusmenu-gtk3.a -debian/tmp/usr/lib/libdbusmenu-gtk3.so -debian/tmp/usr/share/gir-1.0/DbusmenuGtk3-0.4.gir -debian/tmp/usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi +debian/tmp/gtk3/usr/include/libdbusmenu-0.4/libdbusmenu-gtk3 /usr/include/libdbusmenu-0.4/ +debian/tmp/gtk3/usr/lib/pkgconfig/dbusmenu-gtk3-0.4.pc /usr/lib/pkgconfig/ +debian/tmp/gtk3/usr/lib/libdbusmenu-gtk3.a /usr/lib/ +debian/tmp/gtk3/usr/lib/libdbusmenu-gtk3.so /usr/lib/ +debian/tmp/gtk3/usr/share/gir-1.0/DbusmenuGtk3-0.4.gir /usr/share/gir-1.0/ +debian/tmp/gtk3/usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi /usr/share/gir-1.0/ diff --git a/debian/libdbusmenu-gtk4.install b/debian/libdbusmenu-gtk4.install index d677935..2605240 100644 --- a/debian/libdbusmenu-gtk4.install +++ b/debian/libdbusmenu-gtk4.install @@ -1 +1 @@ -debian/tmp/usr/lib/libdbusmenu-gtk.so.* +debian/tmp/gtk2/usr/lib/libdbusmenu-gtk.so.* /usr/lib/ diff --git a/debian/libdbusmenu-gtk4.symbols b/debian/libdbusmenu-gtk4.symbols index fd2d6aa..a2bc347 100644 --- a/debian/libdbusmenu-gtk4.symbols +++ b/debian/libdbusmenu-gtk4.symbols @@ -1,90 +1,6 @@ -libdbusmenu-glib.so.3 libdbusmenu-gtk3 #MINVER# - dbus_menu_clean_xml@Base 0.4.2 - dbusmenu_client_add_type_handler@Base 0.4.2 - dbusmenu_client_add_type_handler_full@Base 0.4.2 - dbusmenu_client_get_icon_paths@Base 0.4.2 - dbusmenu_client_get_root@Base 0.4.2 - dbusmenu_client_get_status@Base 0.4.2 - dbusmenu_client_get_text_direction@Base 0.4.2 - dbusmenu_client_get_type@Base 0.4.2 - dbusmenu_client_menuitem_get_type@Base 0.4.2 - dbusmenu_client_menuitem_new@Base 0.4.2 - dbusmenu_client_new@Base 0.4.2 - dbusmenu_client_send_about_to_show@Base 0.4.2 - dbusmenu_client_send_event@Base 0.4.2 - dbusmenu_defaults_default_get@Base 0.4.2 - dbusmenu_defaults_default_get_type@Base 0.4.2 - dbusmenu_defaults_default_set@Base 0.4.2 - dbusmenu_defaults_get_type@Base 0.4.2 - dbusmenu_defaults_ref_default@Base 0.4.2 - dbusmenu_menuitem_build_variant@Base 0.4.2 - dbusmenu_menuitem_child_add_position@Base 0.4.2 - dbusmenu_menuitem_child_append@Base 0.4.2 - dbusmenu_menuitem_child_delete@Base 0.4.2 - dbusmenu_menuitem_child_find@Base 0.4.2 - dbusmenu_menuitem_child_prepend@Base 0.4.2 - dbusmenu_menuitem_child_reorder@Base 0.4.2 - dbusmenu_menuitem_exposed@Base 0.4.2 - dbusmenu_menuitem_find_id@Base 0.4.2 - dbusmenu_menuitem_foreach@Base 0.4.2 - dbusmenu_menuitem_get_children@Base 0.4.2 - dbusmenu_menuitem_get_id@Base 0.4.2 - dbusmenu_menuitem_get_parent@Base 0.4.2 - dbusmenu_menuitem_get_position@Base 0.4.2 - dbusmenu_menuitem_get_position_realized@Base 0.4.2 - dbusmenu_menuitem_get_root@Base 0.4.2 - dbusmenu_menuitem_get_type@Base 0.4.2 - dbusmenu_menuitem_handle_event@Base 0.4.2 - dbusmenu_menuitem_new@Base 0.4.2 - dbusmenu_menuitem_new_with_id@Base 0.4.2 - dbusmenu_menuitem_properties_copy@Base 0.4.2 - dbusmenu_menuitem_properties_list@Base 0.4.2 - dbusmenu_menuitem_properties_variant@Base 0.4.2 - dbusmenu_menuitem_property_exist@Base 0.4.2 - dbusmenu_menuitem_property_get@Base 0.4.2 - dbusmenu_menuitem_property_get_bool@Base 0.4.2 - dbusmenu_menuitem_property_get_int@Base 0.4.2 - dbusmenu_menuitem_property_get_variant@Base 0.4.2 - dbusmenu_menuitem_property_is_default@Base 0.4.2 - dbusmenu_menuitem_property_remove@Base 0.4.2 - dbusmenu_menuitem_property_set@Base 0.4.2 - dbusmenu_menuitem_property_set_bool@Base 0.4.2 - dbusmenu_menuitem_property_set_int@Base 0.4.2 - dbusmenu_menuitem_property_set_variant@Base 0.4.2 - dbusmenu_menuitem_proxy_get_type@Base 0.4.2 - dbusmenu_menuitem_proxy_get_wrapped@Base 0.4.2 - dbusmenu_menuitem_proxy_new@Base 0.4.2 - dbusmenu_menuitem_realized@Base 0.4.2 - dbusmenu_menuitem_send_about_to_show@Base 0.4.2 - dbusmenu_menuitem_set_parent@Base 0.4.2 - dbusmenu_menuitem_set_realized@Base 0.4.2 - dbusmenu_menuitem_set_root@Base 0.4.2 - dbusmenu_menuitem_show_to_user@Base 0.4.2 - dbusmenu_menuitem_take_children@Base 0.4.2 - dbusmenu_menuitem_unparent@Base 0.4.2 - dbusmenu_server_get_icon_paths@Base 0.4.2 - dbusmenu_server_get_status@Base 0.4.2 - dbusmenu_server_get_text_direction@Base 0.4.2 - dbusmenu_server_get_type@Base 0.4.2 - dbusmenu_server_new@Base 0.4.2 - dbusmenu_server_set_icon_paths@Base 0.4.2 - dbusmenu_server_set_root@Base 0.4.2 - dbusmenu_server_set_status@Base 0.4.2 - dbusmenu_server_set_text_direction@Base 0.4.2 - dbusmenu_status_get_nick@Base 0.4.2 - dbusmenu_status_get_type@Base 0.4.2 - dbusmenu_status_get_value_from_nick@Base 0.4.2 - dbusmenu_text_direction_get_nick@Base 0.4.2 - dbusmenu_text_direction_get_type@Base 0.4.2 - dbusmenu_text_direction_get_value_from_nick@Base 0.4.2 - session_bus_cb@Base 0.4.2 -libdbusmenu-gtk.so.3 libdbusmenu-gtk3 #MINVER# +libdbusmenu-gtk.so.4 libdbusmenu-gtk4 #MINVER# dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 dbusmenu_gtk_parse_menu_structure@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2 dbusmenu_gtkclient_get_accel_group@Base 0.4.2 dbusmenu_gtkclient_get_type@Base 0.4.2 dbusmenu_gtkclient_menuitem_get@Base 0.4.2 @@ -107,35 +23,3 @@ libdbusmenu-gtk.so.3 libdbusmenu-gtk3 #MINVER# genericmenuitem_set_image@Base 0.4.2 genericmenuitem_set_state@Base 0.4.2 theme_dir_db@Base 0.4.2 -libdbusmenu-gtk3.so.3 libdbusmenu-gtk3 #MINVER# - dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 - dbusmenu_gtk_parse_menu_structure@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2 - dbusmenu_gtkclient_get_accel_group@Base 0.4.2 - dbusmenu_gtkclient_get_type@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 - dbusmenu_gtkclient_new@Base 0.4.2 - dbusmenu_gtkclient_newitem_base@Base 0.4.2 - dbusmenu_gtkclient_set_accel_group@Base 0.4.2 - dbusmenu_gtkmenu_get_client@Base 0.4.2 - dbusmenu_gtkmenu_get_type@Base 0.4.2 - dbusmenu_gtkmenu_new@Base 0.4.2 - dbusmenu_menuitem_property_get_image@Base 0.4.2 - dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_image@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 - genericmenuitem_get_image@Base 0.4.2 - genericmenuitem_get_type@Base 0.4.2 - genericmenuitem_set_check_type@Base 0.4.2 - genericmenuitem_set_image@Base 0.4.2 - genericmenuitem_set_state@Base 0.4.2 - theme_dir_db@Base 0.4.2 -libdbusmenu-jsonloader.so.3 libdbusmenu-gtk3 #MINVER# - dbusmenu_json_build_from_file@Base 0.4.2 - dbusmenu_json_build_from_node@Base 0.4.2 diff --git a/debian/libdbusmenu-jsonloader-dev.install b/debian/libdbusmenu-jsonloader-dev.install index 9594064..95902cd 100644 --- a/debian/libdbusmenu-jsonloader-dev.install +++ b/debian/libdbusmenu-jsonloader-dev.install @@ -1,4 +1,4 @@ -debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader/* -debian/tmp/usr/lib/pkgconfig/dbusmenu-jsonloader-0.4.pc -debian/tmp/usr/lib/libdbusmenu-jsonloader.a -debian/tmp/usr/lib/libdbusmenu-jsonloader.so +debian/tmp/gtk3/usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader /usr/include/libdbusmenu-0.4/ +debian/tmp/gtk3/usr/lib/pkgconfig/dbusmenu-jsonloader-0.4.pc /usr/lib/pkgconfig/ +debian/tmp/gtk3/usr/lib/libdbusmenu-jsonloader.a /usr/lib/ +debian/tmp/gtk3/usr/lib/libdbusmenu-jsonloader.so /usr/lib/ diff --git a/debian/libdbusmenu-jsonloader4.install b/debian/libdbusmenu-jsonloader4.install index bff47f5..74f887b 100644 --- a/debian/libdbusmenu-jsonloader4.install +++ b/debian/libdbusmenu-jsonloader4.install @@ -1 +1 @@ -debian/tmp/usr/lib/libdbusmenu-jsonloader.so.* +debian/tmp/gtk3/usr/lib/libdbusmenu-jsonloader.so.* /usr/lib/ diff --git a/debian/libdbusmenu-jsonloader4.symbols b/debian/libdbusmenu-jsonloader4.symbols new file mode 100644 index 0000000..38a6868 --- /dev/null +++ b/debian/libdbusmenu-jsonloader4.symbols @@ -0,0 +1,3 @@ +libdbusmenu-jsonloader.so.4 libdbusmenu-jsonloader4 #MINVER# + dbusmenu_json_build_from_file@Base 0.4.2 + dbusmenu_json_build_from_node@Base 0.4.2 diff --git a/debian/libdbusmenu-tools.install b/debian/libdbusmenu-tools.install index 4bdf013..1019dd8 100644 --- a/debian/libdbusmenu-tools.install +++ b/debian/libdbusmenu-tools.install @@ -1,3 +1,3 @@ -debian/tmp/usr/lib/libdbusmenu/dbusmenu-* -debian/tmp/usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/ -debian/tmp/usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/ +debian/tmp/gtk3/usr/lib/libdbusmenu/dbusmenu-* /usr/lib/libdbusmenu/ +debian/tmp/gtk3/usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/ +debian/tmp/gtk3/usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/ diff --git a/debian/rules b/debian/rules index 2243a71..d53875d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,42 +1,25 @@ #!/usr/bin/make -f +DEB_BUILDDIR = build +DEB_MAKE_FLAVORS = gtk2 gtk3 + include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_SRCDIR = . -DEB_BUILDDIR = $(DEB_SRCDIR)/build +DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ +DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ + +DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 +DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection + LDFLAGS += -Wl,-z,defs -Wl,--as-needed -configure/libdbusmenu-gtk4:: stamp-configure-gtk2 -stamp-configure-gtk2: - : # configure for GTK+ 2.0 - set -e; \ - rm -rf build-gtk2; \ - mkdir build-gtk2; \ - cd build-gtk2; \ - $(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=2 \ - $(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)) \ - --enable-gtk-doc=no; \ - cd ..; - touch stamp-configure-gtk2 - -build/libdbusmenu-gtk4:: stamp-build-gtk2 -stamp-build-gtk2: stamp-configure-gtk2 - : # build for GTK+ 2.0 - $(MAKE) -C build-gtk2; - touch stamp-build-gtk2 - -common-install-prehook-arch:: stamp-build-gtk2 - : # install for GTK+ 2.0 - $(MAKE) -C build-gtk2 DESTDIR=$(CURDIR)/debian/tmp install - -binary-predeb/gir%:: - dh_girepository -p$(cdbs_curpkg) - -clean:: - rm -f stamp-*-gtk2 - rm -rf build-gtk2 +debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) +debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) + +common-install-arch:: + find debian/tmp -name \*.la -delete -- cgit v1.2.3 From 74aaf2261edeb98ac895636ee11ef8a7f4ed23e6 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 28 Oct 2011 09:25:56 -0400 Subject: releasing version 0.5.0-1ubuntu1 --- debian/changelog | 52 +++++++++++++++++++++++++++++++ debian/compat | 1 + debian/control | 25 +++++++++++---- debian/gir1.2-dbusmenu-glib-0.4.install | 2 +- debian/gir1.2-dbusmenu-gtk-0.4.install | 2 +- debian/gir1.2-dbusmenu-gtk3-0.4.install | 2 +- debian/libdbusmenu-glib-dev.install | 12 +++---- debian/libdbusmenu-glib-doc.install | 2 +- debian/libdbusmenu-glib4.install | 2 +- debian/libdbusmenu-gtk-dev.install | 12 +++---- debian/libdbusmenu-gtk-doc.install | 2 +- debian/libdbusmenu-gtk3-4.install | 2 +- debian/libdbusmenu-gtk3-dev.install | 12 +++---- debian/libdbusmenu-gtk4.install | 2 +- debian/libdbusmenu-jsonloader-dev.install | 8 ++--- debian/libdbusmenu-jsonloader4.install | 2 +- debian/libdbusmenu-tools.install | 6 ++-- debian/rules | 20 ++++++++++-- 18 files changed, 124 insertions(+), 42 deletions(-) create mode 100644 debian/compat (limited to 'debian/libdbusmenu-jsonloader4.install') diff --git a/debian/changelog b/debian/changelog index b270830..8c48a32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +libdbusmenu (0.5.0-1ubuntu1) precise; urgency=low + + * Multiarch conversion (partial, gobject instrospection not touched) + (LP: #859512) + + -- Riku Voipio Mon, 26 Sep 2011 12:13:07 +0300 + +libdbusmenu (0.5.0-1) experimental; urgency=low + + * Merge from Ubuntu. + + Re-enable GTK3 packages. + * Re-order includes in debian/rules to prevent lintian's + E: libdbusmenu source: temporary-debhelper-file + + -- Evgeni Golov Sat, 15 Oct 2011 09:29:54 +0200 + libdbusmenu (0.5.0-0ubuntu3) oneiric; urgency=low * libdbusmenu-gtk/client.c: @@ -131,6 +147,15 @@ libdbusmenu (0.4.4-0ubuntu1~ppa1) natty; urgency=low -- Ted Gould Mon, 25 Apr 2011 15:19:25 -0500 +libdbusmenu (0.4.3-1) unstable; urgency=low + + * Merge new upstream release from Ubuntu. + * Do not build-depend on gir-repository-dev, libgtk2.0-dev + has Gtk-2.0.gir since 2.24.4-1 (bump B-D accordingly). + * Standards-Version: 3.9.2 + + -- Evgeni Golov Wed, 27 Apr 2011 14:00:04 +0200 + libdbusmenu (0.4.3-0ubuntu3) natty; urgency=low * Backport bug fixes from trunk: @@ -171,6 +196,12 @@ libdbusmenu (0.4.3-0ubuntu1) natty; urgency=low -- Ted Gould Thu, 14 Apr 2011 16:49:13 -0500 +libdbusmenu (0.4.2-1) unstable; urgency=low + + * Merge new upstream release from Ubuntu. + + -- Evgeni Golov Mon, 11 Apr 2011 12:43:49 +0200 + libdbusmenu (0.4.2-0ubuntu3) natty; urgency=low * Merged fix, guard against an activation that does not actually have @@ -208,6 +239,27 @@ libdbusmenu (0.4.1-0ubuntu1) natty; urgency=low -- Ted Gould Thu, 31 Mar 2011 13:56:54 -0500 +libdbusmenu (0.4.0-2) unstable; urgency=low + + * Build-depend on gir1.2-atk-1.0, it's not pulled in by gir1.2-gtk-2.0 + on ia64, mipsel and sparc64, causing FTBFS there. + + -- Evgeni Golov Wed, 30 Mar 2011 10:16:59 +0200 + +libdbusmenu (0.4.0-1) unstable; urgency=low + + * Merge new upstream release from Ubuntu. + This builds with gir-1.2 and thus closes: #614490. + Also builds fine with --as-needed, closes: #615741. + * Disable GTK3 packages for now. + * Fix DEB_DH_MAKESHLIBS_ARGS_* for the latest SONAME bump. + * Also fix cdbs targets for it. + * Use valac-0.10, valac-0.12 is only in experimental. + * Add gir-repository-dev back to Build-Depends, + it still has Gtk-2.0.gir on Debian. + + -- Evgeni Golov Fri, 25 Mar 2011 15:55:16 +0100 + libdbusmenu (0.4.0-0ubuntu2) natty; urgency=low * Cherry picked fix for potential memory issues to fix unity-panel-service diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..45a4fb7 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +8 diff --git a/debian/control b/debian/control index 2555cd1..a7ff43d 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,13 @@ Source: libdbusmenu Section: gnome Priority: optional -Maintainer: Ubuntu Core Developers +Maintainer: Ubuntu Developers XSBC-Original-Maintainer: The Ayatana Packagers Uploaders: Evgeni Golov -Build-Depends: debhelper (>= 5.0), - cdbs (>= 0.4.41), +Build-Depends: debhelper (>= 8.1.3), + cdbs (>= 0.4.93), quilt, - libgtk2.0-dev (>= 2.23.2-0ubuntu2), + libgtk2.0-dev (>= 2.24.4-1~), libgtk-3-dev (>= 2.99.2-1ubuntu2), libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4), libdbus-glib-1-dev, @@ -26,8 +26,8 @@ Build-Depends: debhelper (>= 5.0), valac-0.14 Standards-Version: 3.9.2 Homepage: https://launchpad.net/dbusmenu -Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu -Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu +Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libdbusmenu/debian +Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libdbusmenu/debian Package: libdbusmenu-glib4 Section: libs @@ -39,6 +39,8 @@ Breaks: indicator-messages (<< 0.3.0), libdbusmenu-glib0, gir1.2-unity-3.0 (<< 3.8.4-0ubuntu2), gir1.2-indicate-0.5 (<< 0.5.0-0ubuntu4) +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: library for passing menus over DBus libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -54,6 +56,7 @@ Depends: ${shlibs:Depends}, libdbusmenu-glib4 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0) +Multi-Arch: same Description: library for passing menus over DBus - development files libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -66,6 +69,8 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: library for passing menus over DBus - GTK+ version libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -82,6 +87,7 @@ Depends: ${shlibs:Depends}, libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0), libdbusmenu-glib-dev +Multi-Arch: same Description: library for passing menus over DBus - GTK+ version developement files libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -96,6 +102,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, python, libdbusmenu-glib4 (= ${binary:Version}) +Multi-Arch: foreign Description: tools useful during development with libdbusmenu libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -161,6 +168,8 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: library for passing menus over DBus - Test lib libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -178,6 +187,7 @@ Depends: ${shlibs:Depends}, libdbus-glib-1-dev (>= 0.76), libdbusmenu-glib-dev (= ${binary:Version}), libjson-glib-dev +Multi-Arch: same Description: library for passing menus over DBus - Test lib development files libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -191,6 +201,8 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: library for passing menus over DBus - GTK+ version libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -207,6 +219,7 @@ Depends: ${shlibs:Depends}, libdbus-glib-1-dev (>= 0.76), libgtk-3-dev (>= 2.91.4-0ubuntu1), libdbusmenu-glib-dev +Multi-Arch: same Description: library for passing menus over DBus - GTK+ version developement files libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the diff --git a/debian/gir1.2-dbusmenu-glib-0.4.install b/debian/gir1.2-dbusmenu-glib-0.4.install index a9808fc..da62142 100644 --- a/debian/gir1.2-dbusmenu-glib-0.4.install +++ b/debian/gir1.2-dbusmenu-glib-0.4.install @@ -1 +1 @@ -debian/tmp/gtk3/usr/lib/girepository-1.0/Dbusmenu-0.4.typelib /usr/lib/girepository-1.0/ +usr/lib/*/girepository-1.0/Dbusmenu-0.4.typelib /usr/lib/girepository-1.0/ diff --git a/debian/gir1.2-dbusmenu-gtk-0.4.install b/debian/gir1.2-dbusmenu-gtk-0.4.install index 3493751..1a62fd5 100644 --- a/debian/gir1.2-dbusmenu-gtk-0.4.install +++ b/debian/gir1.2-dbusmenu-gtk-0.4.install @@ -1 +1 @@ -debian/tmp/gtk2/usr/lib/girepository-1.0/DbusmenuGtk-0.4.typelib /usr/lib/girepository-1.0/ +usr/lib/*/girepository-1.0/DbusmenuGtk-0.4.typelib /usr/lib/girepository-1.0/ diff --git a/debian/gir1.2-dbusmenu-gtk3-0.4.install b/debian/gir1.2-dbusmenu-gtk3-0.4.install index 64a74b6..4c56230 100644 --- a/debian/gir1.2-dbusmenu-gtk3-0.4.install +++ b/debian/gir1.2-dbusmenu-gtk3-0.4.install @@ -1 +1 @@ -debian/tmp/gtk3/usr/lib/girepository-1.0/DbusmenuGtk3-0.4.typelib /usr/lib/girepository-1.0/ +usr/lib/*/girepository-1.0/DbusmenuGtk3-0.4.typelib /usr/lib/girepository-1.0/ diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install index 197e9de..fc7079c 100644 --- a/debian/libdbusmenu-glib-dev.install +++ b/debian/libdbusmenu-glib-dev.install @@ -1,6 +1,6 @@ -debian/tmp/gtk3/usr/include/libdbusmenu-0.4/libdbusmenu-glib /usr/include/libdbusmenu-0.4/ -debian/tmp/gtk3/usr/lib/pkgconfig/dbusmenu-glib-0.4.pc /usr/lib/pkgconfig/ -debian/tmp/gtk3/usr/lib/libdbusmenu-glib.a /usr/lib/ -debian/tmp/gtk3/usr/lib/libdbusmenu-glib.so /usr/lib/ -debian/tmp/gtk3/usr/share/gir-1.0/Dbusmenu-0.4.gir /usr/share/gir-1.0/ -debian/tmp/gtk3/usr/share/vala/vapi/Dbusmenu-0.4.vapi /usr/share/vala/vapi/ +usr/include/libdbusmenu-0.4/libdbusmenu-glib /usr/include/libdbusmenu-0.4/ +usr/lib/*/pkgconfig/dbusmenu-glib-0.4.pc +usr/lib/*/libdbusmenu-glib.a +usr/lib/*/libdbusmenu-glib.so +usr/share/gir-1.0/Dbusmenu-0.4.gir /usr/share/gir-1.0/ +usr/share/vala/vapi/Dbusmenu-0.4.vapi /usr/share/vala/vapi/ diff --git a/debian/libdbusmenu-glib-doc.install b/debian/libdbusmenu-glib-doc.install index ec8274e..5d99d73 100644 --- a/debian/libdbusmenu-glib-doc.install +++ b/debian/libdbusmenu-glib-doc.install @@ -1 +1 @@ -debian/tmp/gtk3/usr/share/gtk-doc/html/libdbusmenu-glib /usr/share/gtk-doc/html/ +usr/share/gtk-doc/html/libdbusmenu-glib /usr/share/gtk-doc/html/ diff --git a/debian/libdbusmenu-glib4.install b/debian/libdbusmenu-glib4.install index a98765c..4c05f07 100644 --- a/debian/libdbusmenu-glib4.install +++ b/debian/libdbusmenu-glib4.install @@ -1 +1 @@ -debian/tmp/gtk3/usr/lib/libdbusmenu-glib.so.* /usr/lib/ +usr/lib/*/libdbusmenu-glib.so.* diff --git a/debian/libdbusmenu-gtk-dev.install b/debian/libdbusmenu-gtk-dev.install index 2e5dc02..ab8e8a9 100644 --- a/debian/libdbusmenu-gtk-dev.install +++ b/debian/libdbusmenu-gtk-dev.install @@ -1,6 +1,6 @@ -debian/tmp/gtk2/usr/include/libdbusmenu-0.4/libdbusmenu-gtk /usr/include/libdbusmenu-0.4/ -debian/tmp/gtk2/usr/lib/pkgconfig/dbusmenu-gtk-0.4.pc /usr/lib/pkgconfig/ -debian/tmp/gtk2/usr/lib/libdbusmenu-gtk.a /usr/lib/ -debian/tmp/gtk2/usr/lib/libdbusmenu-gtk.so /usr/lib/ -debian/tmp/gtk2/usr/share/gir-1.0/DbusmenuGtk-0.4.gir /usr/share/gir-1.0/ -debian/tmp/gtk2/usr/share/vala/vapi/DbusmenuGtk-0.4.vapi /usr/share/vala/vapi/ +usr/include/libdbusmenu-0.4/libdbusmenu-gtk /usr/include/libdbusmenu-0.4/ +usr/lib/*/pkgconfig/dbusmenu-gtk-0.4.pc +usr/lib/*/libdbusmenu-gtk.a +usr/lib/*/libdbusmenu-gtk.so +usr/share/gir-1.0/DbusmenuGtk-0.4.gir /usr/share/gir-1.0/ +usr/share/vala/vapi/DbusmenuGtk-0.4.vapi /usr/share/vala/vapi/ diff --git a/debian/libdbusmenu-gtk-doc.install b/debian/libdbusmenu-gtk-doc.install index b7dae35..664f00c 100644 --- a/debian/libdbusmenu-gtk-doc.install +++ b/debian/libdbusmenu-gtk-doc.install @@ -1 +1 @@ -debian/tmp/gtk2/usr/share/gtk-doc/html/libdbusmenu-gtk /usr/share/gtk-doc/html/ +usr/share/gtk-doc/html/libdbusmenu-gtk /usr/share/gtk-doc/html/ diff --git a/debian/libdbusmenu-gtk3-4.install b/debian/libdbusmenu-gtk3-4.install index 2bf1f59..a425da7 100644 --- a/debian/libdbusmenu-gtk3-4.install +++ b/debian/libdbusmenu-gtk3-4.install @@ -1 +1 @@ -debian/tmp/gtk3/usr/lib/libdbusmenu-gtk3.so.* /usr/lib/ +usr/lib/*/libdbusmenu-gtk3.so.* diff --git a/debian/libdbusmenu-gtk3-dev.install b/debian/libdbusmenu-gtk3-dev.install index 6d3fa0b..56f8fba 100644 --- a/debian/libdbusmenu-gtk3-dev.install +++ b/debian/libdbusmenu-gtk3-dev.install @@ -1,6 +1,6 @@ -debian/tmp/gtk3/usr/include/libdbusmenu-0.4/libdbusmenu-gtk3 /usr/include/libdbusmenu-0.4/ -debian/tmp/gtk3/usr/lib/pkgconfig/dbusmenu-gtk3-0.4.pc /usr/lib/pkgconfig/ -debian/tmp/gtk3/usr/lib/libdbusmenu-gtk3.a /usr/lib/ -debian/tmp/gtk3/usr/lib/libdbusmenu-gtk3.so /usr/lib/ -debian/tmp/gtk3/usr/share/gir-1.0/DbusmenuGtk3-0.4.gir /usr/share/gir-1.0/ -debian/tmp/gtk3/usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi /usr/share/gir-1.0/ +usr/include/libdbusmenu-0.4/libdbusmenu-gtk3 /usr/include/libdbusmenu-0.4/ +usr/lib/*/pkgconfig/dbusmenu-gtk3-0.4.pc +usr/lib/*/libdbusmenu-gtk3.a +usr/lib/*/libdbusmenu-gtk3.so +usr/share/gir-1.0/DbusmenuGtk3-0.4.gir /usr/share/gir-1.0/ +usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi /usr/share/gir-1.0/ diff --git a/debian/libdbusmenu-gtk4.install b/debian/libdbusmenu-gtk4.install index 2605240..546d698 100644 --- a/debian/libdbusmenu-gtk4.install +++ b/debian/libdbusmenu-gtk4.install @@ -1 +1 @@ -debian/tmp/gtk2/usr/lib/libdbusmenu-gtk.so.* /usr/lib/ +usr/lib/*/libdbusmenu-gtk.so.* diff --git a/debian/libdbusmenu-jsonloader-dev.install b/debian/libdbusmenu-jsonloader-dev.install index 95902cd..ebbb5ea 100644 --- a/debian/libdbusmenu-jsonloader-dev.install +++ b/debian/libdbusmenu-jsonloader-dev.install @@ -1,4 +1,4 @@ -debian/tmp/gtk3/usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader /usr/include/libdbusmenu-0.4/ -debian/tmp/gtk3/usr/lib/pkgconfig/dbusmenu-jsonloader-0.4.pc /usr/lib/pkgconfig/ -debian/tmp/gtk3/usr/lib/libdbusmenu-jsonloader.a /usr/lib/ -debian/tmp/gtk3/usr/lib/libdbusmenu-jsonloader.so /usr/lib/ +usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader /usr/include/libdbusmenu-0.4/ +usr/lib/*/pkgconfig/dbusmenu-jsonloader-0.4.pc +usr/lib/*/libdbusmenu-jsonloader.a +usr/lib/*/libdbusmenu-jsonloader.so diff --git a/debian/libdbusmenu-jsonloader4.install b/debian/libdbusmenu-jsonloader4.install index 74f887b..67976fd 100644 --- a/debian/libdbusmenu-jsonloader4.install +++ b/debian/libdbusmenu-jsonloader4.install @@ -1 +1 @@ -debian/tmp/gtk3/usr/lib/libdbusmenu-jsonloader.so.* /usr/lib/ +usr/lib/*/libdbusmenu-jsonloader.so.* diff --git a/debian/libdbusmenu-tools.install b/debian/libdbusmenu-tools.install index 1019dd8..1a79739 100644 --- a/debian/libdbusmenu-tools.install +++ b/debian/libdbusmenu-tools.install @@ -1,3 +1,3 @@ -debian/tmp/gtk3/usr/lib/libdbusmenu/dbusmenu-* /usr/lib/libdbusmenu/ -debian/tmp/gtk3/usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/ -debian/tmp/gtk3/usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/ +usr/lib/libdbusmenu/dbusmenu-* /usr/lib/libdbusmenu/ +usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/ +usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/ diff --git a/debian/rules b/debian/rules index 07f6d3a..8eeb376 100755 --- a/debian/rules +++ b/debian/rules @@ -3,18 +3,34 @@ DEB_BUILDDIR = build DEB_MAKE_FLAVORS = gtk2 gtk3 -include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/debhelper.mk DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ +DEB_DH_INSTALL_ARGS_libdbusmenu-gtk4 += --sourcedir=debian/tmp/gtk2 +DEB_DH_INSTALL_ARGS_libdbusmenu-gtk-dev += --sourcedir=debian/tmp/gtk2 +DEB_DH_INSTALL_ARGS_libdbusmenu-gtk-doc += --sourcedir=debian/tmp/gtk2 +DEB_DH_INSTALL_ARGS_gir1.2-dbusmenu-gtk-0.4 += --sourcedir=debian/tmp/gtk2 + +DEB_DH_INSTALL_ARGS_gir1.2-dbusmenu-glib-0.4 += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_gir1.2-dbusmenu-gtk3-0.4 += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-glib4 += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-glib-dev += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-glib-doc += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-gtk3-4 += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-gtk3-dev += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-jsonloader4 += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-jsonloader-dev += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-tools += --sourcedir=debian/tmp/gtk3 + DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 -DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection +DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) DEB_DH_SHLIBDEPS_ARGS_libdbusmenu-gtk4 = -- -xlibgtk2.0-0 DEB_DH_SHLIBDEPS_ARGS_libdbusmenu-gtk3-4 = -- -xlibgtk-3-0 -- cgit v1.2.3