~ubuntu-branches/ubuntu/hardy/gdm/hardy-updates

« back to all changes in this revision

Viewing changes to pixmaps/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2007-12-11 15:34:43 UTC
  • mfrom: (1.4.22 upstream)
  • Revision ID: james.westby@ubuntu.com-20071211153443-ndi1b5u2d6oybb7p
Tags: 2.20.2-1ubuntu1
* Sync with Debian
* debian/control.in:
  - Breaks on packages using the previous socket location
  - Depend on kbd | console-tools for fgconsole
  - Depends on alsa-utils for gdmplay
  - Recommends ubuntu-artwork | edubuntu-artwork | xubuntu-default-settings, 
    ubuntu-sounds
  - the package in maintained by the desktop team on Ubuntu
* debian/control.in, debian/gdm.dirs, debian/gdm.install:
  - don't install the Debian theme
* debian/gdm.init:
  - use the Ubuntu init version
* debian/gdm.install:
  - list gdmplay binary
* debian/gdm.templates:
  - Fix template to point to /usr/sbin/gdm not /usr/bin. (LP: 129017)
* debian/gdmplay:
  - small asound wrapper
* debian/patches/01_xconfigoptions.patch:
  - patch configure to use "-br" (Ubuntu: #12985).
* debian/patches/01_xrdb_nocpp.patch:
  - call xrdb with the "nocpp" option (Ubuntu: #14268).
* debian/patches/04_menu_changes.patch:
  - don't display some of the menu items
* debian/patches/06_no_conffile_diff_due_to_comment_change.patch:
  - don't change comments to gdm.conf-custom to not get a conffile change
    on upgrade (Ubuntu: #92302)
* debian/patches/08_notify_ck_about_static_server.patch:
  - "Notify ck about initial static server."
* debian/patches/10_noxkeepcrashing.patch:
  - option NoXKeepsCrashing to disable all XKeepsCrashing code.
* debian/patches/11_powermanagement.patch:
  - add hibernate action
  - fix typo in the hibernate command configuration (LP: #151788)
  - make the hibernate action being listed (LP: #151848)
* debian/patches/15_usplash.patch:
  - Log that we're starting up gdm before stopping usplash. If usplash was
    running, don't bother logging successful startup, as it will look
    weird on the console.
  - If usplash was running, wait a short while for the active console to
    change after starting up gdm, to try to avoid visible console noise
    from later init scripts
* debian/patches/16_configure_menu_item.patch:
  - drop the configure option from gdmsetup, it's not sudo friendly
* debian/patches/18_combo_box_language_selector.patch:
  - use a combo box for the language selector
* debian/patches/19_remove_drop_shadows.patch:
  - removed the black drop shadow from GDM windows, 
* debian/patches/20_timedlogindelay_min_value_change.patch:
  - change minimal TimedLoginDelay to 1 (Ubuntu: #84239)
* debian/patches/35_gdm.conf.patch:
  - SuspendCommand=/usr/sbin/pmi action sleep
  - HibernateCommand=/usr/sbin/pmi action hibernate
  - SoundProgram=/usr/lib/gdmplay
  - GtkTheme=Human
  - ConfigAvailable=false
  - BackgroundColor=#dab08
  - GraphicalThemedColor=#dab082
  - use "Browser=true" so the users lists work correctly (LP: 115952)
  - set SoundOnLoginFile value to question.wav (LP: 131601)
* debian/patches/41_config-files.patch:
  - dropped, don't use Debian configuration file location hack
* debian/patches/56_xnest-wrapper.patch:
  - updated
* debian/patches/63_xrandr_virtual.patch:
  - on randr1.0 drivers, set the virtual to the screen resolution in 
    order to avoid panning setups (part of LP: 137517)
* debian/patches/70_mandatory-relibtoolize.patch:
  - updated
* debian/patches/90_workaround_init_color.patch:
  - set the color to use in the PreSession to workaround a bug
* debian/rules:
  - change custom configuration file naming
  - set the standard configuration location
  - specify the correct at-spi directory

Show diffs side-by-side

added added

removed removed

Lines of Context:
111
111
EXEEXT = @EXEEXT@
112
112
EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@
113
113
EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@
114
 
EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@
115
 
EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@
116
114
EXTRA_GDMASKPASS_LIBS = @EXTRA_GDMASKPASS_LIBS@
117
115
EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@
118
 
EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@
119
 
EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@
 
116
EXTRA_NSL_LIB = @EXTRA_NSL_LIB@
 
117
EXTRA_SOCKET_LIB = @EXTRA_SOCKET_LIB@
120
118
F77 = @F77@
121
119
FFLAGS = @FFLAGS@
122
120
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
327
325
BITMAPS = gdm-foot-logo.png nobody.png nohost.png
328
326
pixmap_DATA = $(BITMAPS)
329
327
EXTRA_DIST = $(BITMAPS)
 
328
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
330
329
all: all-recursive
331
330
 
332
331
.SUFFIXES:
608
607
info-am:
609
608
 
610
609
install-data-am: install-pixmapDATA
 
610
        @$(NORMAL_INSTALL)
 
611
        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
611
612
 
612
613
install-dvi: install-dvi-recursive
613
614
 
642
643
ps-am:
643
644
 
644
645
uninstall-am: uninstall-pixmapDATA
 
646
        @$(NORMAL_INSTALL)
 
647
        $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
645
648
 
646
649
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
647
 
        install-strip
 
650
        install-data-am install-strip uninstall-am
648
651
 
649
652
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
650
653
        all all-am check check-am clean clean-generic clean-libtool \
651
654
        ctags ctags-recursive distclean distclean-generic \
652
655
        distclean-libtool distclean-tags distdir dvi dvi-am html \
653
656
        html-am info info-am install install-am install-data \
654
 
        install-data-am install-dvi install-dvi-am install-exec \
655
 
        install-exec-am install-html install-html-am install-info \
656
 
        install-info-am install-man install-pdf install-pdf-am \
657
 
        install-pixmapDATA install-ps install-ps-am install-strip \
658
 
        installcheck installcheck-am installdirs installdirs-am \
659
 
        maintainer-clean maintainer-clean-generic mostlyclean \
660
 
        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
661
 
        tags tags-recursive uninstall uninstall-am \
662
 
        uninstall-pixmapDATA
663
 
 
 
657
        install-data-am install-data-hook install-dvi install-dvi-am \
 
658
        install-exec install-exec-am install-html install-html-am \
 
659
        install-info install-info-am install-man install-pdf \
 
660
        install-pdf-am install-pixmapDATA install-ps install-ps-am \
 
661
        install-strip installcheck installcheck-am installdirs \
 
662
        installdirs-am maintainer-clean maintainer-clean-generic \
 
663
        mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 
664
        ps ps-am tags tags-recursive uninstall uninstall-am \
 
665
        uninstall-hook uninstall-pixmapDATA
 
666
 
 
667
 
 
668
install-data-hook: update-icon-cache
 
669
uninstall-hook: update-icon-cache
 
670
update-icon-cache:
 
671
        @-if test -z "$(DESTDIR)"; then \
 
672
                echo "Updating Gtk icon cache."; \
 
673
                $(gtk_update_icon_cache); \
 
674
        else \
 
675
                echo "*** Icon cache not updated.  After (un)install, run this:"; \
 
676
                echo "***   $(gtk_update_icon_cache)"; \
 
677
        fi
664
678
# Tell versions [3.59,3.63) of GNU make to not export all variables.
665
679
# Otherwise a system limit (for SysV at least) may be exceeded.
666
680
.NOEXPORT: