← Back to branch summary

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

« back to all changes in this revision

Viewing changes to panels/Makefile.in

  • 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
https://launchpad.net/bugs/1004973
https://launchpad.net/bugs/1010317
https://launchpad.net/bugs/1013171
https://launchpad.net/bugs/1035219
[ 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:
panels/Makefile.in
1
 
# Makefile.in generated by automake 1.11.3 from Makefile.am.
 
1
# Makefile.in generated by automake 1.12.2 from Makefile.am.
2
2
# @configure_input@
3
3
 
4
 
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
 
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
 
# Foundation, Inc.
 
4
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
5
 
7
6
# This Makefile.in is free software; the Free Software Foundation
8
7
# gives unlimited permission to copy and/or distribute it,
9
8
# with or without modifications, as long as this notice is preserved.
15
14
 
16
15
@SET_MAKE@
17
16
VPATH = @srcdir@
 
17
am__make_dryrun = \
 
18
  { \
 
19
    am__dry=no; \
 
20
    case $$MAKEFLAGS in \
 
21
      *\\[\ \   ]*) \
 
22
        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 
23
          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 
24
      *) \
 
25
        for am__flg in $$MAKEFLAGS; do \
 
26
          case $$am__flg in \
 
27
            *=*|--*) ;; \
 
28
            *n*) am__dry=yes; break;; \
 
29
          esac; \
 
30
        done;; \
 
31
    esac; \
 
32
    test $$am__dry = yes; \
 
33
  }
18
34
pkgdatadir = $(datadir)/@PACKAGE@
19
35
pkgincludedir = $(includedir)/@PACKAGE@
20
36
pkglibdir = $(libdir)/@PACKAGE@
33
49
POST_UNINSTALL = :
34
50
build_triplet = @build@
35
51
host_triplet = @host@
36
 
@BUILD_PRINTERS_TRUE@am__append_1 = printers
37
 
@BUILD_NETWORK_TRUE@am__append_2 = network
38
 
@BUILD_BLUETOOTH_TRUE@am__append_3 = bluetooth
 
52
@BUILD_WACOM_TRUE@am__append_1 = wacom
 
53
@BUILD_PRINTERS_TRUE@am__append_2 = printers
 
54
@BUILD_NETWORK_TRUE@am__append_3 = network
 
55
@BUILD_BLUETOOTH_TRUE@am__append_4 = bluetooth
39
56
subdir = panels
40
57
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
41
58
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
49
66
CONFIG_HEADER = $(top_builddir)/config.h
50
67
CONFIG_CLEAN_FILES =
51
68
CONFIG_CLEAN_VPATH_FILES =
 
69
AM_V_P = $(am__v_P_@AM_V@)
 
70
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 
71
am__v_P_0 = false
 
72
am__v_P_1 = :
52
73
AM_V_GEN = $(am__v_GEN_@AM_V@)
53
74
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
54
 
am__v_GEN_0 = @echo "  GEN   " $@;
 
75
am__v_GEN_0 = @echo "  GEN     " $@;
 
76
am__v_GEN_1 = 
55
77
AM_V_at = $(am__v_at_@AM_V@)
56
78
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
57
79
am__v_at_0 = @
 
80
am__v_at_1 = 
58
81
SOURCES =
59
82
DIST_SOURCES =
60
83
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
64
87
        install-pdf-recursive install-ps-recursive install-recursive \
65
88
        installcheck-recursive installdirs-recursive pdf-recursive \
66
89
        ps-recursive uninstall-recursive
 
90
am__can_run_installinfo = \
 
91
  case $$AM_UPDATE_INFO_DIR in \
 
92
    n|no|NO) false;; \
 
93
    *) (install-info --version) >/dev/null 2>&1;; \
 
94
  esac
67
95
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
68
96
  distclean-recursive maintainer-clean-recursive
69
97
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
168
196
ISOCODES_LIBS = @ISOCODES_LIBS@
169
197
KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@
170
198
KEYBOARD_PANEL_LIBS = @KEYBOARD_PANEL_LIBS@
 
