~ubuntu-branches/ubuntu/saucy/gnome-control-center/saucy-proposed

« back to all changes in this revision

Viewing changes to panels/sound-nua/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Sebastien Bacher, Robert Ancell, Iain Lane, Edward Donovan, Rico Tzschichholz, Jeremy Bicha, David Henningsson
  • Date: 2012-11-21 19:32:45 UTC
  • mfrom: (1.1.63)
  • Revision ID: package-import@ubuntu.com-20121121193245-mj61nzz1z4fk3z25
Tags: 1:3.6.3-0ubuntu1
[ Sebastien Bacher ]
* New upstream version
* debian/control.in: recommends libcanberra-pulse (lp: #1004973)
* debian/patches/58_ubuntu_icon_views_redesign.patch:
  - drop most of the changes, keep the different grid size though
    to fit on screen with our extra icons
* debian/patches/91_dont_show_in_unity.patch:
  - dropped, show the upstream printer panel and the layout tab
* debian/patches/revert_git_keyboard_gsettings.patch,
  debian/patches/revert_git_stop_using_gconf.patch:
  - dropped the gconf->gsettings reverts

[ Robert Ancell ]
* New upstream release (LP: #1010317)
* debian/control:
  - Bump build-depends on libgnome-desktop-3-dev, libwacom-dev
  - Add build-depends on libclutter-1.0-dev, libclutter-gtk-1.0-dev,
    libpwquality-dev
  - Drop build-depends on libgnomekbd-dev
* debian/patches/60_ubuntu_nav_bar.patch:
  - Disabled for now, doesn't apply
* debian/patches/revert_ua_gsettings.patch:
  - We can use GSettings for universal access now
* debian/patches/00git_online_accounts_gtkgrid.patch:
* debian/patches/00git_online_accounts_layout.part:
* debian/patches/git_wacom_translations.patch:
  - Applied upstream

[ Iain Lane ]
* Add Build-Depends on libxkbfile-dev
* New upstream release.
* Refresh all patches to apply cleanly.

[ Edward Donovan ]
* debian/source_gnome-control-center.py: Fix for Python 3. (LP: #1013171)

[ Rico Tzschichholz ]
* debian/control.in:
  - Build-depend on gtk-doc-tools instead of docbook directly
  - Bump minimum glib-2.0, gnome-desktop3, gnome-settings-daemon
     and gsettings-desktop-schemas

[ Jeremy Bicha ]
* Dropped more patches applied in new version:
  - git_unmute_sound_event.patch
  - git_fix_big_editable_labels.patch
  - 96_sound_nua_panel.patch
* debian/patches/04_new_appearance_settings.patch:
  - Dropped, this is now packaged separately as gnome-control-center-unity
* debian/patches/10_keyboard_layout_on_unity.patch:
  - Don't change the keyboard panel name when not running Unity
* debian/patches/52_ubuntu_language_list_mods.patch:
  - Don't disable adding current language to the list. While this
    fix shows the current language twice, at least it avoids the
    "Ubuntu suddenly in Chinese" bug (LP: #1035219)
* debian/patches/53_use_ubuntu_help.patch:
  - Only show Ubuntu help when running Unity
* debian/patches/58_hide_gdm_notifications.patch:
  - Hide "Show notifications when locked" settings when running Unity
    since it's a GNOME Shell-specific feature
* debian/patches/63_normal_scrollbar_in_a11y.patch:
  - Drop, overlay-scrollbars should handle this instead
* debian/patches/91_dont_show_in_unity.patch:
  - Hide Printers & Region panels in Unity until we're ready to switch
    to them.
* debian/patches/fix-crash-on-user-panel.patch:
  - Dropped, GNOME says it's obsolete
* debian/rules:
  - Build with -z,defs again
  - Explicitly disable ibus support since ibus 1.4 isn't supported in
    this version
* debian/control.in:
  - Drop ubuntu-docs and gnome-user-guide from recommends to suggests
  - Don't recommend indicators; let's leave that to Unity

[ David Henningsson ]
* sound_nua_panel.patch: Rebase to gnome 3.6 

Show diffs side-by-side

added added

removed removed

Lines of Context:
7
7
ccpanelsdir = $(PANELS_DIR)
8
8
ccpanels_LTLIBRARIES = libsoundnua.la
9
9
 
10
 
AM_CPPFLAGS =                                   \
11
 
        $(PANEL_CFLAGS)                         \
12
 
        $(SOUND_PANEL_CFLAGS)                   \
13
 
        -DLOCALE_DIR=\""$(datadir)/locale"\"    \
14
 
        -DLIBEXECDIR=\"$(libexecdir)\"          \
15
 
        -DGLADEDIR=\""$(pkgdatadir)"\"          \
 
10
AM_CPPFLAGS =                                           \
 
11
        $(PANEL_CFLAGS)                                 \
 
12
        $(SOUND_PANEL_CFLAGS)                           \
 
13
        -DLOCALE_DIR=\""$(datadir)/locale"\"            \
 
14
        -DLIBEXECDIR=\"$(libexecdir)\"                  \
 
15
        -DGLADEDIR=\""$(pkgdatadir)"\"                  \
16
16
        -DSOUND_DATA_DIR="\"$(datadir)/sounds\""        \
17
17
        -DSOUND_SET_DIR="\"$(pkgdatadir)/sounds\""      \
18
 
        -DICON_DATA_DIR="\"$(pkgdatadir)/icons\"" \
19
 
        $(NULL)
20
 
 
21
 
noinst_LTLIBRARIES = libgnomevolumecontrol.la
22
 
libgnomevolumecontrol_la_SOURCES =              \
23
 
        gvc-mixer-card.h                        \
24
 
        gvc-mixer-card.c                        \
25
 
        gvc-mixer-card-private.h                \
26
 
        gvc-mixer-stream.h                      \
27
 
        gvc-mixer-stream.c                      \
28
 
        gvc-mixer-stream-private.h              \
29
 
        gvc-mixer-ui-device.h                   \
30
 
        gvc-mixer-ui-device.c                   \
31
 
        gvc-channel-map.h                       \
32
 
        gvc-channel-map.c                       \
33
 
        gvc-channel-map-private.h               \
34
 
        gvc-mixer-sink.h                        \
35
 
        gvc-mixer-sink.c                        \
36
 
        gvc-mixer-source.h                      \
37
 
        gvc-mixer-source.c                      \
38
 
        gvc-mixer-sink-input.h                  \
39
 
        gvc-mixer-sink-input.c                  \
40
 
        gvc-mixer-source-output.h               \
41
 
        gvc-mixer-source-output.c               \
42
 
        gvc-mixer-event-role.h                  \
43
 
        gvc-mixer-event-role.c                  \
44
 
        gvc-mixer-control.h                     \
45
 
        gvc-mixer-control.c                     \
46
 
        gvc-mixer-control-private.h             \
47
 
        gvc-channel-bar.h                       \
48
 
        gvc-channel-bar.c                       \
49
 
        gvc-pulseaudio-fake.h                   \
 
18
        -DICON_DATA_DIR="\"$(pkgdatadir)/icons\""       \
 
19
        -I../sound                                      \
50
20
        $(NULL)
51
21
 
52
22
libsoundnua_la_LIBADD =                         \
53
23
        -lm                                     \
54
 
        libgnomevolumecontrol.la                \
 
24
        ../sound/libgnomevolumecontrol.la       \
55
25
        $(PANEL_LIBS)                           \
56
26
        $(SOUND_PANEL_LIBS)                     \
57
27
        $(NULL)
58
28
 
59
 
libsoundnua_la_LDFLAGS =                                \
 
29
libsoundnua_la_LDFLAGS =                        \
60
30
        $(PANEL_LDFLAGS)                        \
61
31
        $(NULL)
62
32
 
63
 
libsoundnua_la_SOURCES =                                \
 
33
libsoundnua_la_SOURCES =                        \
64
34
        gvc-balance-bar.h                       \
65
35
        gvc-balance-bar.c                       \
66
36
        gvc-mixer-dialog.h                      \
67
37
        gvc-mixer-dialog.c                      \
68
 
        gvc-level-bar.h                         \
69
 
        gvc-level-bar.c                         \
70
 
        gvc-combo-box.h                         \
71
 
        gvc-combo-box.c                         \
72
 
        gvc-speaker-test.h                      \
73
 
        gvc-speaker-test.c                      \
74
 
        gvc-sound-theme-chooser.c               \
75
 
        gvc-sound-theme-chooser.h               \
76
 
        sound-theme-file-utils.c                \
77
 
        sound-theme-file-utils.h                \
 
38
        ../sound/gvc-level-bar.h                \
 
39
        ../sound/gvc-level-bar.c                \
 
40
        ../sound/gvc-combo-box.h                \
 
41
        ../sound/gvc-combo-box.c                \
 
42
        ../sound/gvc-speaker-test.h             \
 
43
        ../sound/gvc-speaker-test.c             \
 
44
        ../sound/gvc-sound-theme-chooser.c      \
 
45
        ../sound/gvc-sound-theme-chooser.h      \
 
46
        ../sound/sound-theme-file-utils.c       \
 
47
        ../sound/sound-theme-file-utils.h       \
78
48
        cc-sound-panel.c                        \
79
49
        cc-sound-panel.h                        \
80
50
        $(NULL)