~kroq-gar78/ubuntu/precise/gnome-control-center/fix-885947

« back to all changes in this revision

Viewing changes to debian/control

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2012-01-15 13:55:05 UTC
  • mfrom: (0.1.15 sid)
  • Revision ID: package-import@ubuntu.com-20120115135505-42eak1svpn6j9afc
Tags: 1:3.2.2-2ubuntu1
* Rebase on Debian, remaining Ubuntu changes:
* debian/control:
  - Build-Depend on hardening-wrapper, dpkg-dev and dh-autoreconf
  - Add dependency on ubuntu-system-service
  - Don't depend on cheese, cups-pk-helper, libsocialweb, or mesa-utils
    since they're in universe
  - Depend on ubuntu-docs instead of gnome-user-guide
* debian/rules:
  - Add binary-post-install rule for gnome-control-center-data
  - Don't build with cheese or libsocialweb
* debian/gnome-control-center-data.install:
* debian/source/include-binaries:
  - Install UbuntuLogo.png & apport hook
* debian/gnome-control-center.dirs:
* debian/gnome-control-center.links:
  - Add a link to the control center shell for indicators
* debian/patches/04_add_theme_selection.patch:
  - Add theme selection to User Interface panel
  - Refreshed for Precise design and renamed to User Interface
* debian/patches/01_allow_external_panels.patch:
  - Allow running external (non-embedded) panels (LP: #787694)
* debian/patches/02_no_assert_on_null_streams.patch:
  - Temporary patch to not assert on NULL streams (LP: #741155)
* debian/patches/03_show_wacom_under_unity.patch:
  - show the wacom panel under unity (lp: #840555)
* debian/patches/05_run_update_manager.patch:
  - Run update-manager instead of PackageKit updater (LP: #801335)
* debian/patches/07_make_window_wider.patch
  - Make the System Settings window a bit wider to reduce need for scrolling
* debian/patches/10_keyboard_layout_on_unity.patch:
  - Show keyboard layout bits on Unity (LP: #834523)
* Add 11_power-configure_lid_action.patch: Add back configuration for lid
  action. (LP: #792636, GNOME#659045)
* debian/patches/12_add_never_turn_screen_off.patch:
  - Add back the "never turn screen off" option (LP: #862154)
* debian/patches/50_ubuntu_systemwide_prefs.patch:
  - Add back system-wide proxy settings (LP: #795519)
* debian/patches/52_ubuntu_language_list_mods.patch:
  - Change the list of options, when setting language from User
    Accounts, to items representing available translations, and with
    that make it similar to the language list in language-selector.
  - Make items representing language @variants be displayed as such.
* debian/patches/53_use_ubuntu_help.patch: Use gnome-help when running
  GNOME or GNOME Fallback (LP: #852911)
* debian/patches/55_user_accounts_hide_controls.patch:
  - When not using GDM, hide certain controls in the User Accounts
    panel that only apply to it.  (LP: #821766, LP: #821771)
  - When a user is using an ecryptfs home directory, do not allow
    the user to log in without a password
* debian/patches/56_use_ubuntu_info_branding.patch:
  - Use Ubuntu branding in System info panel (LP: #860497)
* debian/patches/57_use_nonsymbolic_keyboard_icon.patch: Use the non-monochrome
  icon for the Keyboard panel (LP: #862027)
* debian/patches/90_git_sound_tab_order.patch: Reorder the tabs, the sound 
  effect one is the less used and shouldn't be first in the list
* debian/patches/91_git_build_use_fontconfig.patch:
  - git patch to fix the build of the region capplet
* debian/patches/92_git_minimal_output_height.patch:
  - set a minimal height on the output list (lp: #850032)

Show diffs side-by-side

added added

removed removed

Lines of Context:
8
8
Priority: optional
9
9
Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
10
10
XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
11
 
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
12
 
Standards-Version: 3.9.1
13
 
Build-Depends: cdbs (>= 0.4.41),
14
 
               hardening-wrapper,
15
 
               gnome-pkg-tools (>= 0.10),
16
 
               gnome-common,
17
 
               dpkg-dev (>= 1.13.19),
18
 
               debhelper (>= 5.0.0),
 
11
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Frederic Peters <fpeters@debian.org>, Josselin Mouette <joss@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
 
12
Standards-Version: 3.9.2
 
13
Build-Depends: autotools-dev,
 
14
               cdbs (>= 0.4.41),
 
15
               debhelper (>= 8),
 
16
               desktop-file-utils,
 
17
               dh-autoreconf,
19
18
               docbook-to-man,
20
19
               docbook-xml,
21
 
               autotools-dev,
22
 
               dh-autoreconf,
 
20
               gnome-common,
23
21
               gnome-doc-utils (>= 0.3.2),
 
22
               gnome-pkg-tools (>= 0.10),
 
23
               gnome-settings-daemon-dev (>= 2.91.94),
 
24
               gsettings-desktop-schemas-dev (>= 3.0.2),
 
25
               hardening-wrapper,
24
26
               intltool (>= 0.37.1),
25
 
               libx11-dev,
26
27
               libcanberra-gtk3-dev,
27
 
               libgtk-3-dev (>= 3.0.2),
 
28
#               libcheese-gtk-dev (>= 2.91.91.1),
 
29
               libcolord-dev,
 
30
               libcups2-dev,
 
31
               libdbus-1-dev (>= 0.32),
 
32
               libdbus-glib-1-dev (>= 0.32),
 
33
               libgconf2-dev,
28
34
               libgdk-pixbuf2.0-dev (>= 2.23.0),
29
35
               libglib2.0-dev (>= 2.29.14),
30
 
               libgconf2-dev,
31
 
               libgnome-desktop-3-dev (>= 2.91.0),
 
36
               libgnome-desktop-3-dev (>= 3.1.0),
32
37
               libgnome-menu-3-dev,
33
 
               libdbus-1-dev (>= 0.32),
34
 
               libdbus-glib-1-dev (>= 0.32),
35
 
               libxml2-dev,
36
 
               gnome-settings-daemon-dev (>= 2.91.94),
37
 
               libxft-dev (>= 2.1.2),
38
38
               libgnomekbd-dev (>= 2.91.91),
39
 
               libxklavier-dev (>= 5.1),
40
 
               libupower-glib-dev (>= 0.9.1),
41
 
               desktop-file-utils,
42
 
               shared-mime-info,
 
39
               libgoa-1.0-dev,
43
40
               libgstreamer-plugins-base0.10-dev,
44
 
               gsettings-desktop-schemas-dev (>= 3.0.2),
 
41
               libgtk-3-dev (>= 3.1.19),
 
42
               libgtop2-dev,
 
43
               libnm-glib-dev (>= 0.9) [linux-any],
 
44
               libnm-gtk-dev (>= 0.9) [linux-any],
 
45
               libnm-util-dev (>= 0.9) [linux-any],
 
46
               libnotify-dev (>= 0.7.3),
45
47
               libpolkit-gobject-1-dev (>= 0.97),
46
 
               libcups2-dev,
47
 
               libgtop2-dev,
48
48
               libpulse-dev,
49
 
               libnm-glib-dev (>= 0.8.992),
50
 
               libnm-util-dev (>= 0.8.992),
 
49
#               libsocialweb-client-dev,
 
50
               libupower-glib-dev (>= 0.9.1),
 
51
               libx11-dev,
 
52
               libxft-dev (>= 2.1.2),
 
53
               libxklavier-dev (>= 5.1),
 
54
               libxml2-dev,
51
55
               locales,
52
 
               libgoa-1.0-dev,
53
 
               libcolord-dev,
54
 
               libnotify-dev,
55
 
               libnm-gtk-dev (>= 0.9.1.90-0ubuntu3),
56
 
               network-manager-dev (>= 0.8.992)
 
56
               network-manager-dev (>= 0.9) [linux-any],
 
57
               shared-mime-info
57
58
Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-control-center/ubuntu
58
59
 
59
60
Package: gnome-control-center
60
61
Architecture: any
61
62
Section: gnome
62
 
Depends: ${shlibs:Depends},
63
 
         ${misc:Depends},
 
63
Depends: ${misc:Depends},
 
64
         ${shlibs:Depends},
 
65
         accountsservice,
 
66
         apg,
 
67
         desktop-file-utils,
 
68
         gnome-control-center-data (<< ${gnome:NextVersion}),
64
69
         gnome-control-center-data (>= ${source:Version}),
65
 
         gnome-control-center-data (<< ${gnome:NextVersion}),
 
70
         gnome-desktop3-data,
 
71
         gnome-icon-theme (>= 2.24),
 
72
         gnome-icon-theme-symbolic,
 
73
         gnome-menus (>= 2.12.0),
66
74
         gnome-settings-daemon (>= 3.0.0),
67
 
         gnome-menus (>= 2.12.0),
68
 
         gnome-desktop-data,
69
 
         gnome-icon-theme (>= 2.24),
70
 
         desktop-file-utils,
71
 
         gsettings-desktop-schemas (>= 2.91.92),
72
 
         ubuntu-system-service (>= 0.1.10),
73
 
         accountsservice (>= 0.6.13-1ubuntu2)
74
 
Recommends: ubuntu-docs,
 
75
         gsettings-desktop-schemas (>= 3.0.2),
 
76
         libgnome-control-center1 (= ${binary:Version}),
 
77
         ubuntu-system-service (>= 0.1.10)
 
78
Recommends: gnome-online-accounts,
75
79
            gnome-session,
 
80
            iso-codes,
 
81
#            mesa-utils,
 
82
            mousetweaks,
76
83
            policykit-1-gnome,
77
 
            mousetweaks,
78
 
            iso-codes,
79
 
            apg,
80
 
            gnome-icon-theme-symbolic,
81
 
            gnome-online-accounts
82
 
Conflicts: gnome-session (<< 2.22.0)
83
 
Suggests: libcanberra-gtk-module,
84
 
          gnome-screensaver | xscreensaver,
85
 
          x11-xserver-utils,
86
 
          gstreamer0.10-alsa | gstreamer0.10-audiosink
 
84
            ubuntu-docs
 
85
Breaks: gnome-power-manager (<< 3.0),
 
86
        gnome-session (<< 3.0),
 
87
        libglib2.0-0 (<< 2.28.6-2)
 
88
Suggests: gnome-screensaver | xscreensaver,
 
89
          gstreamer0.10-pulseaudio,
 
90
          libcanberra-gtk-module,
 
91
          x11-xserver-utils
87
92
Description: utilities to configure the GNOME desktop
88
93
 This package contains configuration applets for the GNOME desktop,
89
94
 allowing to set accessibility configuration, desktop fonts, keyboard
107
112
Recommends: gnome-control-center (>= ${source:Version})
108
113
Provides: capplets-data
109
114
Conflicts: capplets-data
110
 
Replaces: capplets-data, 
111
 
          gnome-media-common (<< 2.91), 
112
 
          gnome-settings-daemon (<< 3.0~),
113
 
          gdm (<< 2.91),
114
 
          gnome-power-manager (<< 3.1.90)
115
 
Breaks: gnome-settings-daemon (<< 3.0~)
 
115
Replaces: capplets-data,
 
116
          gdm (<< 3.0),
 
117
          gdm3 (<< 3.0),
 
118
          gnome-media-common (<< 2.91),
 
119
          gnome-power-manager (<< 3.2),
 
120
          gnome-settings-daemon (<< 3.0)
 
121
Breaks: gdm (<< 3.0),
 
122
        gdm3 (<< 3.0),
 
123
        gnome-power-manager (<< 3.2),
 
124
        gnome-settings-daemon (<< 3.0)
116
125
Description: configuration applets for GNOME - data files
117
126
 This package contains data files (icons, pixmaps, locales files) needed by
118
127
 the configuration applets in the gnome-control-center package.