← Back to branch summary

~psusi/ubuntu/natty/gnome-power-manager/sleep

« back to all changes in this revision

Viewing changes to .pc/12-add-appindicators.patch/src/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2010-07-14 16:19:03 UTC
  • Revision ID: james.westby@ubuntu.com-20100714161903-ji5dlfcj32q854gc
Tags: 2.30.1-1ubuntu2
https://launchpad.net/bugs/604635
* Add 00git-port-to-libupower.patch: Port from libdevkit-power to
  libupower-glib, the former will go away soon.
* debian/control.in: Replace libdevkit-power-gobject-dev with
  libupower-glib-dev build dependency.
* 12-add-appindicators.patch: Update to upower port.
* Add 13-energy-star.patch: Change default timings to be Energy Star 5.0
  compliant, except for automatic suspend on AC (since that might be both
  inconvenient, and suspend might not work at all). (LP: #604635)

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/12-add-appindicators.patch/src/Makefile.am
19
19
        $(CANBERRA_CFLAGS)                              \
20
20
        $(GSTREAMER_CFLAGS)                             \
21
21
        -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE \
22
 
        $(DEVKIT_CFLAGS)                                \
 
22
        $(UPOWER_CFLAGS)                                \
23
23
        -DBINDIR=\"$(bindir)\"                          \
24
24
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
25
25
        -DDATADIR=\"$(datadir)\"                        \
29
29
        -DVERSION="\"$(VERSION)\""                      \
30
30
        -DGPM_DATA=\"$(pkgdatadir)\"                    \
31
31
        -DGTKBUILDERDIR=\"$(pkgdatadir)\"               \
32
 
        -DDKP_DISABLE_DEPRECATED                        \
 
32
        -DUP_DISABLE_DEPRECATED                 \
33
33
        -DEGG_LOG_FILE=\""/tmp/gpm.log"\"               \
34
34
        -DEGG_VERBOSE="\"GPM_VERBOSE\""                 \
35
35
        -DEGG_LOGGING="\"GPM_LOGGING\""                 \
94
94
        libgpmshared.a                                  \
95
95
        $(GLIB_LIBS)                                    \
96
96
        $(X11_LIBS)                                     \
97
 
        $(DEVKIT_LIBS)                                  \
 
97
        $(UPOWER_LIBS)                                  \
98
98
        $(GNOME_LIBS)                                   \
99
99
        $(UNIQUE_LIBS)                                  \
100
100
        $(DBUS_LIBS)                                    \
118
118
        $(DBUS_LIBS)                                    \
119
119
        $(UNIQUE_LIBS)                                  \
120
120
        $(GPM_EXTRA_LIBS)                               \
121
 
        $(DEVKIT_LIBS)                                  \
 
121
        $(UPOWER_LIBS)                                  \
122
122
        -lm
123
123
 
124
124
if HAVE_HAL
190
190
        $(CANBERRA_LIBS)                                \
191
191
        $(LIBNOTIFY_LIBS)                               \
192
192
        $(GPM_EXTRA_LIBS)                               \
193
 
        $(DEVKIT_LIBS)                                  \
 
193
        $(UPOWER_LIBS)                                  \
194
194
        -lm
195
195
 
196
196
if HAVE_HAL
258
258
        $(X11_LIBS)                                     \
259
259
        $(GNOME_LIBS)                                   \
260
260
        $(GSTREAMER_LIBS)                               \
261
 
        $(DEVKIT_LIBS)                                  \
 
261
        $(UPOWER_LIBS)                                  \
262
262
        $(DBUS_LIBS)                                    \
263
263
        $(X11_LIBS)                                             \
264
264
        $(LIBNOTIFY_LIBS)                               \