199
KRB5_CFLAGS = @KRB5_CFLAGS@
 
200
KRB5_CONFIG = @KRB5_CONFIG@
 
201
KRB5_LIBS = @KRB5_LIBS@
171
202
LD = @LD@
172
203
LDFLAGS = @LDFLAGS@
173
204
LIBGNOME_CONTROL_CENTER_CFLAGS = @LIBGNOME_CONTROL_CENTER_CFLAGS@
251
282
XF86MISC_LIBS = @XF86MISC_LIBS@
252
283
XGETTEXT = @XGETTEXT@
253
284
XMKMF = @XMKMF@
 
285
XSLTPROC = @XSLTPROC@
254
286
X_CFLAGS = @X_CFLAGS@
255
287
X_EXTRA_LIBS = @X_EXTRA_LIBS@
256
288
X_LIBS = @X_LIBS@
311
343
top_srcdir = @top_srcdir@
312
344
SUBDIRS = common background screen power color display mouse \
313
345
        online-accounts region info sound keyboard universal-access \
314
 
        user-accounts datetime wacom $(am__append_1) $(am__append_2) \
315
 
        $(am__append_3)
 
346
        user-accounts datetime $(am__append_1) $(am__append_2) \
 
347
        $(am__append_3) $(am__append_4)
316
348
all: all-recursive
317
349
 
318
350
.SUFFIXES:
354
386
        -rm -rf .libs _libs
355
387
 
356
388
# This directory's subdirectories are mostly independent; you can cd
357
 
# into them and run `make' without going through this Makefile.
358
 
# To change the values of `make' variables: instead of editing Makefiles,
359
 
# (1) if the variable is set in `config.status', edit `config.status'
360
 
#     (which will cause the Makefiles to be regenerated when you run `make');
361
 
# (2) otherwise, pass the desired values on the `make' command line.
362
 
$(RECURSIVE_TARGETS):
 
389
# into them and run 'make' without going through this Makefile.
 
390
# To change the values of 'make' variables: instead of editing Makefiles,
 
391
# (1) if the variable is set in 'config.status', edit 'config.status'
 
392
#     (which will cause the Makefiles to be regenerated when you run 'make');
 
393
# (2) otherwise, pass the desired values on the 'make' command line.
 
394
$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
363
395
        @fail= failcom='exit 1'; \
364
396
        for f in x $$MAKEFLAGS; do \
365
397
          case $$f in \
369
401
        done; \
370
402
        dot_seen=no; \
371
403
        target=`echo $@ | sed s/-recursive//`; \
372
 
        list='$(SUBDIRS)'; for subdir in $$list; do \
 
404
        case "$@" in \
 
405
          distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
 
406
          *) list='$(SUBDIRS)' ;; \
 
407
        esac; \
 
408
        for subdir in $$list; do \
373
409
          echo "Making $$target in $$subdir"; \
374
410
          if test "$$subdir" = "."; then \
375
411
            dot_seen=yes; \
383
419
        if test "$$dot_seen" = "no"; then \
384
420
          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
385
421
        fi; test -z "$$fail"
386
 
 
387
 
$(RECURSIVE_CLEAN_TARGETS):
388
 
        @fail= failcom='exit 1'; \
389
 
        for f in x $$MAKEFLAGS; do \
390
 
          case $$f in \
391
 
            *=* | --[!k]*);; \
392
 
            *k*) failcom='fail=yes';; \
393
 
          esac; \
394
 
        done; \
395
 
        dot_seen=no; \
396
 
        case "$@" in \
397
 
          distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
398
 
          *) list='$(SUBDIRS)' ;; \
399
 
        esac; \
400
 
        rev=''; for subdir in $$list; do \
401
 
          if test "$$subdir" = "."; then :; else \
402
 
            rev="$$subdir $$rev"; \
403
 
          fi; \
404
 
        done; \
405
 
        rev="$$rev ."; \
406
 
        target=`echo $@ | sed s/-recursive//`; \
407
 
        for subdir in $$rev; do \
408
 
          echo "Making $$target in $$subdir"; \
409
 
          if test "$$subdir" = "."; then \
410
 
            local_target="$$target-am"; \
411
 
          else \
412
 
            local_target="$$target"; \
413
 
          fi; \
414
 
          ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
415
 
          || eval $$failcom; \
416
 
        done && test -z "$$fail"
417
422
tags-recursive:
418
423
        list='$(SUBDIRS)'; for subdir in $$list; do \
419
424
          test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
422
427
        list='$(SUBDIRS)'; for subdir in $$list; do \
423
428
          test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
424
429
        done
 
430
cscopelist-recursive:
 
431
        list='$(SUBDIRS)'; for subdir in $$list; do \
 
432
          test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
 
433
        done
425
434
 
426
435
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
427
436
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
485
494
          && $(am__cd) $(top_srcdir) \
486
495
          && gtags -i $(GTAGS_ARGS) "$$here"
487
496
 
 
497
cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
 
498
        list='$(SOURCES) $(HEADERS) $(LISP)'; \
 
499
        case "$(srcdir)" in \
 
500
          [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 
501
          *) sdir=$(subdir)/$(srcdir) ;; \
 
502
        esac; \
 
503
        for i in $$list; do \
 
504
          if test -f "$$i"; then \
 
505
            echo "$(subdir)/$$i"; \
 
506
          else \
 
507
            echo "$$sdir/$$i"; \
 
508
          fi; \
 
509
        done >> $(top_builddir)/cscope.files
 
510
 
488
511
distclean-tags:
489
512
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
490
513
 
520
543
        done
521
544
        @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
522
545
          if test "$$subdir" = .; then :; else \
523
 
            test -d "$(distdir)/$$subdir" \
524
 
            || $(MKDIR_P) "$(distdir)/$$subdir" \
525
 
            || exit 1; \
526
 
          fi; \
527
 
        done
528
 
        @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
529
 
          if test "$$subdir" = .; then :; else \
 
546
            $(am__make_dryrun) \
 
547
              || test -d "$(distdir)/$$subdir" \
 
548
              || $(MKDIR_P) "$(distdir)/$$subdir" \
 
549
              || exit 1; \
530
550
            dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
531
551
            $(am__relativize); \
532
552
            new_distdir=$$reldir; \
647
667
 
648
668
uninstall-am:
649
669
 
650
 
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
651
 
        install-am install-strip tags-recursive
 
670
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
 
671
        cscopelist-recursive ctags-recursive install-am install-strip \
 
672
        tags-recursive
652
673
 
653
674
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
654
675
        all all-am check check-am clean clean-generic clean-libtool \
655
 
        ctags ctags-recursive distclean distclean-generic \
656
 
        distclean-libtool distclean-tags distdir dvi dvi-am html \
657
 
        html-am info info-am install install-am install-data \
658
 
        install-data-am install-dvi install-dvi-am install-exec \
659
 
        install-exec-am install-html install-html-am install-info \
660
 
        install-info-am install-man install-pdf install-pdf-am \
661
 
        install-ps install-ps-am install-strip installcheck \
662
 
        installcheck-am installdirs installdirs-am maintainer-clean \
663
 
        maintainer-clean-generic mostlyclean mostlyclean-generic \
664
 
        mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
665
 
        uninstall uninstall-am
 
676
        cscopelist cscopelist-recursive ctags ctags-recursive \
 
677
        distclean distclean-generic distclean-libtool distclean-tags \
 
678
        distdir dvi dvi-am html html-am info info-am install \
 
679
        install-am install-data install-data-am install-dvi \
 
680
        install-dvi-am install-exec install-exec-am install-html \
 
681
        install-html-am install-info install-info-am install-man \
 
682
        install-pdf install-pdf-am install-ps install-ps-am \
 
683
        install-strip installcheck installcheck-am installdirs \
 
684
        installdirs-am maintainer-clean maintainer-clean-generic \
 
685
        mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 
686
        ps ps-am tags tags-recursive uninstall uninstall-am
666
687
 
667
688
 
668
689
-include $(top_srcdir)/git.mk