From b8f5e0707f454ff8d9e87c65aa058847f587be34 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sun, 16 Jun 2013 23:31:41 -0500 Subject: update build rules: remove now-unneeded build dependencies for libindicator, gtk, gnome-settings-daemon-dev, libupower-glib, libdbus-1-dev --- configure.ac | 23 ++++++++++------------- debian/control | 6 ------ 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/configure.ac b/configure.ac index 0601c16..c6cc8e0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,9 @@ AC_INIT([indicator-power], - [12.10.6], + [13.10.0], [http://bugs.launchpad.net/indicator-power], [indicator-power], [http://launchpad.net/indicator-power]) +AC_COPYRIGHT([Copyright 2011-2013 Canonical]) AC_PREREQ([2.64]) @@ -29,25 +30,20 @@ LT_INIT ########################### # Dependencies ########################### + GLIB_REQUIRED_VERSION=2.35.4 GIO_REQUIRED_VERSION=2.26 -GTK_REQUIRED_VERSION=3.0 -INDICATOR_REQUIRED_VERSION=0.3.90 -UPOWER_REQUIRED_VERSION=0.9.5 +GIO_UNIX_REQUIRED_VERSION=2.26 GSD_REQUIRED_VERSION=3.1.4 -PKG_CHECK_MODULES([UPOWER],[upower-glib >= UPOWER_REQUIRED_VERSION]) - -PKG_CHECK_MODULES([INDICATOR],[glib-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GIO_REQUIRED_VERSION - 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([SERVICE_DEPS],[glib-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION]) ########################### # GSETTINGS ########################### + GLIB_GSETTINGS ########################### @@ -126,13 +122,14 @@ AC_DEFUN([AC_DEFINE_PATH], [ # Internationalization ########################### -IT_PROG_INTLTOOL([0.41.0]) +IT_PROG_INTLTOOL([0.50.0]) AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.17]) AC_SUBST([GETTEXT_PACKAGE],[${PACKAGE_TARNAME}]) AC_DEFINE([GETTEXT_PACKAGE],[PACKAGE_TARNAME],[Define to the gettext package name.]) +AC_DEFINE_PATH([GNOMELOCALEDIR],"${datadir}/locale",[locale directory]) ########################### # Files diff --git a/debian/control b/debian/control index e9ebbd2..2be3f6f 100644 --- a/debian/control +++ b/debian/control @@ -8,12 +8,7 @@ Build-Depends: debhelper (>= 9), intltool, libxorg-gtest-dev, libgtest-dev, - libgtk-3-dev, libglib2.0-dev (>= 2.35.4), - libindicator3-dev (>= 0.3.90), - libupower-glib-dev (>= 0.9.5), - gnome-settings-daemon-dev (>= 3.1.4), - libdbus-1-dev, Standards-Version: 3.9.2 Homepage: https://launchpad.net/indicator-power # If you aren't a member of ~indicator-applet-developers but need to upload @@ -28,7 +23,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, upower, gnome-control-center (>= 3.1), - gnome-settings-daemon, Recommends: indicator-applet (>= 0.2) | indicator-renderer, Description: Indicator showing power state. This indicator displays current power management information and gives -- cgit v1.2.3