Codebase list empathy / 7b44100
Merge ubuntu changes Laurent Bigonville 15 years ago
3 changed file(s) with 289 addition(s) and 1 deletion(s). Raw diff Collapse all Expand all
+257
-0
debian/changelog less more
2929
3030 -- Laurent Bigonville <bigon@debian.org> Sat, 20 Dec 2008 21:45:15 +0100
3131
32 empathy (2.25.2-2ubuntu1) jaunty; urgency=low
33
34 * Merge from debian experimental, remaining changes:
35 - debian/patches/01fixtabbehavour.diff: Change behaviour of tabs in chat
36 dialogs
37 - Add Recommends on telepathy-butterfly and telepathy-haze
38 - Add Suggests on telepathy-idle
39
40 -- Laurent Bigonville <bigon@ubuntu.com> Thu, 04 Dec 2008 15:31:52 +0100
41
3242 empathy (2.25.2-2) experimental; urgency=low
3343
3444 * debian/patches/64bit-build-fix.patch:
3545 - Fix build on 64 bit platforms
3646
3747 -- Sjoerd Simons <sjoerd@debian.org> Thu, 04 Dec 2008 00:46:53 +0000
48
49 empathy (2.25.2-1ubuntu1) jaunty; urgency=low
50
51 * Merge from debian experimental, remaining changes:
52 - debian/patches/01fixtabbehavour.diff: Change behaviour of tabs in chat
53 dialogs
54 - Add Recommends on telepathy-butterfly and telepathy-haze
55 - Add Suggests on telepathy-idle
56
57 -- Laurent Bigonville <bigon@ubuntu.com> Mon, 01 Dec 2008 22:20:36 +0100
3858
3959 empathy (2.25.2-1) experimental; urgency=low
4060
4464
4565 -- Laurent Bigonville <bigon@debian.org> Mon, 01 Dec 2008 21:35:56 +0100
4666
67 empathy (2.24.1-1ubuntu1) intrepid; urgency=low
68
69 * Merge from debian experimental, remaining changes:
70 - debian/patches/01fixtabbehavour.diff: Change behaviour of tabs in chat
71 dialogs
72 - Add Recommends on telepathy-butterfly and telepathy-haze
73 - Add Suggests on telepathy-idle
74
75 -- Laurent Bigonville <bigon@ubuntu.com> Mon, 20 Oct 2008 21:48:50 +0200
76
4777 empathy (2.24.1-1) experimental; urgency=low
4878
4979 * New upstream release.
5080
5181 -- Laurent Bigonville <bigon@debian.org> Mon, 20 Oct 2008 21:12:27 +0200
5282
83 empathy (2.24.0-1ubuntu1) intrepid; urgency=low
84
85 * Merge from debian experimental, remaining changes:
86 - debian/patches/01fixtabbehavour.diff: Change behaviour of tabs in chat
87 dialogs
88 - Add Recommends on telepathy-butterfly and telepathy-haze
89 - Add Suggests on telepathy-idle
90
91 -- Laurent Bigonville <bigon@ubuntu.com> Mon, 22 Sep 2008 23:32:45 +0200
92
5393 empathy (2.24.0-1) experimental; urgency=low
5494
5595 * New upstream release.
5696
5797 -- Laurent Bigonville <bigon@debian.org> Mon, 22 Sep 2008 21:37:47 +0200
98
99 empathy (2.23.92-1ubuntu1) intrepid; urgency=low
100
101 * Merge from debian unstable, remaining changes:
102 - debian/patches/01fixtabbehavour.diff: Change behaviour of tabs in chat
103 dialogs
104 * Re-add lost recommends and suggests on tp-butterfly, tp-haze and tp-idle
105
106 -- Laurent Bigonville <bigon@ubuntu.com> Wed, 10 Sep 2008 00:09:14 +0200
58107
59108 empathy (2.23.92-1) experimental; urgency=low
60109
63112 * Use my debian.org address in Uploaders
64113
65114 -- Laurent Bigonville <bigon@debian.org> Tue, 09 Sep 2008 19:03:12 +0200
115
116 empathy (2.23.91-0ubuntu1) intrepid; urgency=low
117
118 * New upstream release
119 - Adjust libempathy-gtk15.symbols
120 * Put the telepathy team as maintainer of the package
121
122 -- Laurent Bigonville <bigon@ubuntu.com> Tue, 02 Sep 2008 19:48:54 +0200
66123
67124 empathy (2.23.90-2) experimental; urgency=low
68125
82139
83140 -- Dafydd Harries <daf@debian.org> Sun, 24 Aug 2008 22:03:36 +0100
84141
142 empathy (2.23.90-0ubuntu1) intrepid; urgency=low
143
144 * New upstream release, adjust symbols files
145 * Revert to cdbs instead of debhelper 7
146 * Move Scott James Remnant <scott@ubuntu.com> patch to debian/patches
147
148 -- Laurent Bigonville <bigon@ubuntu.com> Wed, 20 Aug 2008 19:00:04 +0200
149
150 empathy (2.23.6-0ubuntu8) intrepid; urgency=low
151
152 * Finally got something like the effect I was after.
153
154 -- Scott James Remnant <scott@ubuntu.com> Mon, 18 Aug 2008 12:01:35 +0100
155
156 empathy (2.23.6-0ubuntu7) intrepid; urgency=low
157
158 * Err, it wasn't a homogenous tabs problem, it was simply a packing
159 problem.
160
161 -- Scott James Remnant <scott@ubuntu.com> Mon, 18 Aug 2008 11:42:55 +0100
162
163 empathy (2.23.6-0ubuntu6) intrepid; urgency=low
164
165 * Don't use homogeneous tabs in the chat window.
166
167 -- Scott James Remnant <scott@ubuntu.com> Mon, 18 Aug 2008 10:32:43 +0100
168
169 empathy (2.23.6-0ubuntu5) intrepid; urgency=low
170
171 * Install gnome help and omf files in empathy package (LP: #257189)
172
173 -- Laurent Bigonville <bigon@ubuntu.com> Thu, 14 Aug 2008 18:53:35 +0200
174
175 empathy (2.23.6-0ubuntu4) intrepid; urgency=low
176
177 * Demotte telepathy-idle to Suggests
178
179 -- Laurent Bigonville <bigon@ubuntu.com> Mon, 11 Aug 2008 23:37:22 +0200
180
181 empathy (2.23.6-0ubuntu3) intrepid; urgency=low
182
183 * Add telepathy-idle as recommends for the empathy package (LP: #256783)
184
185 -- David Futcher <bobbo@ubuntu.com> Mon, 11 Aug 2008 16:34:16 +0100
186
187 empathy (2.23.6-0ubuntu2) intrepid; urgency=low
188
189 * Add telepathy-butterfly and telepathy-haze as recommends for the empathy
190 package
191
192 -- Laurent Bigonville <bigon@ubuntu.com> Fri, 08 Aug 2008 17:02:45 +0200
193
194 empathy (2.23.6-0ubuntu1) intrepid; urgency=low
195
196 * New upstream release
197 * Drop debian/patches/00_mark_unknown_presence_id_as_unset.patch: applied
198 upstream
199 * Use rarian-compat and librarian-dev instead of scrollkeeper as build-dep
200 * Bump debhelper compat to 7
201 * Use new dh mechanism instead of cdbs
202 * Bump build-deps and remove libtelepathy-dev (not needed anymore)
203 * Remove --enable-voip flags (voip enabled by default), rename
204 --enable-aspell to --enable-spell
205
206 -- Laurent Bigonville <bigon@ubuntu.com> Fri, 08 Aug 2008 16:15:17 +0200
207
85208 empathy (0.23.4-1) experimental; urgency=low
86209
87210 [ Laurent Bigonville ]
111234 recognized
112235
113236 -- Sjoerd Simons <sjoerd@debian.org> Sat, 02 Aug 2008 19:56:46 +0100
237
238 empathy (0.23.3-1ubuntu2) intrepid; urgency=low
239
240 * Also pass --disable-scrollkeeper to configure.
241 (fixes FTBFS, LP: #247720, #253295)
242
243 -- Michael Bienia <geser@ubuntu.com> Wed, 30 Jul 2008 16:36:27 +0200
244
245 empathy (0.23.3-1ubuntu1) intrepid; urgency=low
246
247 * libempathy-gtk/empathy-ui-utils.c, src/empathy-status-icon.c:
248 - Add format "%s" to function calls. Fixes FTBFS caused by default compiler
249 flags (error: format not a string literal and no format arguments)
250 * Modify Maintainer value to match the DebianMaintainerField specification.
251
252 -- Albin Tonnerre <lutin@ubuntu.com> Thu, 19 Jun 2008 12:33:47 +0200
114253
115254 empathy (0.23.3-1) unstable; urgency=low
116255
291430
292431 -- Sjoerd Simons <sjoerd@debian.org> Fri, 16 Nov 2007 11:03:08 +0100
293432
433 empathy (0.14-1ubuntu1) hardy; urgency=low
434
435 * Merge from debian unstable, remaining changes: (LP: #89431)
436 - Depends: telepathy-gabble | telepathy-connection-manager,
437 - Suggests: telepathy-core.
438 - Change Conflicts and Replaces accordingly
439 - Change bzr url to the Ubuntu branch
440 * Drop debian/patches/no-date-crash.patch and
441 debian/patches/search-contact-list.patch: applied upstream
442 * debian/patches/add-haze-profiles.patch: use debian one
443
444 -- Laurent Bigonville <bigon@ubuntu.com> Wed, 24 Oct 2007 12:23:47 +0200
445
294446 empathy (0.14-1) unstable; urgency=low
295447
296448 [ Loic Minier ]
323475
324476 -- Sjoerd Simons <sjoerd@debian.org> Sat, 29 Sep 2007 18:41:39 +0200
325477
478 empathy (0.12-2ubuntu2) gutsy; urgency=low
479
480 * debian/control: Fix typo => telepathy-core (LP: #146415)
481
482 -- Laurent Bigonville <bigon@bigon.be> Fri, 28 Sep 2007 20:28:26 +0200
483
484 empathy (0.12-2ubuntu1) gutsy; urgency=low
485
486 * Merge from debian unstable, remaining Ubuntu changes: (LP: #138027)
487 - Add profiles for haze support
488 - Depends: telepathy-gabble | telepathy-connection-manager,
489 - Suggests: telepaty-core.
490 * Add debian/patches/no-date-crash.patch: Fix crash if there is no date in
491 conversation (Taken from upstream)
492 * Add debian/patches/search-contact-list.patch: Fix search function in
493 contact list (Taken from upstream)
494 * Fix typo in libempathy-dev description
495 * Change Conflicts and Replaces accordingly
496 * Change bzr url to the Ubuntu branch
497
498 -- Laurent Bigonville <bigon@bigon.be> Mon, 10 Sep 2007 17:12:54 +0200
499
326500 empathy (0.12-2) unstable; urgency=low
327501
328502 * debian/control: Let the -common packages conflict and replace the old
363537
364538 -- Sjoerd Simons <sjoerd@debian.org> Sat, 25 Aug 2007 18:41:08 +0200
365539
540 empathy (0.12-0ubuntu2) gutsy; urgency=low
541
542 * debian/control:
543 - Depends: telepathy-gabble | telepathy-connection-manager (LP: #137689),
544 - Suggests: telepaty-core.
545
546 -- Daniel Holbach <daniel.holbach@ubuntu.com> Thu, 06 Sep 2007 09:18:01 +0200
547
548 empathy (0.12-0ubuntu1) gutsy; urgency=low
549
550 * Fake sync with not yet published version
551
552 -- Laurent Bigonville <bigon@bigon.be> Sat, 25 Aug 2007 01:02:43 +0200
553
554 empathy (0.10-0ubuntu2) gutsy; urgency=low
555
556 * Add profiles for haze support
557
558 -- Matthew Garrett <mjg59@srcf.ucam.org> Tue, 21 Aug 2007 19:19:41 +0100
559
560 empathy (0.10-0ubuntu1) gutsy; urgency=low
561
562 * New upstream release
563
564 -- Baptiste Mille-Mathias <baptiste.millemathias@gmail.com> Mon, 30 Jul 2007 18:49:02 +0200
565
566 empathy (0.8-1ubuntu1) gutsy; urgency=low
567
568 * Merge from Debian unstable. Remaining Ubuntu changes:
569 - debian/control: add libaspell-dev, iso-codes to Build-Depends
570 - debian/rules: --enable-aspell
571 - Update Maintainer field to match Debian-Maintainer-Spec
572
573 -- Vincent Legout <bixente44@gmail.com> Tue, 3 Jul 2007 11:56:56 +0200
574
366575 empathy (0.8-1) unstable; urgency=low
367576
368577 * New upstream release
369578
370579 -- Sjoerd Simons <sjoerd@debian.org> Sat, 23 Jun 2007 14:45:31 +0100
580
581 empathy (0.8-0ubuntu1) gutsy; urgency=low
582
583 * New upstream release:
584 - Fixed contact list handling.
585 - Make use of NetworkManager to set presence to OFFILE when we are
586 disconnected and restore presence once we are reconnected.
587 - UI for searching in conversation history and to view all conversations
588 with a given contact.
589 - Do not use 2 different processes (empathy and empathy-chat), merge them
590 into one client. This is easier for debugging and share data.
591 - Do not create log directory for a chat if there is no messages to put
592 in.
593 - Do not set active contacts when creating the store, and when contact
594 groups changed.
595 - Fix warning when using command-line options.
596 - Ignore ssl errors by default. This is needed to connect jabber accounts
597 using ssl.
598 - Adding spellcheck support using aspell.
599 - Lots of bugs fixed.
600 * debian/control: add libaspell-dev, iso-codes to Build-Depends.
601 * debian/rules: --enable-aspell.
602
603 -- Daniel Holbach <daniel.holbach@ubuntu.com> Thu, 21 Jun 2007 22:43:45 +0200
604
605 empathy (0.8-0ubuntu1) gutsy; urgency=low
606
607 * New upstream release:
608 - Fixed contact list handling.
609 - Make use of NetworkManager to set presence to OFFILE when we are
610 disconnected and restore presence once we are reconnected.
611 - UI for searching in conversation history and to view all conversations
612 with a given contact.
613 - Do not use 2 different processes (empathy and empathy-chat), merge them
614 into one client. This is easier for debugging and share data.
615 - Do not create log directory for a chat if there is no messages to put
616 in.
617 - Do not set active contacts when creating the store, and when contact
618 groups changed.
619 - Fix warning when using command-line options.
620 - Ignore ssl errors by default. This is needed to connect jabber accounts
621 using ssl.
622 - Adding spellcheck support using aspell.
623 - Lots of bugs fixed.
624 * debian/control: add libaspell-dev, iso-codes to Build-Depends.
625 * debian/rules: --enable-aspell.
626
627 -- Daniel Holbach <daniel.holbach@ubuntu.com> Thu, 21 Jun 2007 22:43:45 +0200
371628
372629 empathy (0.7-1) unstable; urgency=low
373630
+5
-1
debian/control less more
00 Source: empathy
11 Section: gnome
22 Priority: optional
3 Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers@lists.alioth.debian.org>
3 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
4 XSBC-Original-Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers@lists.alioth.debian.org>
45 Uploaders: Sjoerd Simons <sjoerd@debian.org>,
56 Dafydd Harries <daf@debian.org>,
67 Simon McVittie <smcv@debian.org>,
3940 dbus-x11
4041 Recommends: telepathy-gabble,
4142 telepathy-salut,
43 telepathy-butterfly,
44 telepathy-haze,
4245 telepathy-stream-engine,
4346 gvfs-backends
47 Suggests: telepathy-idle
4448 Conflicts: telepathy-stream-engine (<< 0.5.2)
4549 Description: High-level library and user-interface for Telepathy
4650 Empathy consists of a rich set of reusable instant messaging widgets, and a
+27
-0
debian/patches/01fixtabbehavour.diff less more
0 --- empathy-2.23.6.orig/src/empathy-chat-window.c
1 +++ empathy-2.23.6/src/empathy-chat-window.c
2 @@ -196,7 +196,6 @@
3 gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE);
4
5 name_label = gtk_label_new (NULL);
6 - gtk_label_set_ellipsize (GTK_LABEL (name_label), PANGO_ELLIPSIZE_END);
7
8 attr_list = pango_attr_list_new ();
9 attr = pango_attr_scale_new (1/1.2);
10 @@ -1160,6 +1159,7 @@
11 g_object_unref (glade);
12
13 priv->notebook = gtk_notebook_new ();
14 + gtk_notebook_set_scrollable (GTK_NOTEBOOK (priv->notebook), TRUE);
15 gtk_notebook_set_group (GTK_NOTEBOOK (priv->notebook), "EmpathyChatWindow");
16 gtk_box_pack_start (GTK_BOX (chat_vbox), priv->notebook, TRUE, TRUE, 0);
17 gtk_widget_show (priv->notebook);
18 @@ -1350,8 +1350,6 @@
19 gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), child, label);
20 gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (priv->notebook), child, TRUE);
21 gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (priv->notebook), child, TRUE);
22 - gtk_notebook_set_tab_label_packing (GTK_NOTEBOOK (priv->notebook), child,
23 - TRUE, TRUE, GTK_PACK_START);
24
25 DEBUG ("Chat added (%d references)", G_OBJECT (chat)->ref_count);
26 }