[Pkg-telepathy-commits] ./packages/unstable/empathy r122: bump sonames
Sjoerd Simons
sjoerd at luon.net
Mon Apr 21 08:46:06 UTC 2008
------------------------------------------------------------
revno: 122
committer: Sjoerd Simons <sjoerd at luon.net>
branch nick: empathy
timestamp: Mon 2008-04-21 10:46:06 +0200
message:
bump sonames
removed:
libempathy-gtk11.shlibs
patches/00_fix_python_bindings.patch
patches/01_remove_unused_code.patch
renamed:
libempathy-gtk11.install => libempathy-gtk12.install
libempathy11.install => libempathy12.install
libempathy11.symbols => libempathy12.symbols
modified:
changelog
control
-------------- next part --------------
=== modified file 'changelog'
--- a/changelog 2008-04-21 08:35:33 +0000
+++ b/changelog 2008-04-21 08:46:06 +0000
@@ -7,8 +7,13 @@
[ Sjoerd Simons ]
* New upstream release
* debian/control: Add conflict with older version of stream-engine
+ * debian/patches/00_fix_python_bindings.patch:
+ - Removed. Fixed upstream
+ * debian/patches/01_remove_unused_code.patch:
+ - Removed. Fixed upstream
+ * Bump libempathy and libempathy-gtk soname
- -- Sjoerd Simons <sjoerd at debian.org> Mon, 21 Apr 2008 10:34:57 +0200
+ -- Sjoerd Simons <sjoerd at debian.org> Mon, 21 Apr 2008 10:45:45 +0200
empathy (0.22.1-1) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-04-21 08:35:33 +0000
+++ b/control 2008-04-21 08:46:06 +0000
@@ -64,7 +64,7 @@
This packet contains common files for libempathy
-Package: libempathy11
+Package: libempathy12
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -107,7 +107,7 @@
libglib2.0-dev,
libxml2-dev,
libtelepathy-dev,
- libempathy11 (= ${binary:Version})
+ libempathy12 (= ${binary:Version})
Description: High-level library and user-interface for Telepathy
Empathy consists of a rich set of reusable instant messaging widgets, and a
GNOME client using those widgets. It uses Telepathy and Nokia's Mission
@@ -151,7 +151,7 @@
.
This package contains common files for libempathy-gtk
-Package: libempathy-gtk11
+Package: libempathy-gtk12
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -173,7 +173,7 @@
Depends: ${shlibs:Depends},
${misc:Depends},
libempathy-dev,
- libempathy-gtk11 (= ${binary:Version}),
+ libempathy-gtk12 (= ${binary:Version}),
libgtk2.0-dev (>= 2.10.0),
libglade2-dev (>= 2.0.0)
Description: High-level library and user-interface for Telepathy
=== removed file 'libempathy-gtk11.shlibs'
--- a/libempathy-gtk11.shlibs 2008-04-06 21:47:58 +0000
+++ b/libempathy-gtk11.shlibs 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-libempathy-gtk 11 libempathy-gtk11 (>= 0.22.1)
=== renamed file 'libempathy-gtk11.install' => 'libempathy-gtk12.install'
=== renamed file 'libempathy11.install' => 'libempathy12.install'
=== renamed file 'libempathy11.symbols' => 'libempathy12.symbols'
=== removed file 'patches/00_fix_python_bindings.patch'
--- a/patches/00_fix_python_bindings.patch 2008-04-04 17:04:48 +0000
+++ b/patches/00_fix_python_bindings.patch 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-commit 5efb16f7393e1417983ff5faa6d2fc50588976a9
-Author: xclaesse <xclaesse at 4ee84921-47dd-4033-b63a-18d7a039a3e4>
-Date: Sun Mar 16 13:02:27 2008 +0000
-
- Remove Presence object, it doesn't exists anymore (Alban Crequy).
-
-
- git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@801 4ee84921-47dd-4033-b63a-18d7a039a3e4
-
-diff --git a/python/pyempathygtk/pyempathygtk.override b/python/pyempathygtk/pyempathygtk.override
-index a2bb7a7..7afb8e9 100644
---- a/python/pyempathygtk/pyempathygtk.override
-+++ b/python/pyempathygtk/pyempathygtk.override
-@@ -60,7 +60,6 @@ import gtk.gdk.Pixbuf as PyGdkPixbuf_Type
- import empathy.Contact as PyEmpathyContact_Type
- import empathy.ContactList as PyEmpathyContactList_Type
- import empathy.TpChat as PyEmpathyTpChat_Type
--import empathy.Presence as PyEmpathyPresence_Type
- import empathy.Message as PyEmpathyMessage_Type
- import empathy.TpChatroom as PyEmpathyTpChatroom_Type
- import empathy.TpCall as PyEmpathyTpCall_Type
=== removed file 'patches/01_remove_unused_code.patch'
--- a/patches/01_remove_unused_code.patch 2008-04-04 18:46:05 +0000
+++ b/patches/01_remove_unused_code.patch 1970-01-01 00:00:00 +0000
@@ -1,179 +0,0 @@
-diff --git a/libempathy-gtk/empathy-preferences.c b/libempathy-gtk/empathy-preferences.c
-index 50c9d56..6755ab5 100644
---- a/libempathy-gtk/empathy-preferences.c
-+++ b/libempathy-gtk/empathy-preferences.c
-@@ -82,15 +82,10 @@ static void preferences_languages_cell_toggled_cb (GtkCellRendererToggle
- static void preferences_themes_setup (EmpathyPreferences *preferences);
- static void preferences_widget_sync_bool (const gchar *key,
- GtkWidget *widget);
--static void preferences_widget_sync_int (const gchar *key,
-- GtkWidget *widget);
- static void preferences_widget_sync_string (const gchar *key,
- GtkWidget *widget);
- static void preferences_widget_sync_string_combo (const gchar *key,
- GtkWidget *widget);
--static void preferences_notify_int_cb (EmpathyConf *conf,
-- const gchar *key,
-- gpointer user_data);
- static void preferences_notify_string_cb (EmpathyConf *conf,
- const gchar *key,
- gpointer user_data);
-@@ -103,12 +98,6 @@ static void preferences_notify_bool_cb (EmpathyConf
- static void preferences_notify_sensitivity_cb (EmpathyConf *conf,
- const gchar *key,
- gpointer user_data);
--static void preferences_hookup_spin_button (EmpathyPreferences *preferences,
-- const gchar *key,
-- GtkWidget *widget);
--static void preferences_hookup_entry (EmpathyPreferences *preferences,
-- const gchar *key,
-- GtkWidget *widget);
- static void preferences_hookup_toggle_button (EmpathyPreferences *preferences,
- const gchar *key,
- GtkWidget *widget);
-@@ -121,10 +110,6 @@ static void preferences_hookup_string_combo (EmpathyPreferences
- static void preferences_hookup_sensitivity (EmpathyPreferences *preferences,
- const gchar *key,
- GtkWidget *widget);
--static void preferences_spin_button_value_changed_cb (GtkWidget *button,
-- gpointer user_data);
--static void preferences_entry_value_changed_cb (GtkWidget *entry,
-- gpointer user_data);
- static void preferences_toggle_button_toggled_cb (GtkWidget *button,
- gpointer user_data);
- static void preferences_radio_button_toggled_cb (GtkWidget *button,
-@@ -488,18 +473,6 @@ preferences_widget_sync_bool (const gchar *key, GtkWidget *widget)
- }
-
- static void
--preferences_widget_sync_int (const gchar *key, GtkWidget *widget)
--{
-- gint value;
--
-- if (empathy_conf_get_int (empathy_conf_get (), key, &value)) {
-- if (GTK_IS_SPIN_BUTTON (widget)) {
-- gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value);
-- }
-- }
--}
--
--static void
- preferences_widget_sync_string (const gchar *key, GtkWidget *widget)
- {
- gchar *value;
-@@ -580,14 +553,6 @@ preferences_widget_sync_string_combo (const gchar *key, GtkWidget *widget)
- }
-
- static void
--preferences_notify_int_cb (EmpathyConf *conf,
-- const gchar *key,
-- gpointer user_data)
--{
-- preferences_widget_sync_int (key, user_data);
--}
--
--static void
- preferences_notify_string_cb (EmpathyConf *conf,
- const gchar *key,
- gpointer user_data)
-@@ -631,67 +596,6 @@ preferences_add_id (EmpathyPreferences *preferences, guint id)
- }
-
- static void
--preferences_hookup_spin_button (EmpathyPreferences *preferences,
-- const gchar *key,
-- GtkWidget *widget)
--{
-- guint id;
--
-- /* Silence warning. */
-- if (0) {
-- preferences_hookup_spin_button (preferences, key, widget);
-- }
--
-- preferences_widget_sync_int (key, widget);
--
-- g_object_set_data_full (G_OBJECT (widget), "key",
-- g_strdup (key), g_free);
--
-- g_signal_connect (widget,
-- "value_changed",
-- G_CALLBACK (preferences_spin_button_value_changed_cb),
-- NULL);
--
-- id = empathy_conf_notify_add (empathy_conf_get (),
-- key,
-- preferences_notify_int_cb,
-- widget);
-- if (id) {
-- preferences_add_id (preferences, id);
-- }
--}
--
--static void
--preferences_hookup_entry (EmpathyPreferences *preferences,
-- const gchar *key,
-- GtkWidget *widget)
--{
-- guint id;
--
-- if (0) { /* Silent warning before we use this function. */
-- preferences_hookup_entry (preferences, key, widget);
-- }
--
-- preferences_widget_sync_string (key, widget);
--
-- g_object_set_data_full (G_OBJECT (widget), "key",
-- g_strdup (key), g_free);
--
-- g_signal_connect (widget,
-- "changed",
-- G_CALLBACK (preferences_entry_value_changed_cb),
-- NULL);
--
-- id = empathy_conf_notify_add (empathy_conf_get (),
-- key,
-- preferences_notify_string_cb,
-- widget);
-- if (id) {
-- preferences_add_id (preferences, id);
-- }
--}
--
--static void
- preferences_hookup_toggle_button (EmpathyPreferences *preferences,
- const gchar *key,
- GtkWidget *widget)
-@@ -795,32 +699,6 @@ preferences_hookup_sensitivity (EmpathyPreferences *preferences,
- }
-
- static void
--preferences_spin_button_value_changed_cb (GtkWidget *button,
-- gpointer user_data)
--{
-- const gchar *key;
--
-- key = g_object_get_data (G_OBJECT (button), "key");
--
-- empathy_conf_set_int (empathy_conf_get (),
-- key,
-- gtk_spin_button_get_value (GTK_SPIN_BUTTON (button)));
--}
--
--static void
--preferences_entry_value_changed_cb (GtkWidget *entry,
-- gpointer user_data)
--{
-- const gchar *key;
--
-- key = g_object_get_data (G_OBJECT (entry), "key");
--
-- empathy_conf_set_string (empathy_conf_get (),
-- key,
-- gtk_entry_get_text (GTK_ENTRY (entry)));
--}
--
--static void
- preferences_toggle_button_toggled_cb (GtkWidget *button,
- gpointer user_data)
- {
More information about the Pkg-telepathy-commits
mailing list