~darkxst/ubuntu/saucy/gnome-shell/upstart_log

« back to all changes in this revision

Viewing changes to debian/control.in

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-05-31 12:01:12 UTC
  • mfrom: (1.1.49) (19.1.36 experimental)
  • Revision ID: package-import@ubuntu.com-20130531120112-ew91khxf051x9i2r
Tags: 3.8.2-1ubuntu1
* Merge with Debian (LP: #1185869, #1185721). Remaining changes:
  - debian/control.in:
    + Build-depend on libsystemd-login-dev & libsystemd-daemon-dev
    + Depend on gdm instead of gdm3
    + Don't recommend gnome-session-fallback
  - debian/patches/40_change-pam-name-to-match-gdm.patch:
  - debian/patches/revert-suspend-break.patch:
    + Disabled, not needed on Ubuntu
  - debian/patches/ubuntu-lightdm-user-switching.patch:
    + Allow user switching when using LightDM. Thanks Gerhard Stein
      for rebasing against gnome-shell 3.8!
  - debian/patches/ubuntu_lock_on_suspend.patch
    + Respect Ubuntu's lock-on-suspend setting.
      Disabled until it can be rewritten.
  - debian/patches/git_relock_screen_after_crash.patch:
    + Add Upstream fix for unlocked session after crash (LP: #1064584)
* Note that the new GNOME Classic mode (which requires installing
  gnome-shell-extensions) won't work until gnome-session 3.8 is
  available in Ubuntu

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
               gnome-control-center-dev (>= 3.4),
13
13
               gnome-pkg-tools (>= 0.11),
14
14
               gobject-introspection (>= 1.29.15),
15
 
               gsettings-desktop-schemas-dev (>= 3.5.4),
 
15
               gsettings-desktop-schemas-dev (>= 3.7.4),
16
16
               gtk-doc-tools,
17
17
               intltool (>= 0.26),
18
18
               libatk-bridge2.0-dev,
19
19
               libcanberra-dev,
20
 
               libclutter-1.0-dev (>= 1.11.11),
21
 
               libcroco3-dev (>= 0.6),
 
20
               libcanberra-gtk3-dev,
 
21
               libcaribou-dev (>= 0.4.8),
 
22
               libclutter-1.0-dev (>= 1.13.4),
 
23
               libcroco3-dev (>= 0.6.8),
22
24
               libdbus-glib-1-dev,
23
 
               libecal1.2-dev (>= 3.5.3),
24
 
               libedataserver1.2-dev (>= 3.5.3),
 
25
               libecal1.2-dev (>= 3.7.90),
 
26
               libedataserver1.2-dev (>= 3.7.90),
25
27
               libgirepository1.0-dev (>= 1.29.15),
26
 
               libgjs-dev (>= 1.33.2),
 
28
               libgjs-dev (>= 1.35.4),
27
29
               libglib2.0-dev (>= 2.31.6),
28
30
               libgnome-bluetooth-dev (>= 3.5.5) [linux-any],
29
 
               libgnome-desktop-3-dev (>= 3.5.5),
30
 
               libgnome-keyring-dev,
 
31
               libgnome-desktop-3-dev (>= 3.7.90),
 
32
               libsecret-1-dev,
31
33
               libgnome-menu-3-dev (>= 3.5.3),
32
34
               libgstreamer1.0-dev (>= 0.11.92),
33
 
               libgtk-3-dev (>= 3.3.9),
 
35
               libgtk-3-dev (>= 3.7.9),
34
36
               libibus-1.0-dev,
35
 
               libmutter-dev (>= 3.6.2),
36
 
               libnm-glib-dev (>= 0.9) [linux-any],
37
 
               libnm-glib-vpn-dev (>= 0.9) [linux-any],
 
37
               libmutter-dev (>= 3.8.2),
 
38
               libnm-glib-dev (>= 0.9.8) [linux-any],
 
39
               libnm-glib-vpn-dev (>= 0.9.8) [linux-any],
 
40
               libnm-gtk-dev (>= 0.9.6) [linux-any],
38
41
               libnm-util-dev (>= 0.9) [linux-any],
39
42
               libpolkit-agent-1-dev (>= 0.100),
40
 
               libpulse-dev,
 
43
               libpulse-dev (>= 2.0),
41
44
               libstartup-notification0-dev (>= 0.11),
42
45
               libtelepathy-glib-dev (>= 0.17.5),
43
 
               libtelepathy-logger-dev (>= 0.2.4),
44
46
               libsystemd-login-dev,
45
47
               libsystemd-daemon-dev,
46
48
               libx11-dev,
48
50
               libxml2-dev,
49
51
               python (>= 2.6),
50
52
               libgcr-3-dev (>= 3.3.90)
51
 
Standards-Version: 3.9.4
 
53
Standards-Version: 3.9.3
52
54
Homepage: http://live.gnome.org/GnomeShell
53
55
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-shell
54
56
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-shell/
62
64
         gdm (>= 3.5.90),
63
65
         gnome-shell-common (= ${source:Version}),
64
66
         gir1.2-accountsservice-1.0,
65
 
         gir1.2-caribou-1.0,
 
67
         gir1.2-caribou-1.0 (>= 0.4.8),
66
68
         gir1.2-clutter-1.0 (>= 1.11.11),
67
69
         gir1.2-freedesktop,
68
70
         gir1.2-gcr-3,
 
71
         gir1.2-gconf-2.0,
69
72
         gir1.2-gkbd-3.0,
70
73
         gir1.2-glib-2.0 (>= 1.31),
71
74
         gir1.2-gnomebluetooth-1.0 (>= 3.6.0) [linux-any],
72
 
         gir1.2-gnomedesktop-3.0 (>= 3.6.1),
 
75
         gir1.2-gnomedesktop-3.0 (>= 3.7.90),
73
76
         gir1.2-gtk-3.0,
74
77
         gir1.2-ibus-1.0 (>= 1.4),
75
 
         gir1.2-mutter-3.0 (>= 3.5.92),
 
78
         gir1.2-mutter-3.0 (>= 3.8.2),
76
79
         gir1.2-networkmanager-1.0 [linux-any],
 
80
         gir1.2-nmgtk-1.0,
77
81
         gir1.2-pango-1.0,
78
82
         gir1.2-polkit-1.0,
79
83
         gir1.2-soup-2.4 (>= 2.40.1),
80
84
         gir1.2-telepathyglib-0.12,
81
 
         gir1.2-telepathylogger-0.2 (>= 0.4.0-2),
 
85
         gir1.2-telepathylogger-0.2 (>= 0.8.0),
82
86
         gir1.2-upowerglib-1.0,
83
 
         gjs (>= 1.33.2),
 
87
         gjs (>= 1.35.4),
84
88
         gnome-icon-theme-symbolic (>= 2.91),
85
89
         gnome-settings-daemon (>= 3.4.0),
86
90
         gnome-themes-standard,
87
 
         gsettings-desktop-schemas (>= 3.5.4),
 
91
         gsettings-desktop-schemas (>= 3.7.4),
88
92
         python (>= 2.6),
89
93
         telepathy-mission-control-5,
90
 
         evolution-data-server
 
94
         evolution-data-server (>= 3.7.90)
91
95
Recommends: gnome-contacts,
92
96
            gnome-control-center,
93
97
            gnome-user-guide,
95
99
Breaks: fglrx-driver (<< 1:11-10),
96
100
        gnome-control-center (<< 1:3.0),
97
101
        gnome-session (<< 3.0),
98
 
        gnome-tweak-tool (<< 3.5)
 
102
        gnome-tweak-tool (<< 3.5),
 
103
        gdm3 (<< 3.5.90)
99
104
Conflicts: gnome-screensaver (<< 3.6)
100
105
Description: graphical shell for the GNOME desktop
101
106
 The GNOME Shell redefines user interactions with the GNOME desktop.