diff options
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/patches/fix_defines.patch | 25 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 9 |
4 files changed, 38 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index d687035..9854623 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +indicator-power (0.4-0ubuntu2) oneiric; urgency=low + + * debian/patches/fix_defines.patch + - Use the HAVE_GSD defines so it works without gpm + * debian/rules + - added autoreconf + + -- Ken VanDine <ken.vandine@canonical.com> Thu, 28 Jul 2011 12:59:33 -0400 + indicator-power (0.4-0ubuntu1) oneiric; urgency=low * New upstream release. diff --git a/debian/patches/fix_defines.patch b/debian/patches/fix_defines.patch new file mode 100644 index 0000000..35d822a --- /dev/null +++ b/debian/patches/fix_defines.patch @@ -0,0 +1,25 @@ +=== modified file 'Makefile.am' +--- old/Makefile.am 2011-07-15 09:26:50 +0000 ++++ new/Makefile.am 2011-07-28 16:51:20 +0000 +@@ -13,6 +13,7 @@ + libpower_la_CFLAGS = \ + $(UPOWER_CFLAGS) \ + $(INDICATOR_CFLAGS) \ ++ -DHAVE_GSD \ + -Wall -Werror \ + -DG_LOG_DOMAIN=\"Indicator-Power\" + libpower_la_LIBADD = \ + +=== modified file 'configure.ac' +--- old/configure.ac 2011-07-18 13:40:17 +0000 ++++ new/configure.ac 2011-07-28 16:51:16 +0000 +@@ -39,7 +39,7 @@ + gtk+-3.0 >= $GTK_REQUIRED_VERSION + indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION + ]) +-PKG_CHECK_MODULES([GSD],[gnome-settings-daemon>= $GSD_REQUIRED_VERSION], ++PKG_CHECK_MODULES([GSD],[gnome-settings-daemon >= $GSD_REQUIRED_VERSION], + [have_gsd=yes],[have_gsd=no]) + AM_CONDITIONAL([HAVE_GSD],[test x$have_gsd = xyes]) + + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..5eb90f8 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix_defines.patch diff --git a/debian/rules b/debian/rules index 63a4ed6..3239663 100755 --- a/debian/rules +++ b/debian/rules @@ -1,16 +1,13 @@ #!/usr/bin/make -f # -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export AUTOPOINT = true + %: - dh $@ + dh $@ --with autoreconf override_dh_install: find debian/indicator-power -name \*.la -delete |