diff options
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rwxr-xr-x | debian/rules | 1 |
3 files changed, 10 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index e6642f8..184de39 100644 --- a/configure.ac +++ b/configure.ac @@ -115,12 +115,12 @@ AS_IF([test "x$with_localinstall" = "xyes"], ], [AS_IF([test "x$with_gtk" = "x2"], [ - INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` - INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator` + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator-0.4` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator-0.4` ], [ - INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3` - INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3` + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4` ])]) AC_SUBST(INDICATORDIR) AC_SUBST(INDICATORICONSDIR) diff --git a/debian/changelog b/debian/changelog index 62e8ce5..20eaa75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-sound (0.7.3-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.7.3-0ubuntu1) oneiric; urgency=low * New upstream release. - libindicator scroll signals (LP: #804618) @@ -7,6 +7,10 @@ indicator-sound (0.7.3-0ubuntu1) UNRELEASED; urgency=low - Bumped build depends for libindicator to 0.3.90 * debian/patches/gtk3_define.patch - dropped + * configure.ac + - Fixup pkgconfig check for libindicator-0.4 + * debian/rules + - Added autoreconf.mk -- Ken VanDine <ken.vandine@canonical.com> Thu, 07 Jul 2011 15:37:27 -0400 diff --git a/debian/rules b/debian/rules index 7950ed1..2c0cbeb 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,7 @@ DEB_MAKE_FLAVORS = gtk2 gtk3 include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/autoreconf.mk DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ |