← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gdm/trusty-proposed

« back to all changes in this revision

Viewing changes to data/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha, Tim Lunn, Jeremy Bicha, Robert Ancell
  • Date: 2013-05-31 22:36:08 UTC
  • mfrom: (1.4.55)
  • Revision ID: package-import@ubuntu.com-20130531223608-33uo85niksee5460
Tags: 3.8.1.1-0ubuntu1
[ Tim Lunn ]
* New upstream release
* debian/patches/ubuntu_dont_catch_sigsegv.patch:
  - Dropped, obsolete
* debian/rules:
  - Don't rename gdm binary since that's already been
    done in the new version

[ Jeremy Bicha ]
* debian/control.in: Bump minimum glib
* debian/watch: Watch for unstable releases
* debian/patches/00git_logind_check.patch:
  - Dropped, applied in new release
* debian/patches/08_frequent-users_greeter.patch: Refreshed

[ Robert Ancell ]
* New upstream release
* debian/patches/ubuntu_daemon_autologin_tracking.patch:
* debian/patches/ubuntu_ensure_dirs.patch:
* debian/patches/ubuntu_slave-only-set-up-autologin.patch:
  - Applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/Makefile.am
80
80
                -e 's,[@]sbindir[@],$(sbindir),g' \
81
81
                <$(srcdir)/gdm.schemas.in.in >gdm.schemas.in
82
82
 
83
 
gdm-shell.session: $(srcdir)/gdm-shell.session.in
 
83
if ENABLE_FALLBACK_GREETER
 
84
FALLBACK_SESSION_IN = $(srcdir)/gdm-shell-with-fallback.session.in
 
85
else
 
86
FALLBACK_SESSION_IN = $(srcdir)/gdm-shell.session.in
 
87
endif
 
88
 
 
89
EXTRA_DIST += gdm-shell.session.in gdm-shell-with-fallback.session.in
 
90
 
 
91
gdm-shell.session: $(FALLBACK_SESSION_IN)
84
92
        sed     -e 's,[@]libexecdir[@],$(libexecdir),g' \
85
93
                -e 's,[@]CHECK_ACCELERATED_DIR[@],$(CHECK_ACCELERATED_DIR),g' \
86
 
                < $(srcdir)/gdm-shell.session.in > gdm-shell.session
 
94
                < $< > $@.tmp && mv $@.tmp $@
87
95
 
88
96
localealiasdir = $(datadir)/gdm
89
97
localealias_DATA = locale.alias
97
105
        pam-redhat/gdm-fingerprint.pam          \
98
106
        pam-redhat/gdm-smartcard.pam            \
99
107
        pam-redhat/gdm-password.pam             \
 
108
        pam-redhat/gdm-pin.pam                  \
100
109
        $(NULL)
101
110
EXTRA_DIST += $(pam_redhat_files)
102
111
 
103
112
pam_openembedded_files = pam-openembedded/gdm.pam       \
104
113
        pam-openembedded/gdm-autologin.pam              \
105
114
        pam-openembedded/gdm-launch-environment.pam     \
 
115
        pam-openembedded/gdm-pin.pam                    \
106
116
        $(NULL)
107
117
EXTRA_DIST += $(pam_openembedded_files)
108
118
 
111
121
        pam-exherbo/gdm-fingerprint.pam          \
112
122
        pam-exherbo/gdm-smartcard.pam            \
113
123
        pam-exherbo/gdm-password.pam             \
 
124
        pam-exherbo/gdm-pin.pam                  \
114
125
        $(NULL)
115
126
EXTRA_DIST += $(pam_exherbo_files)
116
127
 
120
131
        pam-lfs/gdm-fingerprint.pam             \
121
132
        pam-lfs/gdm-smartcard.pam               \
122
133
        pam-lfs/gdm-password.pam                \
 
134
        pam-lfs/gdm-pin.pam                     \
123
135
        $(NULL)
124
136
EXTRA_DIST += $(pam_lfs_files)
125
137
 
149
161
        PreSession.in           \
150
162
        PostSession.in          \
151
163
        PostLogin               \
152
 
        gdm-shell.session.in    \
153
164
        dconf-profile \
154
165
        00-upstream-settings \
155
166
        00-upstream-settings-locks \