Merge lp:~vish/ubuntu/maverick/pidgin/bug259793 into lp:ubuntu/maverick/pidgin

Proposed by Vish
Status: Rejected
Rejected by: Sebastien Bacher
Proposed branch: lp:~vish/ubuntu/maverick/pidgin/bug259793
Merge into: lp:ubuntu/maverick/pidgin
Diff against target: 59 lines (+29/-12)
2 files modified
debian/changelog (+6/-0)
debian/control (+23/-12)
To merge this branch: bzr merge lp:~vish/ubuntu/maverick/pidgin/bug259793
Reviewer Review Type Date Requested Status
Sebastien Bacher Pending
Review via email: mp+33420@code.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

closing old merge request, we should rebase on the current version if needed

Unmerged revisions

61. By Vish

Fix Bug #259793

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-08-11 14:16:15 +0000
3+++ debian/changelog 2010-08-23 16:53:41 +0000
4@@ -1,3 +1,9 @@
5+pidgin (1:2.7.3-1ubuntu2) maverick; urgency=low
6+
7+ * debian/control: Improve package description for pidgin (LP: #259793)
8+
9+ -- K Vishnoo Charan Reddy <vish@ubuntu.com> Tue, 24 Aug 2010 00:21:12 +0530
10+
11 pidgin (1:2.7.3-1ubuntu1) maverick; urgency=low
12
13 * Resync on Debian, workaround build issue (lp:#600952)
14
15=== modified file 'debian/control'
16--- debian/control 2010-07-06 13:24:00 +0000
17+++ debian/control 2010-08-23 16:53:41 +0000
18@@ -46,18 +46,29 @@
19 Replaces: gaim (<< 1:2.0.0+beta6-3), pidgin-data (<< 2.4.0-1)
20 Recommends: gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, pidgin-libnotify
21 Suggests: gnome-panel (>= 2.1) | kdebase-workspace-bin | docker, evolution-data-server (>= 1.10.0), ${shlibs:Suggests}
22-Description: graphical multi-protocol instant messaging client for X
23- Pidgin is a graphical, modular instant messaging client capable of using
24- multiple networks at once. Currently supported are:
25- AIM/ICQ, Yahoo!, MSN, IRC, Jabber/XMPP/Google Talk, Napster, Zephyr, Gadu-Gadu,
26- Bonjour, Groupwise, Sametime, SILC, SIMPLE, QQ, MySpaceIM, and MXit.
27- .
28- Some extra packages are suggested to use increased functionality:
29- * gnome-panel | kdebase-workspace-bin | docker:
30- - To use the system tray icon functionality (minimizing to an icon, having
31- the icon blink when there are new messages, etc.)
32- * libsqlite3-0:
33- - To use Contact Availability Prediction plugin
34+Description: multi-protocol instant messaging client
35+ Instant message all your friends from one place.
36+
37+ Pidgin is an easy to use and free chat client used by millions. Connect to AIM, MSN, Yahoo,
38+ and more chat networks all at once.
39+
40+ Supported chat networks:
41+ * AIM
42+ * Bonjour
43+ * Gadu-Gadu
44+ * Google Talk
45+ * Groupwise
46+ * ICQ
47+ * IRC
48+ * MSN
49+ * MySpaceIM
50+ * QQ
51+ * SILC
52+ * SIMPLE
53+ * Sametime
54+ * XMPP
55+ * Yahoo!
56+ * Zephyr
57
58 Package: pidgin-data
59 Architecture: all

Subscribers

People subscribed via source and target branches

to all changes: