~ubuntu-branches/ubuntu/precise/empathy/precise-proposed-201205180810

« back to all changes in this revision

Viewing changes to debian/control

  • Committer: Bazaar Package Importer
  • Author(s): Brian Curtis, Brian Curtis, Ken VanDine
  • Date: 2011-06-01 10:35:24 UTC
  • mfrom: (1.1.70 upstream) (6.3.44 experimental)
  • Revision ID: james.westby@ubuntu.com-20110601103524-wx3wgp71394730jt
Tags: 3.1.1-1ubuntu1
[ Brian Curtis ]
* Merge with Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Drop geoclue/mapping build-depends (they are in Universe)
  - Add Vcz-Bzr link
  - Add Suggests on telepathy-idle
  - Bump telepathy-butterfly, telepathy-haze to recommends
  - Don't recommend the freedesktop sound theme we have an ubuntu one
  - Add build depend for libunity-dev
* debian/rules:
  - Use autoreconf.mk
  - Disable map and location
* debian/empathy.install:
  - Install message indicator configuration
* debian/indicators/empathy:
  - Message indicator configuration
* debian/patches/01_lpi.patch:
  - Add Launchpad integration
* debian/patches/10_use_notify_osd_icons.patch:
  - Use the notify-osd image for new messages
* debian/patches/34_start_raised_execpt_in_session.patch
  - If not started with the session, we should always raise
* debian/patches/36_chat_window_default_size.patch:
  - Make the default chat window size larger
* debian/patches/37_facebook_default.patch:
  - Make facebook the default chat account type
* debian/patches/38_lp_569289.patch
  - Set freenode as default IRC network for new IRC accounts 
* debian/patches/41_unity_launcher_progress.patch
  - Display file transfer progress in the unity launcher

[ Ken VanDine ]
* debian/control
  - build depend on libgcr-3-dev instead of libgcr-dev
  - dropped build depends for libindicate, we will use telepathy-indicator
  - Depend on dconf-gsettings-backend | gsettings-backend
  - Added a Recommends for telepathy-indicator
* +debian/empathy.gsettings-override
  - Added an override for notifications-focus
* debian/patches/series
  - commented out 23_idomessagedialog_for_voip_and_ft.patch, until ido has 
    been ported to gtk3

Show diffs side-by-side

added added

removed removed

Lines of Context:
8
8
           Simon McVittie <smcv@debian.org>,
9
9
           Riccardo Setti <giskard@debian.org>,
10
10
           Laurent Bigonville <bigon@debian.org>,
11
 
           Jonny Lamb <jonny@debian.org>
12
 
Build-Depends: cdbs,
13
 
               debhelper (>= 7),
 
11
           Jonny Lamb <jonny@debian.org>,
 
12
           Emilio Pozuelo Monfort <pochu@debian.org>
 
13
Build-Depends: cdbs (>= 0.4.90),
 
14
               debhelper (>= 8),
14
15
               dh-autoreconf,
15
 
               gnome-common,
16
16
               rarian-compat,
17
17
               librarian-dev,
18
 
               libglib2.0-dev (>= 2.25.9),
19
 
               libgtk2.0-dev (>= 2.21.2),
20
 
               libgconf2-dev (>= 1.2.0),
21
 
               libtelepathy-glib-dev (>= 0.14.1),
 
18
               libglib2.0-dev (>= 2.28),
 
19
               libgtk-3-dev (>= 3.0.2),
 
20
               libtelepathy-glib-dev (>= 0.14.3),
22
21
               libtelepathy-logger-dev (>= 0.2.0),
23
 
               libebook1.2-dev,
24
22
               intltool,
25
23
               libenchant-dev (>= 1.2.0),
26
24
               iso-codes,
27
 
               libgnutls-dev (>= 2.8.5),
 
25
               libebook1.2-dev,
28
26
               xsltproc,
29
27
               gnome-doc-utils (>= 0.17.3),
30
 
               libcanberra-gtk-dev (>= 0.4),
31
 
               libnotify4-dev (>= 0.7.0),
 
28
               libcanberra-gtk3-dev,
 
29
               libnotify-dev (>= 0.7.0),
32
30
               libx11-dev,
33
31
               libgstfarsight0.10-dev,
34
32
               libdbus-glib-1-dev,
37
35
               libgstreamer-plugins-base0.10-dev,
38
36
               libnm-glib-dev (>= 0.7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
39
37
               libnm-util-dev (>= 0.7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
40
 
               libwebkitgtk-dev,
41
38
               libgnome-keyring-dev (>= 2.26.0),
42
 
               libgcr-dev (>= 2.26.0),
43
 
               libunique-dev (>= 1.1.2),
44
 
               nautilus-sendto (>= 2.31.7),
 
39
               libgcr-3-dev (>= 2.91.4),
45
40
               libfolks-dev (>= 0.4.0),
46
41
               libfolks-telepathy-dev (>= 0.4.0),
47
 
               libindicate-dev (>= 0.4.91),
48
 
               libindicate-gtk-dev (>= 0.4.91),
49
 
               libido-0.1-dev,
50
 
               liblaunchpad-integration-dev (>= 0.1.17),
 
42
               libgnutls-dev (>= 2.8.5),
 
43
               libwebkitgtk-3.0-dev (>= 1.3.2),
 
44
               libgnome-control-center-dev (>= 2.91),
 
45
               gsettings-desktop-schemas-dev,
 
46
               nautilus-sendto (>= 2.90),
 
47
               liblaunchpad-integration-3.0-dev,
51
48
               libunity-dev (>= 3.8.4)
52
49
Standards-Version: 3.9.1
53
50
Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/empathy/ubuntu
59
56
         ${misc:Depends},
60
57
         empathy-common (= ${source:Version}),
61
58
         telepathy-mission-control-5,
 
59
         gsettings-desktop-schemas,
62
60
         gnome-icon-theme (>= 2.30.0),
 
61
         telepathy-logger,
63
62
         dbus-x11,
64
 
         telepathy-logger
 
63
         dconf-gsettings-backend | gsettings-backend
65
64
Recommends: telepathy-gabble,
66
65
            telepathy-salut,
67
 
            libdconf0,
68
66
            gvfs-backends,
 
67
            nautilus-sendto-empathy,
69
68
            telepathy-haze,
70
69
            telepathy-butterfly,
71
 
            nautilus-sendto-empathy
72
 
Suggests: telepathy-idle,
73
 
          vino
 
70
            telepathy-indicator
 
71
Suggests: vino,
 
72
          telepathy-idle
74
73
Replaces: libempathy-gtk-common
75
74
Breaks: telepathy-butterfly (<< 0.5.10)
76
75
Description: GNOME multi-protocol chat and call client
113
112
 
114
113
Package: nautilus-sendto-empathy
115
114
Architecture: any
116
 
Depends: ${shlibs:Depends}, ${misc:Depends}, empathy-common (= ${source:Version})
 
115
Depends: ${shlibs:Depends},
 
116
         ${misc:Depends},
 
117
         empathy-common (= ${source:Version})
117
118
Recommends: nautilus-sendto (>= 2.28.2-2)
118
119
Replaces: nautilus-sendto (<< 2.28.2-2)
119
120
Breaks: nautilus-sendto (<< 2.28.2-2)