← Back to branch summary

~darkxst/ubuntu/saucy/gnome-shell/upstart_log

« back to all changes in this revision

Viewing changes to .pc/calendar-remove-strict-check.patch/src/Makefile-calendar-server.am

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-05-31 12:01:12 UTC
  • mfrom: (1.1.49) (19.1.36 experimental)
  • Revision ID: package-import@ubuntu.com-20130531120112-ew91khxf051x9i2r
Tags: 3.8.2-1ubuntu1
https://launchpad.net/bugs/1185869
https://launchpad.net/bugs/1185721
https://launchpad.net/bugs/1064584
* Merge with Debian (LP: #1185869, #1185721). Remaining changes:
  - debian/control.in:
    + Build-depend on libsystemd-login-dev & libsystemd-daemon-dev
    + Depend on gdm instead of gdm3
    + Don't recommend gnome-session-fallback
  - debian/patches/40_change-pam-name-to-match-gdm.patch:
  - debian/patches/revert-suspend-break.patch:
    + Disabled, not needed on Ubuntu
  - debian/patches/ubuntu-lightdm-user-switching.patch:
    + Allow user switching when using LightDM. Thanks Gerhard Stein
      for rebasing against gnome-shell 3.8!
  - debian/patches/ubuntu_lock_on_suspend.patch
    + Respect Ubuntu's lock-on-suspend setting.
      Disabled until it can be rewritten.
  - debian/patches/git_relock_screen_after_crash.patch:
    + Add Upstream fix for unlocked session after crash (LP: #1064584)
* Note that the new GNOME Classic mode (which requires installing
  gnome-shell-extensions) won't work until gnome-session 3.8 is
  available in Ubuntu

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/calendar-remove-strict-check.patch/src/Makefile-calendar-server.am
1
 
service_in_files += calendar-server/org.gnome.Shell.CalendarServer.service.in
2
 
 
3
 
libexec_PROGRAMS += gnome-shell-calendar-server
4
 
 
5
 
gnome_shell_calendar_server_SOURCES =                                                           \
6
 
        calendar-server/calendar-debug.h                                                        \
7
 
        calendar-server/calendar-sources.c              calendar-server/calendar-sources.h      \
8
 
        calendar-server/gnome-shell-calendar-server.c                                           \
9
 
        $(NULL)
10
 
 
11
 
desktopdir=$(datadir)/applications
12
 
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
13
 
desktop_in_files = calendar-server/evolution-calendar.desktop.in
14
 
 
15
 
@INTLTOOL_DESKTOP_RULE@
16
 
 
17
 
gnome_shell_calendar_server_CFLAGS =            \
18
 
        -I$(top_srcdir)/src                     \
19
 
        -DPREFIX=\""$(prefix)"\"                \
20
 
        -DLIBDIR=\""$(libdir)"\"                \
21
 
        -DDATADIR=\""$(datadir)"\"              \
22
 
        -DG_DISABLE_DEPRECATED                  \
23
 
        -DG_LOG_DOMAIN=\"ShellCalendarServer\"  \
24
 
        $(CALENDAR_SERVER_CFLAGS)               \
25
 
        $(NULL)
26
 
 
27
 
gnome_shell_calendar_server_LDFLAGS =           \
28
 
        $(CALENDAR_SERVER_LIBS)                 \
29
 
        $(NULL)
30
 
 
31
 
EXTRA_DIST +=                                                     \
32
 
        calendar-server/README                                    \
33
 
        calendar-server/org.gnome.Shell.CalendarServer.service.in \
34
 
        $(NULL)
35
 
 
36
 
CLEANFILES += \
37
 
        $(desktop_DATA)