-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[do not merge yet] Port to newer upower api, dh porting, deprecate old glib api #5
Merged
Merged
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
ac74afc
status-area-applet-battery.c: deprecate g_type_class_add_private
MerlijnWajer 3aae075
batmon.c: upgrade to newer upower api
MerlijnWajer 3368ca2
debian/changelog: bump for 1.5.0
MerlijnWajer 88696aa
Port to autotools
MerlijnWajer b2a7148
debian/changelog: bump for 1.5.1
MerlijnWajer ff2bbf1
debian/control: add osso-af-settings
MerlijnWajer 6f3ed88
Fix autotools flags
MerlijnWajer a3e5e57
Do not install .la file
MerlijnWajer b3474ba
use G_ADD_PRIVATE_DYNAMIC, not G_ADD_PRIVATE
MerlijnWajer b5d5630
debian/changelog: bump for 1.5.2
MerlijnWajer d0f3c5e
Revert "use G_ADD_PRIVATE_DYNAMIC, not G_ADD_PRIVATE"
MerlijnWajer 05503f3
Revert "status-area-applet-battery.c: deprecate g_type_class_add_priv…
MerlijnWajer 01adb5c
FIXUP: reference objects with new API
MerlijnWajer 3d9ab2f
debian/changelog: bump for 1.5.3
MerlijnWajer File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
Empty file.
Empty file.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
hildondesktoplib_LTLIBRARIES = status-area-applet-battery.la | ||
|
||
status_area_applet_battery_la_SOURCES = status-area-applet-battery.c \ | ||
batmon.c | ||
|
||
status_area_applet_battery_la_CFLAGS = \ | ||
$(LIBHILDON_CFLAGS) $(LIBCANBERRA_CFLAGS) $(LIBHILDONDESKTOP_CFLAGS) \ | ||
$(PROFILE_CFLAGS) $(DBUS_CFLAGS) $(GCONF_CFLAGS) $(UPOWER_GLIB_CFLAGS) | ||
|
||
status_area_applet_battery_la_LIBADD = \ | ||
$(LIBHILDON_LIBS) $(LIBCANBERRA_LIBS) $(LIBHILDONDESKTOP_LIBS) \ | ||
$(PROFILE_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) $(UPOWER_GLIB_LIBS) | ||
|
||
status_area_applet_battery_la_LDFLAGS = -Wl,--as-needed -module -avoid-version | ||
|
||
gconfschemasdir = $(sysconfdir)/gconf/schemas | ||
dist_gconfschemas_DATA = status-area-applet-battery.schemas | ||
|
||
hildonstatusmenudesktopentry_DATA = status-area-applet-battery.desktop | ||
EXTRA_DIST = $(hildonstatusmenudesktopentry_DATA) | ||
|
||
install-data-hook: | ||
@(cd $(DESTDIR)$(hildondesktoplibdir) && $(RM) \ | ||
$(hildondesktoplib_LTLIBRARIES)) |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
AC_INIT([Status area battery applet], | ||
[1.5.0], | ||
[merlijn@wizzup.org], [status-area-applet-battery]) | ||
|
||
#[patsubst(esyscmd([dpkg-parsechangelog | sed -n '/^Version: \(.*\)$/ {s//\1/;p}']),], | ||
AM_INIT_AUTOMAKE | ||
LT_INIT([shared disable-static]) | ||
AC_CONFIG_FILES([Makefile]) | ||
|
||
AC_PROG_CC | ||
AC_PROG_LIBTOOL | ||
|
||
PKG_CHECK_MODULES(LIBHILDON, hildon-1) | ||
AC_SUBST(LIBHILDON_CFLAGS) | ||
AC_SUBST(LIBHILDON_LIBS) | ||
|
||
PKG_CHECK_MODULES(LIBCANBERRA, libcanberra) | ||
AC_SUBST(LIBCANBERRA_CFLAGS) | ||
AC_SUBST(LIBCANBERRA_LIBS) | ||
|
||
PKG_CHECK_MODULES(LIBHILDONDESKTOP, libhildondesktop-1) | ||
AC_SUBST(LIBHILDONDESKTOP_CFLAGS) | ||
AC_SUBST(LIBHILDONDESKTOP_LIBS) | ||
|
||
PKG_CHECK_MODULES(PROFILE, profile) | ||
AC_SUBST(PROFILE_CFLAGS) | ||
AC_SUBST(PROFILE_LIBS) | ||
|
||
PKG_CHECK_MODULES(DBUS, dbus-1) | ||
AC_SUBST(DBUS_CFLAGS) | ||
AC_SUBST(DBUS_LIBS) | ||
|
||
PKG_CHECK_MODULES(GCONF, gconf-2.0) | ||
AC_SUBST(GCONF_CFLAGS) | ||
AC_SUBST(GCONF_LIBS) | ||
|
||
PKG_CHECK_MODULES(UPOWER_GLIB, upower-glib) | ||
AC_SUBST(UPOWER_GLIB_CFLAGS) | ||
AC_SUBST(UPOWER_GLIB_LIBS) | ||
|
||
AC_CONFIG_FILES(status-area-applet-battery.schemas) | ||
|
||
hildonstatusmenudesktopentrydir="`$PKG_CONFIG --variable=hildonstatusmenudesktopentrydir libhildondesktop-1`" | ||
AC_SUBST(hildonstatusmenudesktopentrydir) | ||
|
||
hildondesktoplibdir="`$PKG_CONFIG --variable=hildondesktoplibdir osso-af-settings`" | ||
AC_SUBST(hildondesktoplibdir) | ||
|
||
AC_OUTPUT |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,7 @@ | ||
#!/usr/bin/make -f | ||
|
||
override_dh_autoreconf: | ||
dh_autoreconf --as-needed | ||
|
||
%: | ||
dh $@ |
File renamed without changes.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can/will change maintainer to you here @spinal84 - just let me know.